Andy Wilkinson
b645eb32ac
Remove deprecated code that was to be removed in 3.2
...
Closes gh-36034
2023-06-23 18:14:22 +01:00
Andy Wilkinson
357c67a999
Merge branch '3.1.x'
2023-06-23 15:58:51 +01:00
Andy Wilkinson
3f7fe25cb9
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson
2fae5de245
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson
d2966e1cbf
Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
...
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli
f9da30faf1
Replace calls to verifyComplete() to avoid indefinite blocking
...
See gh-35915
2023-06-23 12:16:26 +01:00
Jonatan Ivanov
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
Phillip Webb
3a796aedea
Merge branch '3.1.x'
2023-06-22 00:28:01 -07:00
Phillip Webb
31f218c4e0
Merge branch '3.0.x' into 3.1.x
2023-06-22 00:27:51 -07:00
Phillip Webb
9db3c5a2f7
Polish
2023-06-22 00:24:39 -07:00
Moritz Halbritter
f7abf926a9
Merge branch '3.1.x'
2023-06-19 21:04:26 +02:00
Moritz Halbritter
cbbbecce37
Merge branch '3.0.x' into 3.1.x
2023-06-19 21:04:09 +02:00
Moritz Halbritter
975e2d110c
Polish CompositePropagationFactory
...
Remove shaded Guava import
2023-06-19 21:03:05 +02:00
Andy Wilkinson
ca5bd37e81
Upgrade to Spring Framework 6.1.0-M1
...
Closes gh-35977
Closes gh-35980
2023-06-19 18:12:16 +01:00
Phillip Webb
23eb7ec1f8
Merge branch '3.1.x'
2023-06-16 14:35:44 -07:00
Phillip Webb
5d6a507142
Merge branch '3.0.x' into 3.1.x
2023-06-16 14:35:23 -07:00
Phillip Webb
48e13af8c4
Merge branch '2.7.x' into 3.0.x
2023-06-16 14:34:54 -07:00
Phillip Webb
b8d2c279ee
Update copyright year of changed files
2023-06-16 14:32:43 -07:00
Phillip Webb
854b29b8fb
Polish
2023-06-16 14:32:14 -07:00
Phillip Webb
13f16da716
Merge branch '3.1.x'
2023-06-16 14:00:12 -07:00
Phillip Webb
baddf4c857
Merge branch '3.0.x' into 3.1.x
2023-06-16 13:54:01 -07:00
Phillip Webb
9b72cc41ab
Polish 'Add support for multiple tracing propagation formats'
...
See gh-35611
2023-06-16 13:43:46 -07:00
Moritz Halbritter
3664df61eb
Polish API of SpanExporters and SpanProcessors
2023-06-16 14:54:44 +02:00
Moritz Halbritter
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
Moritz Halbritter
c25b084391
Polish
2023-06-16 10:36:33 +02:00
Moritz Halbritter
929283f4dc
Support overriding OTel SpanExporters
...
See gh-35596
2023-06-16 10:24:45 +02:00
Moritz Halbritter
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
Moritz Halbritter
6e86f5c444
Register uncategorized ObservationHandlers after categorized ones
...
Closes gh-34399
2023-06-15 15:01:13 +02:00
Moritz Halbritter
5bad242bfb
Merge branch '3.1.x'
2023-06-15 13:50:17 +02:00
Moritz Halbritter
be471c58fe
Merge branch '3.0.x' into 3.1.x
...
Closes gh-35907
2023-06-15 13:49:57 +02:00
Moritz Halbritter
8cd8d21720
Add support for multiple tracing propagation formats
...
See gh-35611
2023-06-15 13:37:33 +02:00
Moritz Halbritter
efcc65bc5b
Apply filter order to ServerHttpObservationFilter
...
Closes gh-35067
2023-06-15 11:45:05 +02:00
Moritz Halbritter
140c37ceba
Enable virtual threads on Jetty
...
Closes gh-35703
2023-06-15 11:01:11 +02:00
Moritz Halbritter
f81787e65d
Enable virtual threads on Tomcat
...
Closes gh-35704
2023-06-15 08:30:09 +02:00
Andy Wilkinson
0ce2b054d2
Merge branch '3.1.x'
2023-06-14 18:20:07 +01:00
Andy Wilkinson
9b88128e3b
Merge branch '3.0.x' into 3.1.x
2023-06-14 18:19:53 +01:00
Andy Wilkinson
4694e20628
Merge branch '2.7.x' into 3.0.x
2023-06-14 18:19:43 +01:00
Andy Wilkinson
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
Moritz Halbritter
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
Moritz Halbritter
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
Moritz Halbritter
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
Moritz Halbritter
5b06224af5
Add property for common key/values on observations
...
- Deprecates 'management.metrics.tags.*'
Closes gh-33241
2023-06-13 09:56:42 +02:00
Moritz Halbritter
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
Moritz Halbritter
28a3cee5a2
Merge branch '3.0.x'
...
Closes gh-35766
2023-06-07 08:57:54 +02:00
Moritz Halbritter
85720a5d90
Merge branch '2.7.x' into 3.0.x
...
Closes gh-35765
2023-06-07 08:57:38 +02:00
Bernardo Bulgarelli
51afaa79a7
Add @AliasFor annotation to EndpointCloudFoundryExtension
...
See gh-35716
2023-06-07 08:45:57 +02:00
Moritz Halbritter
d841490f5f
Enable ZipkinProperties in ZipkinAutoConfiguration
...
Closes gh-35592
2023-05-23 09:22:39 +02:00
Stephane Nicoll
9643dbeed2
Merge branch '3.0.x'
...
Closes gh-35590
2023-05-22 16:31:55 +02:00
Christoph Dreis
b2b5728995
Remove unnecessary exclude from spring-restdocs-mockmvc
...
See gh-35568
2023-05-22 16:31:22 +02:00
Stephane Nicoll
7a9bb55fdf
Merge branch '3.0.x'
...
Closes gh-35589
2023-05-22 16:24:56 +02:00