8ed2ef5640
Merge branch '3.1.x'
...
Closes gh-36277
2023-07-07 12:07:25 +01:00
c4157bb515
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36276
2023-07-07 12:07:07 +01:00
cc80bb78fe
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36275
2023-07-07 12:06:51 +01:00
52f732920b
Support multiple health groups with an additional path with Jersey
...
This commit knowingly makes breaking API changes to
JerseyHealthEndpointAdditionalPathResourceFactory. We considered
other options but they all had the potential to be backwards
incompatible in one way or another. Faced with that situation we
concluded that the likelihood of anyone using the modified API
directly is small enough to warrant making the breaking changes.
If it becomes apparent that we have misjudged things we can revisit
the changes in the future.
Closes gh-36250
2023-07-07 11:21:56 +01:00
7c77e1bb85
Polish 'Log correlation IDs when Micrometer tracing is being used'
...
See gh-36158
2023-07-02 20:08:45 +01:00
298bfd96c2
Change WebServer log messages to use port or ports, not port(s)
...
See gh-36103
2023-06-30 16:28:21 +01:00
b4bc7cebbc
Revert "Add property to specify the order of ServerHttpObservationFilter"
...
This reverts commit 7b90fbb0b2
2023-06-30 14:01:27 +02:00
849f65a0de
Revert "Apply filter order to ServerHttpObservationFilter"
...
This reverts commit efcc65bc5b
2023-06-30 14:01:26 +02:00
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
2023-06-23 18:14:22 +01:00
357c67a999
Merge branch '3.1.x'
2023-06-23 15:58:51 +01:00
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +01:00
2fae5de245
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36043
2023-06-23 15:50:02 +01:00
d2966e1cbf
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
...
See gh-35915
2023-06-23 12:38:12 +01:00
f9da30faf1
Replace calls to verifyComplete() to avoid indefinite blocking
...
See gh-35915
2023-06-23 12:16:26 +01:00
c1b295fd71
Log correlation IDs when Micrometer tracing is being used
...
Add support for logging correlation IDs with Logback or Log4J2 whenever
Micrometer tracing is being used.
The `LoggingSystemProperties` class now accepts a defualt value resolver
which will be used whenever a value isn't in the environment. The
`AbstractLoggingSystem` provides a resolver that supports the
`logging.pattern.correlation` property and will return a value whenever
`LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` is set.
Using `LoggingSystem.EXPECT_CORRELATION_ID_PROPERTY` allows us to
provide a consistent width for the correlation ID, even when it's
missing from the MDC.
The exact correlation pattern returned will depend on the `LoggingSytem`
implementation. Currently Logback and Log4J2 are supported and both
make use of a custom converter which delegates to a new
`CorrelationIdFormatter` class.
Closes gh-33280
2023-06-22 00:28:45 -07:00
3a796aedea
Merge branch '3.1.x'
2023-06-22 00:28:01 -07:00
31f218c4e0
Merge branch '3.0.x' into 3.1.x
2023-06-22 00:27:51 -07:00
9db3c5a2f7
Polish
2023-06-22 00:24:39 -07:00
f7abf926a9
Merge branch '3.1.x'
2023-06-19 21:04:26 +02:00
cbbbecce37
Merge branch '3.0.x' into 3.1.x
2023-06-19 21:04:09 +02:00
975e2d110c
Polish CompositePropagationFactory
...
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
ca5bd37e81
Upgrade to Spring Framework 6.1.0-M1
...
Closes gh-35977
Closes gh-35980
2023-06-19 18:12:16 +01:00
23eb7ec1f8
Merge branch '3.1.x'
2023-06-16 14:35:44 -07:00
5d6a507142
Merge branch '3.0.x' into 3.1.x
2023-06-16 14:35:23 -07:00
48e13af8c4
Merge branch '2.7.x' into 3.0.x
2023-06-16 14:34:54 -07:00
b8d2c279ee
Update copyright year of changed files
2023-06-16 14:32:43 -07:00
854b29b8fb
Polish
2023-06-16 14:32:14 -07:00
13f16da716
Merge branch '3.1.x'
2023-06-16 14:00:12 -07:00
baddf4c857
Merge branch '3.0.x' into 3.1.x
2023-06-16 13:54:01 -07:00
9b72cc41ab
Polish 'Add support for multiple tracing propagation formats'
...
See gh-35611
2023-06-16 13:43:46 -07:00
3664df61eb
Polish API of SpanExporters and SpanProcessors
2023-06-16 14:54:44 +02:00
27add2bbe3
Rework @AutoConfigureObservability and tracing auto-configurations
...
@ConditionalOnEnabledTracing is now applied to the minimal amount of
beans. The beans which are annotated with it are beans that will lead
to span sending to backends.
This leaves the majority of the Micrometer Tracing, Brave and
OpenTelemetry infrastructure untouched in tests.
Closes gh-35354
2023-06-16 14:09:10 +02:00
c25b084391
Polish
2023-06-16 10:36:33 +02:00
929283f4dc
Support overriding OTel SpanExporters
...
See gh-35596
2023-06-16 10:24:45 +02:00
d51559956f
Support overriding default OTel SpanProcessor
...
Also makes it easier to set the MeterProvider used in the default
SpanProcessor.
Closes gh-35560
2023-06-16 09:54:27 +02:00
6e86f5c444
Register uncategorized ObservationHandlers after categorized ones
...
Closes gh-34399
2023-06-15 15:01:13 +02:00
5bad242bfb
Merge branch '3.1.x'
2023-06-15 13:50:17 +02:00
be471c58fe
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35907
2023-06-15 13:49:57 +02:00
8cd8d21720
Add support for multiple tracing propagation formats
...
See gh-35611
2023-06-15 13:37:33 +02:00
efcc65bc5b
Apply filter order to ServerHttpObservationFilter
...
Closes gh-35067
2023-06-15 11:45:05 +02:00
140c37ceba
Enable virtual threads on Jetty
...
Closes gh-35703
2023-06-15 11:01:11 +02:00
f81787e65d
Enable virtual threads on Tomcat
...
Closes gh-35704
2023-06-15 08:30:09 +02:00
0ce2b054d2
Merge branch '3.1.x'
2023-06-14 18:20:07 +01:00
9b88128e3b
Merge branch '3.0.x' into 3.1.x
2023-06-14 18:19:53 +01:00
4694e20628
Merge branch '2.7.x' into 3.0.x
2023-06-14 18:19:43 +01:00
7d07c0d09c
Polish configuration related to predictive test selection
...
Most notably, this commit splits the tests that use Spring REST Docs
out into a separate task for which predictive test selection is
disabled. This allows it to be cached and use Gradle's built-in
up-to-date checking, thereby avoiding the generation of new snippets
and the need to then run the asciidoctor and asciidoctorPdf tasks.
It also updates spring-boot-smoke-test-junit-vintage to disable
predictive test selection so that we can continue to assert that
the some tests were executed.
See gh-35869
2023-06-14 18:15:04 +01:00
c73315b4a3
Add property to prevent observations starting with a prefix
...
For example, setting management.observations.enable.denied.prefix=false
will prevent all observations starting with 'denied.prefix'
Closes gh-34802
2023-06-13 14:04:33 +02:00
7b90fbb0b2
Add property to specify the order of ServerHttpObservationFilter
...
The property is named 'management.observations.http.server.filter.order'
Closes gh-35067
2023-06-13 12:14:58 +02:00
491e12ab5e
Add property to disable Spring Security observations
...
Setting 'management.observations.spring-security.enabled' installs an
ObservationPredicate, which prevents all observations starting with
'spring.security.' to be created.
Closes gh-34802
2023-06-13 11:18:05 +02:00
5b06224af5
Add property for common key/values on observations
...
- Deprecates 'management.metrics.tags.*'
Closes gh-33241
2023-06-13 09:56:42 +02:00
214f06083b
Auto-configure OtlpHttpSpanExporter only if property is set
...
- Remove the default value of 'management.otlp.tracing.endpoint'
Closes gh-35596
2023-06-13 08:14:22 +02:00
28a3cee5a2
Merge branch '3.0.x'
...
Closes gh-35766
2023-06-07 08:57:54 +02:00
85720a5d90
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35765
2023-06-07 08:57:38 +02:00
51afaa79a7
Add @AliasFor annotation to EndpointCloudFoundryExtension
...
See gh-35716
2023-06-07 08:45:57 +02:00
d841490f5f
Enable ZipkinProperties in ZipkinAutoConfiguration
...
Closes gh-35592
2023-05-23 09:22:39 +02:00
9643dbeed2
Merge branch '3.0.x'
...
Closes gh-35590
2023-05-22 16:31:55 +02:00
b2b5728995
Remove unnecessary exclude from spring-restdocs-mockmvc
...
See gh-35568
2023-05-22 16:31:22 +02:00
7a9bb55fdf
Merge branch '3.0.x'
...
Closes gh-35589
2023-05-22 16:24:56 +02:00
1b5fc89b43
Polish
...
See gh-35576
2023-05-22 16:17:05 +02:00
0743da4987
Merge branch '3.0.x'
...
Closes gh-35546
2023-05-17 16:42:38 -07:00
4072588c29
Polish "Fix invalid Zipkin Reporter back-off behavior"
...
See gh-35455
2023-05-17 16:38:03 -07:00
903e19854d
Fix invalid Zipkin Reporter back-off behavior
...
Update `ReporterConfiguration` so that `spanReporter` back off
if a `Reporter` bean is defined. Prior to this commit, only
`AsyncReporter` beans would be considered.
See gh-35455
2023-05-17 16:36:19 -07:00
08c3cccc92
Merge branch '3.0.x'
2023-05-15 22:20:39 -07:00
4e305cc209
Merge branch '2.7.x' into 3.0.x
2023-05-15 22:20:32 -07:00
a75cd014fc
Merge branch '2.6.x' into 2.7.x
2023-05-15 22:20:23 -07:00
95d1cb9884
Merge branch '2.5.x' into 2.6.x
2023-05-15 22:20:11 -07:00
8316a96515
Polish
2023-05-15 22:19:06 -07:00
25b0a4a67b
Merge branch '2.5.x' into 2.6.x
...
Fixes gh-35438
2023-05-15 22:12:57 -07:00
086b1e5f58
Stop WebFilterChainPostProcessor from causing eager init
...
Fixes gh-35437
2023-05-15 22:12:32 -07:00
ef1401fcc9
Fix formatting
2023-05-12 14:20:40 -07:00
27c8da66f1
Merge branch '2.5.x' into 2.6.x
...
Closes gh-35412
2023-05-12 13:27:46 -07:00
307f3c3399
Use endpoint mappings in CloudFoundry integration
...
Closes gh-35411
2023-05-12 13:23:13 -07:00
e3ed87d165
Merge branch '3.0.x'
2023-05-12 13:21:52 -07:00
92e420a098
Merge branch '2.7.x' into 3.0.x
2023-05-12 13:14:12 -07:00
ff9fd1abeb
Polish
...
See gh-35185
2023-05-10 08:31:36 +02:00
ae0efba523
Merge branch '3.0.x'
...
See gh-35312
2023-05-05 12:09:03 +02:00
1b4f9a7e9c
Remove GraphQL's tracing observation auto-configuration
...
This commit removes the auto-configuration for
PropagationWebGraphQlInterceptor as it has been deprecated with no
replacement.
See gh-35303
2023-05-05 12:07:12 +02:00
66cc9d73b8
Merge branch '3.0.x'
2023-05-05 11:58:30 +02:00
be29ab389a
Merge branch '2.7.x' into 3.0.x
2023-05-05 11:57:51 +02:00
eeefb2a1de
Polish
2023-05-05 11:55:46 +02:00
b61834c92d
Replace Mockito argument captors with assertArg
...
See gh-35015
2023-05-05 11:34:55 +02:00
5142e8e157
Support Brave's joint spans
...
Brave has a feature called joint spans that was enabled by default with
Spring Cloud Sleuth (and Boot 2.x). This has changed with
Micrometer Tracing and Boot 3.x. In order to make migration simpler,
joint spans should be set through a property.
This is a Brave+B3-only feature, W3C is not supported by Brave and
OTel does not have this capability.
See gh-35165
2023-05-03 17:22:12 -07:00
a890323758
Merge branch '3.0.x'
2023-05-02 14:52:42 -07:00
b03f1e47d0
Merge branch '3.0.x'
...
Closes gh-35171
2023-04-26 12:10:34 +01:00
d6e3db9c36
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35170
2023-04-26 11:59:19 +01:00
472afafd4b
Stop WebFilterChainPostProcessor from causing eager init
...
Fixes gh-35163
2023-04-25 22:08:58 +01:00
66db13b962
Refactor web server support to use SslBundles
...
Update Tomcat, Jetty, Undertow and Netty servers so that an SslBundle
is used to apply SSL configuration. Existing `Ssl` properties are
internally adapted to an `SslBundle` using the `WebServerSslBundle`
class. Additionally, if `Ssl.getBundle()` returns a non-null value the
the `SslBundles` bean will be used to find a registered bundle by name.
See gh-34814
2023-04-21 01:02:47 -07:00
04780650a1
Merge branch '3.0.x'
...
Closes gh-35087
2023-04-20 08:04:37 +01:00
32444fed4b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35086
2023-04-20 08:04:18 +01:00
3522714c13
Use endpoint mappings in CloudFoundry integration
...
Closes gh-35085
2023-04-20 07:50:44 +01:00
c55d398f95
Validate health group includes and excludes
...
Closes gh-34360
2023-04-19 19:51:57 +01:00
45068c777f
Document default value for management.otlp.tracing.compression
...
See gh-34508
2023-04-19 17:21:14 +01:00
c543d9172c
Polish "Add auto-configuration for OTLP span exporter"
...
See gh-34508
2023-04-19 15:11:00 +01:00
ceaafeca0b
Add auto-configuration for OTLP span exporter
...
With these changes an OTLP HTTP/protobuf exporter is auto-configured
if opentelemetry-exporter-otlp is on the classpath.
See gh-34508
2023-04-19 14:44:56 +01:00
a323bd90a8
Polish "Reintroduce support for ActiveMQ"
...
See gh-35048
2023-04-19 13:08:14 +02:00
3e9908a797
Reintroduce support for ActiveMQ
...
See gh-35048
2023-04-19 11:00:40 +02:00
1ad428129d
Polish "Add customizer for SdkTracerProviderBuilder"
...
See gh-34945
2023-04-18 10:02:17 +01:00
f40e9738b6
Add customizer for SdkTracerProviderBuilder
...
See gh-34945
2023-04-18 10:01:53 +01:00
1849b82334
Don't apply configuration-properties from auto-configuration plugin
...
Update the auto-configuration gradle plugin so that the
configuration-properties plugin is not longer automatically applied.
This allows us to have auto-configuration modules that don't ship
configuration properties.
Closes gh-35028
2023-04-17 00:41:25 -07:00
00dc942e94
Migrate to Spring Security lambda config
...
Closes gh-35011
2023-04-14 17:39:48 -07:00
9774d8a439
Add aggregation temporality to OtlpProperties
...
In Micrometer 1.11.0-RC1, a new property was introduced in OtlpConfig
to define aggregation temporality.
See https://github.com/micrometer-metrics/micrometer/pull/3625
2023-04-13 10:10:19 -07:00
d4980ea993
Always define connection details beans
...
Closes gh-34776
2023-04-13 18:02:35 +01:00
e9a198a68f
Merge branch '3.0.x'
2023-04-12 22:16:35 -07:00
7fea4c84b4
Update copyright year of changed files
2023-04-12 22:16:07 -07:00
8d2f550f8c
Merge branch '3.0.x'
2023-04-10 21:14:42 -07:00
3ba3558cff
Merge branch '2.7.x' into 3.0.x
2023-04-10 21:14:34 -07:00
3e9a136143
Polish gradle formatting
2023-04-10 21:14:09 -07:00
463701db18
Merge branch '3.0.x'
2023-04-10 16:22:57 -07:00
d442bfbeff
Polish
2023-04-10 16:22:11 -07:00
a031bf4d58
Merge branch '3.0.x'
...
Closes gh-34867
2023-04-05 16:13:42 +02:00
579364c2ec
Polish "Auto-configure observation for Spring-Batch"
...
See gh-34305
2023-04-05 16:12:49 +02:00
5ad29db9c8
Auto-configure observation for Spring-Batch
...
See gh-34305
2023-04-05 15:53:19 +02:00
8721c0e64f
Add ConnectionDetail support to Zipkin auto-configuration
...
Update Zipkin auto-configuration so that `ZipkinConnectionDetails`
beans may be optionally used to provide connection details.
See gh-34657
Co-Authored-By: Mortitz Halbritter <mkammerer@vmware.com>
Co-Authored-By: Phillip Webb <pwebb@vmware.com>
2023-03-24 09:25:26 +00:00
eef4919a33
Start building against Micrometer Tracing 1.1.0-M2 snapshots
...
See gh-34547
Co-Authored-By: Marcin Grzejszczak <mgrzejszczak@vmware.com>
2023-03-10 15:23:10 +00:00
0b23ffd73a
Merge branch '3.0.x'
...
Closes gh-34425
2023-03-01 14:14:05 +01:00
ecbc412c7c
Add property 'management.wavefront.trace-derived-custom-tag-keys'
...
Closes gh-34194
2023-03-01 13:35:17 +01:00
79a4861c17
Merge branch '3.0.x'
...
Closes gh-34418
2023-03-01 12:46:58 +01:00
73ba797c02
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34417
2023-03-01 12:46:43 +01:00
956a579bc9
Polish "Add missing Micrometer PropertiesConfigAdapterTests"
...
See gh-34319
2023-03-01 12:45:55 +01:00
1a6d240234
Add management.wavefront.application.custom-tags property
...
Add `management.wavefront.application.custom-tags` property which
populates custom tags in `ApplicationTags` created by
`WavefrontAutoConfiguration`.
See gh-34223
Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
2023-03-01 09:28:44 +01:00
8a9ea2bad8
Merge branch '3.0.x'
...
Closes gh-34370
2023-02-24 12:27:00 +00:00
9854154c31
Specify @Order to the defaultTracingObservationHandler bean definition
...
See gh-34216
Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>
2023-02-24 12:25:59 +00:00
157091a811
Merge branch '3.0.x'
2023-02-22 18:36:57 -08:00
0b15962aca
Merge branch '2.7.x' into 3.0.x
2023-02-22 18:36:16 -08:00
b07269a018
Merge branch '3.0.x'
2023-02-21 23:20:07 -08:00
c4de86c244
Merge branch '2.7.x' into 3.0.x
2023-02-21 23:17:57 -08:00
df5898a146
Reformat code following spring-javaformat upgrade
2023-02-21 22:53:27 -08:00
1847a9deb6
Upgrade to Spring Framework 6.0.5
...
Closes gh-34301
2023-02-20 20:29:49 +00:00
e617d362d5
Merge branch '3.0.x'
...
Closes gh-34208
2023-02-15 15:26:55 +00:00
efbeab74ee
Merge branch '2.7.x' into 3.0.x
...
Closes gh-34207
2023-02-15 15:26:38 +00:00
ff04f009c0
Add missing Micrometer PropertiesConfigAdapterTests
...
Closes gh-33743
2023-02-15 15:12:02 +00:00
5cef7632ee
Start building against Spring Framework 6.0.5 snapshots
...
This commit adapts to the changes made for
spring-projects/spring-framework#29885 .
Closes gh-34152
2023-02-15 11:39:08 +00:00
1c9e22c845
Merge branch '3.0.x'
...
Closes gh-34121
2023-02-08 11:26:33 +00:00
3551030e3f
Add ObservationFilter beans to auto-configured ObservationRegistry
...
Fixes gh-33968
2023-02-08 11:19:17 +00:00
23f1c896c9
Merge branch '3.0.x'
...
Closes gh-34015
2023-01-31 10:20:36 +01:00
bc7fc90550
Replace Base64Utils with JDK's Base64
...
See gh-33967
2023-01-31 10:20:06 +01:00
06aec1a9bf
Adds CompositeSpanExporter
...
Micrometer Tracing comes with 3 generic interfaces, SpanExportingPredicate,
SpanReporter and SpanFilter, thanks to which you can decide whether you
want to export a span, how you want to report it and how to mutate it
regardless of which tracer library you are using.
Without this change usage of these 3 interfaces is not possible
for OpenTelemetry.
With this change we're putting all SpanExporters to the
CompositeSpanExporter and apply the exporters only after predicates,
filtering and reporting took place.
See gh-34002
2023-01-31 10:11:20 +01:00
92dd004375
Add property `headers` in `OtlpProperties`
...
In Micrometer 1.11, headers property has been introduced.
See gh-34004
2023-01-31 09:37:39 +01:00
0e68cae57f
Use instanceof patterns
...
See gh-33987
2023-01-26 20:36:25 -08:00
a9c547e767
Use text blocks
...
See gh-33987
2023-01-26 20:36:01 -08:00
6e46423983
Use diamond operators
...
See gh-33987
2023-01-26 20:35:08 -08:00
5120242996
Merge branch '2.7.x' into 3.0.x
2023-01-26 19:41:42 -08:00
888d4ac392
Use '==' rather than '.equals' with enum value
...
See gh-33987
2023-01-26 19:33:37 -08:00
31ca94833a
Use parent-based sampler by default
...
Closes gh-33821
2023-01-19 09:09:10 +01:00
71efc55bf9
Merge branch '2.7.x'
2023-01-18 16:31:53 -08:00
7c508fa324
Update copyright year of changed files
2023-01-18 15:37:58 -08:00
94f4a4396c
Merge branch '2.7.x'
...
Closes gh-33880
2023-01-18 17:35:52 +01:00
e8d809fe65
Replace 'via' with 'over' or 'through' in the documentation
...
Closes gh-33878
2023-01-18 16:56:42 +01:00
fad88232b9
Update copyright year of changed files
2023-01-17 10:12:38 -08:00
a889c539ab
Merge branch '2.7.x'
2023-01-17 10:12:25 -08:00
Andy Wilkinson
Johnny Lim
Ahmed Ashour
Moritz Halbritter
ThomazPassarelli
Jonatan Ivanov
Phillip Webb
Bernardo Bulgarelli
Stephane Nicoll
Christoph Dreis
ryosuke-hasebe
Madhura Bhave
Marc Leroux
Scott Frederick
Martin BENDA
Yanming Zhou
Mark Bonnekessel
Tadaya Tsuyukubo
Mirko Sobeck
Marcin Grzejszczak
Eddú Meléndez
Krzysztof Krason