175b6473c7
Polish
...
See gh-38389
2023-11-22 10:16:19 +01:00
59493e8306
Fix failing tests following version upgrades
2023-11-20 21:03:17 -08:00
d8ce901011
Close meter registries early in the shutdown process
...
Closes gh-38240
2023-11-16 09:26:02 +01:00
517026ab9f
Merge branch '3.1.x'
...
Closes gh-38366
2023-11-15 16:00:20 +00:00
37b2567aeb
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38365
2023-11-15 16:00:05 +00:00
ff555c5ceb
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38364
2023-11-15 15:57:39 +00:00
c2156d6803
Remove static state from CF web endpoint integration tests
...
The mocks being static meant that their state was shared across each
test in the class. This resulted in the tests being order dependent.
This commit uses instance variables to hold the mocks, thereby
ensuring that they're recreated for each test as part of the standard
JUnit lifecycle.
Closes gh-38363
2023-11-15 15:16:24 +00:00
7a8a393154
Revert "Close meter registries early in the shutdown process"
...
This reverts commit f62c1188a1
2023-11-15 14:17:07 +01:00
f62c1188a1
Close meter registries early in the shutdown process
...
Closes gh-38240
Co-authored-by: Phillip Webb <pwebb@vmware.com>
2023-11-15 10:24:54 +01:00
80210e93d3
Make LogCorrelationPropertySource an EnumerablePropertySource
...
Change `LogCorrelationPropertySource` to an `EnumerablePropertySource`
to reduce the likelihood of `Binder` errors.
Closes gh-38349
2023-11-13 10:40:24 -08:00
61aecdedd6
Remove Liquibase javax.activation excludes
...
Liquibse no longer declares a dependency on `javax.activation`
(see https://github.com/liquibase/liquibase/issues/4487 ) so we
can now remove our exclusions.
See gh-38274
2023-11-09 11:44:31 -08:00
0ea75f0f65
Polish
2023-11-05 10:53:25 -08:00
cc4ef32efe
Merge branch '3.1.x'
2023-11-02 14:19:12 -07:00
47c1088111
Polish
2023-11-02 14:19:07 -07:00
20edbb402f
Merge branch '3.1.x'
2023-10-31 10:23:13 +01:00
607ed86edb
Merge branch '3.0.x' into 3.1.x
2023-10-31 10:23:01 +01:00
dccf378d49
Polish CloudFoundryActuatorAutoConfiguration
2023-10-31 10:09:44 +01:00
e0985331c0
Polish ReactiveCloudFoundrySecurityService
2023-10-31 09:56:35 +01:00
9152217c96
Fix JUnit's @Nested usage
2023-10-31 09:49:01 +01:00
627a821d5f
Polish ReactiveTokenValidator
2023-10-31 09:49:01 +01:00
0e63326beb
Merge branch '3.1.x'
...
Closes gh-38080
2023-10-27 14:21:26 +02:00
140ba4039d
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38079
2023-10-27 14:20:07 +02:00
43a3fbf449
Move "Sanitize Sensitive Values" in docs
...
Closes gh-35917
2023-10-27 14:16:48 +02:00
79f8bfaeb7
Merge branch '3.1.x'
...
Closes gh-38073
2023-10-27 10:55:10 +02:00
790ee9afb5
Add FailureAnalyzer for NoSuchHealthContributorFailureExceptions
...
Closes gh-36489
2023-10-27 10:48:48 +02:00
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
Johnny Lim
Phillip Webb
Moritz Halbritter
Andy Wilkinson
Claudio Nave
Jonatan Ivanov
Brian Clozel
Eddú Meléndez
Stephane Nicoll
Scott Frederick
Mirko Sobeck