Commit Graph

2188 Commits (d7875d601a2b7100881d0c742076bfc8a3474c5a)

Author SHA1 Message Date
Andy Wilkinson c4157bb515 Merge branch '3.0.x' into 3.1.x
Closes gh-36276
1 year ago
Andy Wilkinson cc80bb78fe Merge branch '2.7.x' into 3.0.x
Closes gh-36275
1 year ago
Andy Wilkinson 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
1 year ago
Johnny Lim 7c77e1bb85 Polish 'Log correlation IDs when Micrometer tracing is being used'
See gh-36158
1 year ago
Ahmed Ashour 298bfd96c2 Change WebServer log messages to use port or ports, not port(s)
See gh-36103
1 year ago
Moritz Halbritter b4bc7cebbc Revert "Add property to specify the order of ServerHttpObservationFilter"
This reverts commit 7b90fbb0b2.
1 year ago
Moritz Halbritter 849f65a0de Revert "Apply filter order to ServerHttpObservationFilter"
This reverts commit efcc65bc5b.
1 year ago
Andy Wilkinson b645eb32ac Remove deprecated code that was to be removed in 3.2
Closes gh-36034
1 year ago
Andy Wilkinson 357c67a999 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
1 year ago
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
1 year ago
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
1 year ago
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
1 year ago
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
1 year ago
Phillip Webb 3a796aedea Merge branch '3.1.x' 1 year ago
Phillip Webb 31f218c4e0 Merge branch '3.0.x' into 3.1.x 1 year ago
Phillip Webb 9db3c5a2f7 Polish 1 year ago
Moritz Halbritter f7abf926a9 Merge branch '3.1.x' 1 year ago
Moritz Halbritter cbbbecce37 Merge branch '3.0.x' into 3.1.x 1 year ago
Moritz Halbritter 975e2d110c Polish CompositePropagationFactory
Remove shaded Guava import
1 year ago
Andy Wilkinson ca5bd37e81 Upgrade to Spring Framework 6.1.0-M1
Closes gh-35977
Closes gh-35980
1 year ago
Phillip Webb 23eb7ec1f8 Merge branch '3.1.x' 1 year ago
Phillip Webb 5d6a507142 Merge branch '3.0.x' into 3.1.x 1 year ago
Phillip Webb 48e13af8c4 Merge branch '2.7.x' into 3.0.x 1 year ago
Phillip Webb b8d2c279ee Update copyright year of changed files 1 year ago
Phillip Webb 854b29b8fb Polish 1 year ago
Phillip Webb 13f16da716 Merge branch '3.1.x' 1 year ago
Phillip Webb baddf4c857 Merge branch '3.0.x' into 3.1.x 1 year ago
Phillip Webb 9b72cc41ab Polish 'Add support for multiple tracing propagation formats'
See gh-35611
1 year ago
Moritz Halbritter 3664df61eb Polish API of SpanExporters and SpanProcessors 1 year ago
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
1 year ago
Moritz Halbritter c25b084391 Polish 1 year ago
Moritz Halbritter 929283f4dc Support overriding OTel SpanExporters
See gh-35596
1 year ago
Moritz Halbritter d51559956f Support overriding default OTel SpanProcessor
Also makes it easier to set the MeterProvider used in the default
SpanProcessor.

Closes gh-35560
1 year ago
Moritz Halbritter 6e86f5c444 Register uncategorized ObservationHandlers after categorized ones
Closes gh-34399
1 year ago
Moritz Halbritter 5bad242bfb Merge branch '3.1.x' 1 year ago
Moritz Halbritter be471c58fe Merge branch '3.0.x' into 3.1.x
Closes gh-35907
1 year ago
Moritz Halbritter 8cd8d21720 Add support for multiple tracing propagation formats
See gh-35611
1 year ago
Moritz Halbritter efcc65bc5b Apply filter order to ServerHttpObservationFilter
Closes gh-35067
1 year ago
Moritz Halbritter 140c37ceba Enable virtual threads on Jetty
Closes gh-35703
1 year ago
Moritz Halbritter f81787e65d Enable virtual threads on Tomcat
Closes gh-35704
1 year ago
Andy Wilkinson 0ce2b054d2 Merge branch '3.1.x' 1 year ago
Andy Wilkinson 9b88128e3b Merge branch '3.0.x' into 3.1.x 1 year ago
Andy Wilkinson 4694e20628 Merge branch '2.7.x' into 3.0.x 1 year ago
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
1 year ago
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
1 year ago
Moritz Halbritter 7b90fbb0b2 Add property to specify the order of ServerHttpObservationFilter
The property is named 'management.observations.http.server.filter.order'

Closes gh-35067
1 year ago
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
1 year ago
Moritz Halbritter 5b06224af5 Add property for common key/values on observations
- Deprecates 'management.metrics.tags.*'

Closes gh-33241
1 year ago
Moritz Halbritter 214f06083b Auto-configure OtlpHttpSpanExporter only if property is set
- Remove the default value of 'management.otlp.tracing.endpoint'

Closes gh-35596
1 year ago
Moritz Halbritter 28a3cee5a2 Merge branch '3.0.x'
Closes gh-35766
1 year ago
Moritz Halbritter 85720a5d90 Merge branch '2.7.x' into 3.0.x
Closes gh-35765
1 year ago
Bernardo Bulgarelli 51afaa79a7 Add @AliasFor annotation to EndpointCloudFoundryExtension
See gh-35716
1 year ago
Moritz Halbritter d841490f5f Enable ZipkinProperties in ZipkinAutoConfiguration
Closes gh-35592
2 years ago
Stephane Nicoll 9643dbeed2 Merge branch '3.0.x'
Closes gh-35590
2 years ago
Christoph Dreis b2b5728995 Remove unnecessary exclude from spring-restdocs-mockmvc
See gh-35568
2 years ago
Stephane Nicoll 7a9bb55fdf Merge branch '3.0.x'
Closes gh-35589
2 years ago
Johnny Lim 1b5fc89b43 Polish
See gh-35576
2 years ago
Phillip Webb 0743da4987 Merge branch '3.0.x'
Closes gh-35546
2 years ago
Phillip Webb 4072588c29 Polish "Fix invalid Zipkin Reporter back-off behavior"
See gh-35455
2 years ago
ryosuke-hasebe 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
2 years ago
Phillip Webb 08c3cccc92 Merge branch '3.0.x' 2 years ago
Phillip Webb 4e305cc209 Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb a75cd014fc Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb 95d1cb9884 Merge branch '2.5.x' into 2.6.x 2 years ago
Phillip Webb 8316a96515 Polish 2 years ago
Phillip Webb 25b0a4a67b Merge branch '2.5.x' into 2.6.x
Fixes gh-35438
2 years ago
Andy Wilkinson 086b1e5f58 Stop WebFilterChainPostProcessor from causing eager init
Fixes gh-35437
2 years ago
Phillip Webb ef1401fcc9 Fix formatting 2 years ago
Phillip Webb 27c8da66f1 Merge branch '2.5.x' into 2.6.x
Closes gh-35412
2 years ago
Madhura Bhave 307f3c3399 Use endpoint mappings in CloudFoundry integration
Closes gh-35411
2 years ago
Phillip Webb e3ed87d165 Merge branch '3.0.x' 2 years ago
Phillip Webb 92e420a098 Merge branch '2.7.x' into 3.0.x 2 years ago
Johnny Lim ff9fd1abeb Polish
See gh-35185
2 years ago
Stephane Nicoll ae0efba523 Merge branch '3.0.x'
See gh-35312
2 years ago
Stephane Nicoll 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
2 years ago
Stephane Nicoll 66cc9d73b8 Merge branch '3.0.x' 2 years ago
Stephane Nicoll be29ab389a Merge branch '2.7.x' into 3.0.x 2 years ago
Stephane Nicoll eeefb2a1de Polish 2 years ago
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg
See gh-35015
2 years ago
Jonatan Ivanov 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
2 years ago
Phillip Webb a890323758 Merge branch '3.0.x' 2 years ago
Andy Wilkinson b03f1e47d0 Merge branch '3.0.x'
Closes gh-35171
2 years ago
Andy Wilkinson d6e3db9c36 Merge branch '2.7.x' into 3.0.x
Closes gh-35170
2 years ago
Andy Wilkinson 472afafd4b Stop WebFilterChainPostProcessor from causing eager init
Fixes gh-35163
2 years ago
Scott Frederick 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
2 years ago
Andy Wilkinson 04780650a1 Merge branch '3.0.x'
Closes gh-35087
2 years ago
Andy Wilkinson 32444fed4b Merge branch '2.7.x' into 3.0.x
Closes gh-35086
2 years ago
Madhura Bhave 3522714c13 Use endpoint mappings in CloudFoundry integration
Closes gh-35085
2 years ago
Andy Wilkinson c55d398f95 Validate health group includes and excludes
Closes gh-34360
2 years ago
Andy Wilkinson 45068c777f Document default value for management.otlp.tracing.compression
See gh-34508
2 years ago
Andy Wilkinson c543d9172c Polish "Add auto-configuration for OTLP span exporter"
See gh-34508
2 years ago
Jonatan Ivanov 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
2 years ago
Stephane Nicoll a323bd90a8 Polish "Reintroduce support for ActiveMQ"
See gh-35048
2 years ago
Martin BENDA 3e9908a797 Reintroduce support for ActiveMQ
See gh-35048
2 years ago
Andy Wilkinson 1ad428129d Polish "Add customizer for SdkTracerProviderBuilder"
See gh-34945
2 years ago
Yanming Zhou f40e9738b6 Add customizer for SdkTracerProviderBuilder
See gh-34945
2 years ago
Phillip Webb 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
2 years ago
Phillip Webb 00dc942e94 Migrate to Spring Security lambda config
Closes gh-35011
2 years ago
Jonatan Ivanov 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
2 years ago