4c3de96d74
Fix links to Antora based JavaDoc and reference documentation
...
This introduces two different attributes for, e.g. the Spring Framework
version: the "normal" one, e.g. 6.1.0-SNAPSHOT, and the Antora one,
e.g. 6.1.
Spring Framework's reference documentation is still broken when using
SNAPSHOT versions, see spring-framework/gh-31480.
See gh-38000
2023-10-24 10:31:26 +02:00
b5d4983829
Polish
...
See gh-37984
2023-10-23 11:15:27 +02:00
d638bbb0ba
Merge branch '3.1.x'
...
Closes gh-37967
2023-10-19 21:25:44 -07:00
1d456e09d2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37966
2023-10-19 21:12:52 -07:00
a0b999c8b4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37965
2023-10-19 20:55:51 -07:00
abdad1cabe
Constently use assertThatExceptionOf... assertions
...
Closes gh-37964
2023-10-19 20:17:26 -07:00
446677375e
Polish gh-35082
...
See gh-37831
2023-10-12 14:17:02 +02:00
81cbf05b41
Merge branch '3.1.x'
...
Closes gh-37839
2023-10-12 11:39:19 +01:00
19b877fc14
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37838
2023-10-12 11:39:06 +01:00
f780cc6d03
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37837
2023-10-12 11:38:32 +01:00
11311dbf6d
Register task executor metrics when using lazy init
...
Fixes gh-37832
2023-10-12 11:19:33 +01:00
bdaf7a7603
Merge branch '3.1.x'
...
Closes gh-37830
2023-10-11 15:06:09 +01:00
411586347c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37829
2023-10-11 15:04:21 +01:00
781ac2ece2
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37828
2023-10-11 15:02:36 +01:00
1bd14652d8
Apply Wavefront token type to auto-configured WavefrontSender
...
Closes gh-37165
2023-10-11 09:12:26 +02:00
5280cfeec0
Adapt to breaking API change in Micrometer
...
See gh-37703
2023-10-10 17:56:56 +01:00
346db8e795
Add auto-configuration for SpanAspect
...
See gh-37640
2023-10-05 11:26:21 +02:00
fbec06a134
Support new CSP auth method for Wavefront
...
Closes gh-37165
2023-10-05 10:44:19 +02:00
a630baf32a
Start building against Micrometer Tracing 1.2.0 snapshots
...
See gh-37704
2023-10-04 12:05:34 +01:00
d59ea2f038
Start building against Micrometer Tracing 1.1.6 snapshots
...
See gh-37694
2023-10-04 10:00:18 +01:00
7907358875
Start building against Micrometer Tracing 1.0.11 snapshots
...
See gh-37679
2023-10-04 09:52:49 +01:00
7d40a45b50
Merge branch '3.1.x'
...
Closes gh-37662
2023-10-03 11:21:29 +01:00
a4100e12ff
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37661
2023-10-03 11:05:51 +01:00
931584f8af
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37659
2023-10-03 10:28:51 +01:00
c9932bb73a
Use AssertJ's fail, not JUnit's
...
This commit also updates Checkstyle to prevent use of JUnit's
assertions from being reintroduced.
See gh-37655
2023-10-03 10:11:12 +01:00
a454712dea
Add auto-configuration for CountedAspect and TimedAspect
...
See gh-37626
2023-10-02 10:19:59 +02:00
72a4e1ebae
Honor timeout in ZipkinWebClientSender
...
Unfortunately there's no good way to configure connect and read timeout
separately, which works for all supported reactive clients. This
implementation applies a timeout through Reactor's timeout method. The
timeout from the properties is summed together and this is the applied
timeout. While not perfect, this is better than no timeout at all.
Closes gh-31496
2023-09-29 10:05:29 +02:00
052757c2d8
Polish
2023-09-27 20:58:09 -07:00
ecc670772a
Make user details service auto-configs back off more readily
...
Previously auto-configuration of a user details service (imperative
or reactive) would only back off on the presence of certain beans.
This led to situations where the im-memory service was
auto-configured and the default password was logged even though
another authentication mechanism was in use.
This commit updates the auto-configuration so that it backs off
when depending on Spring Security's OAuth2 Client and OAuth2
Resource Server modules. In the imperative case it will also back
off when depending on the SAML 2 provider.
Closes gh-35338
2023-09-26 16:47:19 +01:00
2075f6c685
Merge branch '3.1.x'
2023-09-20 17:16:13 -07:00
78eb8f90d1
Merge branch '3.0.x' into 3.1.x
2023-09-20 17:12:27 -07:00
78c3512e32
Polish
2023-09-20 17:11:54 -07:00
0fc97e9315
Auto-configure ObservationRegistry on JmsTemplate
...
Spring Boot auto-configures both a `JmsTemplate` and a
`JmsMessagingTemplate`. As of Spring Framework 6.2, JMS has
observability support when publishing messages.
This commit creates a bean post-processor that configures an
`ObservationRegistry` on the template, if the registry is present.
Closes gh-37388
2023-09-15 16:28:06 +02:00
3dd6372602
Polish "Add service connection from OpenTelemetry Collector"
...
See gh-35082
2023-09-14 11:10:19 +02:00
c387c87fda
Polish "Add service connection from OpenTelemetry Collector"
...
See gh-35082
2023-09-14 10:50:36 +02:00
6997277f75
Add service connection from OpenTelemetry Collector
...
See gh-35082
2023-09-14 09:44:20 +02:00
c2b78830ff
Polish
...
See gh-37340
2023-09-13 10:26:54 +02:00
7df79432eb
Polish "Upgrade to Micrometer Tracing 1.0.10"
...
See gh-37345
2023-09-12 15:10:19 +02:00
4ebee17cb1
Suppress warnings until more to new semconv module
...
OTel has deprecated their semconv module and introduced a new module
with different Maven coordinates. micrometer-metrics/tracing#343 will
move Micrometer Tracing to the new module. Until then, we need to
suppress the deprecation warnings that result from using the old one.
Closes gh-37347
2023-09-12 13:43:27 +01:00
c8d036eaa8
Remove ServerHttpObservationFilter from WebFlux
...
This commit removes the auto-configuration of the
`ServerHttpObservationFilter` bean for WebFlux applications as it's been
deprecated by Spring Framework.
The Observability instrumentation is now handled at the
`WebHttpHandlerBuilder` in Framework directly and doesn't need any
auto-configuration from Spring Boot.
Closes gh-37344
2023-09-12 10:59:25 +02:00
fa42316652
Use spring.application.name for OTel service.name when not set
...
Closes gh-37285
2023-09-11 10:45:40 +02:00
11ebe32dcf
Remove dependency to opentelemetry-sdk
...
Closes gh-37284
2023-09-11 09:49:28 +02:00
f0bb054774
Merge branch '3.1.x'
...
Closes gh-37254
2023-09-08 11:21:20 +02:00
d9b7a8c0af
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37253
2023-09-08 11:17:40 +02:00
bbc10856ee
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37252
2023-09-08 11:17:25 +02:00
5f9bc721d3
Add default value metadata for management.metrics.export.signalfx.published-histogram-type
...
See gh-37210
2023-09-08 11:04:26 +02:00
ed5d16de84
Upgrade to Jetty 12
...
Closes gh-36073
2023-09-07 13:59:15 +01:00
88f8311a59
Start building against Micrometer 1.12.0 snapshots
...
See gh-37226
2023-09-07 13:34:12 +01:00
47508b8338
Merge branch '3.1.x'
...
Closes gh-37179
2023-09-01 14:42:24 -05:00
03dcf8b663
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37178
2023-09-01 14:42:15 -05:00
1e85bf7ca8
Fix mapping of consumed types to propagators
...
Fixes gh-37161
2023-09-01 14:40:01 -05:00
a7855622f2
Merge branch '3.1.x'
...
Closes gh-37157
2023-08-31 11:51:26 +02:00
b86937bb8e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37156
2023-08-31 11:51:15 +02:00
61739bd917
Prevent propagation for local fields when using W3C propagation
...
Closes gh-37109
2023-08-31 11:50:05 +02:00
847c6aec01
Fix metadata of management.otlp.metrics.export.base-time-unit
...
See gh-37094
2023-08-24 16:30:13 +02:00
a3f37089db
Fix failing tests due to extended exemplars
...
Micrometer introduced extended exemplars functionality that adds
exemplars to _count too not only to histogram buckets,
see: https://github.com/micrometer-metrics/micrometer/pull/3996
Because of this, some verifications should be changed.
2023-08-16 08:55:40 +02:00
8edec21a6f
Update copyright year of changed files
2023-08-13 20:44:44 -07:00
7bb337aeb1
Polish tests
2023-08-08 13:12:47 +02:00
4ea3c75331
Improve exception message if endpoint can't be found
2023-08-08 13:12:47 +02:00
ed9169501e
Polish
2023-08-08 13:12:47 +02:00
02a7c22f40
Revert "Use virtual threads in JmsHealthIndicator if enabled"
...
This reverts commit 6fc585c5d2
2023-08-03 17:25:28 +02:00
a843aca821
Revert "Polish"
...
This reverts commit 25eb3c8c18
2023-08-03 17:25:15 +02:00
25eb3c8c18
Polish
2023-08-03 11:16:16 +02:00
6fc585c5d2
Use virtual threads in JmsHealthIndicator if enabled
...
Closes gh-36694
2023-08-03 10:32:42 +02:00
e677eb7759
Polish Polish R2dbcObservationAutoConfiguration
2023-08-02 12:14:03 +02:00
20d264150b
Polish R2dbcObservationAutoConfiguration
2023-08-02 11:41:30 +02:00
f2ad08c292
Add since version to deprecated config properties
...
See gh-36482
2023-08-01 16:13:22 -05:00
b0615dd311
Split OpenTelemetry auto-configuration
...
The OpenTelemetry bean is now configured in the
OpenTelemetryAutoConfiguration. This method also applies
SdkLoggerProvider and SdkMeterProvider.
Additionally, the OpenTelemetry Resource is now a bean. Resource
attributes can now be configured through properties
The resourceAttributes in OtlpProperties have been deprecated in favor
of the new one in OpenTelemetryProperties.
Closes gh-36544
Closes gh-36545
2023-07-27 08:53:09 +02:00
6050fff078
Auto-configure observability for R2DBC
...
The new ConnectionFactoryDecorator can be used to decorate the
ConnectionFactory built by the ConnectionFactoryBuilder.
The new R2dbcObservationAutoConfiguration configures a
ConnectionFactoryDecorator to attach a ObservationProxyExecutionListener
to ConnectionFactories. This enables Micrometer Observations for R2DBC
queries.
Closes gh-33768
2023-07-25 17:01:55 +02:00
df4c65e494
Merge branch '3.1.x'
...
Closes gh-36568
2023-07-25 15:18:02 +01:00
ee9574d399
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36567
2023-07-25 15:04:30 +01:00
e106828fc8
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36566
2023-07-25 14:59:44 +01:00
5c6a9122cb
Polish "Test Micrometer config to property exposure"
...
See gh-33743
2023-07-25 14:43:14 +01:00
19e70055a5
Test Micrometer config to property exposure
...
See gh-33743
2023-07-25 14:37:25 +01:00
2289b725d2
Merge branch '3.1.x'
...
Closes gh-36560
2023-07-25 13:08:01 +01:00
2766c4b648
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36559
2023-07-25 13:07:48 +01:00
d290d05f63
Add missing Stackdriver metric-type-prefix property
...
Closes gh-36499
2023-07-25 13:01:59 +01:00
0f110a5f5b
Merge branch '3.1.x'
...
Closes gh-36557
2023-07-25 12:54:46 +01:00
22fa904590
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36556
2023-07-25 12:54:34 +01:00
45624c0a78
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36555
2023-07-25 12:53:11 +01:00
aae8665db1
Add missing management.metrics.export.wavefront properties
...
Closes gh-36498
2023-07-25 12:35:58 +01:00
346ebbc6f8
Merge branch '3.1.x'
...
Closes gh-36554
2023-07-25 12:09:22 +01:00
5d1b2348e8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36553
2023-07-25 12:08:43 +01:00
826bad5820
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36552
2023-07-25 12:08:19 +01:00
a6c19dae07
Add missing management.metrics.export.signalfx properties
...
Closes gh-36497
2023-07-25 11:35:57 +01:00
c9c36e7e42
Merge branch '3.1.x'
...
Closes gh-36527
2023-07-24 14:38:52 +01:00
54323d1a95
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36526
2023-07-24 14:35:14 +01:00
2db45e9ba3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36525
2023-07-24 14:34:50 +01:00
a5d5908c27
Add missing management.metrics.export.atlas properties
...
Closes gh-36496
2023-07-24 14:34:11 +01:00
3affb3342e
Deprecate auto-configuration for InfluxDB
...
Closes gh-35190
2023-07-20 13:31:10 +01:00
54e99d68fa
Auto-configure ObservationRegistry on ScheduledTaskRegistrar
...
The TaskSchedulingAutoConfiguration.taskScheduler auto-configuration now
no longer backs off on SchedulingConfigurer beans.
Closes gh-36119
2023-07-20 09:43:12 +02:00
abebc396c0
Change B3 extraction format to single
...
See gh-36061
2023-07-19 08:14:01 +02:00
c726a13395
Polish "Add auto-configuration for ObservedAspect"
...
See gh-35191
2023-07-17 16:06:08 +02:00
0dae89e837
Add auto-configuration for ObservedAspect
...
This adds support for auto-configuring `ObservedAspect` when AspectJ is
on the classpath, which enables the usage of `@Observed`.
See gh-35191
2023-07-17 16:05:48 +02:00
31db1d8125
Merge branch '3.1.x'
...
Closes gh-36430
2023-07-17 15:48:41 +02:00
7195d87e6c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36429
2023-07-17 15:48:30 +02:00
750096b9c2
Polish "Allow custom ExemplarSampler to be used"
...
See gh-35619
2023-07-17 15:46:48 +02:00
94b17ecd26
Allow custom ExemplarSampler to be used
...
See gh-35619
2023-07-17 15:44:05 +02:00
df8b73d8f7
Merge branch '3.1.x'
...
Closes gh-36425
2023-07-17 15:09:23 +02:00
588129318c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36423
2023-07-17 15:06:00 +02:00
58cfdbfa2d
Add missing OTel Span attributes
...
OTel semantic conventions mandate certain resource attributes to present
on exported spans. This commits make sure that the attribute we add are
merged with the defaults, rather than replacing them.
See gh-36155
2023-07-17 15:00:51 +02:00
8115f8f146
Add property for base time unit in OTLP registry
...
Micrometer added a new configuration option to its OTLP registry to
enable configuring the base time unit. These changes provide a
configuration property to support to it.
See gh-36393
2023-07-17 13:17:41 +02:00
783bfb62e2
Merge branch '3.1.x'
...
Closes gh-36420
2023-07-17 10:04:14 +02:00
d2912c6442
Update copyright year of changed files
...
See gh-36306
2023-07-17 09:40:57 +02:00
8321887d6a
Fix typos
...
See gh-36306
2023-07-17 09:40:16 +02:00
b8c4fb6b9a
Upgrade to Liquibase 4.23.0
...
Closes gh-36377
2023-07-14 19:57:27 +01:00
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
Moritz Halbritter
Johnny Lim
Phillip Webb
Andy Wilkinson
Jonatan Ivanov
Brian Clozel
Eddú Meléndez
Stephane Nicoll
Scott Frederick
Mirko Sobeck
kitbolourchi
Vedran Pavic
Johnny Goncalves
Christoph Dreis
Ahmed Ashour
ThomazPassarelli