Commit Graph

2225 Commits

Author SHA1 Message Date
Andy Wilkinson a630baf32a Start building against Micrometer Tracing 1.2.0 snapshots
See gh-37704
2023-10-04 12:05:34 +01:00
Andy Wilkinson 7d40a45b50 Merge branch '3.1.x'
Closes gh-37662
2023-10-03 11:21:29 +01:00
Andy Wilkinson a4100e12ff Merge branch '3.0.x' into 3.1.x
Closes gh-37661
2023-10-03 11:05:51 +01:00
Andy Wilkinson 931584f8af Merge branch '2.7.x' into 3.0.x
Closes gh-37659
2023-10-03 10:28:51 +01:00
Johnny Lim 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
Jonatan Ivanov a454712dea Add auto-configuration for CountedAspect and TimedAspect
See gh-37626
2023-10-02 10:19:59 +02:00
Moritz Halbritter 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
Phillip Webb 052757c2d8 Polish 2023-09-27 20:58:09 -07:00
Andy Wilkinson 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
Phillip Webb 2075f6c685 Merge branch '3.1.x' 2023-09-20 17:16:13 -07:00
Phillip Webb 78eb8f90d1 Merge branch '3.0.x' into 3.1.x 2023-09-20 17:12:27 -07:00
Phillip Webb 78c3512e32 Polish 2023-09-20 17:11:54 -07:00
Brian Clozel 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
Moritz Halbritter 3dd6372602 Polish "Add service connection from OpenTelemetry Collector"
See gh-35082
2023-09-14 11:10:19 +02:00
Moritz Halbritter c387c87fda Polish "Add service connection from OpenTelemetry Collector"
See gh-35082
2023-09-14 10:50:36 +02:00
Eddú Meléndez 6997277f75 Add service connection from OpenTelemetry Collector
See gh-35082
2023-09-14 09:44:20 +02:00
Johnny Lim c2b78830ff Polish
See gh-37340
2023-09-13 10:26:54 +02:00
Stephane Nicoll 7df79432eb Polish "Upgrade to Micrometer Tracing 1.0.10"
See gh-37345
2023-09-12 15:10:19 +02:00
Andy Wilkinson 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
Brian Clozel 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
Moritz Halbritter fa42316652 Use spring.application.name for OTel service.name when not set
Closes gh-37285
2023-09-11 10:45:40 +02:00
Moritz Halbritter 11ebe32dcf Remove dependency to opentelemetry-sdk
Closes gh-37284
2023-09-11 09:49:28 +02:00
Moritz Halbritter f0bb054774 Merge branch '3.1.x'
Closes gh-37254
2023-09-08 11:21:20 +02:00
Moritz Halbritter d9b7a8c0af Merge branch '3.0.x' into 3.1.x
Closes gh-37253
2023-09-08 11:17:40 +02:00
Moritz Halbritter bbc10856ee Merge branch '2.7.x' into 3.0.x
Closes gh-37252
2023-09-08 11:17:25 +02:00
Johnny Lim 5f9bc721d3 Add default value metadata for management.metrics.export.signalfx.published-histogram-type
See gh-37210
2023-09-08 11:04:26 +02:00
Andy Wilkinson ed5d16de84 Upgrade to Jetty 12
Closes gh-36073
2023-09-07 13:59:15 +01:00
Andy Wilkinson 88f8311a59 Start building against Micrometer 1.12.0 snapshots
See gh-37226
2023-09-07 13:34:12 +01:00
Scott Frederick 47508b8338 Merge branch '3.1.x'
Closes gh-37179
2023-09-01 14:42:24 -05:00
Scott Frederick 03dcf8b663 Merge branch '3.0.x' into 3.1.x
Closes gh-37178
2023-09-01 14:42:15 -05:00
Scott Frederick 1e85bf7ca8 Fix mapping of consumed types to propagators
Fixes gh-37161
2023-09-01 14:40:01 -05:00
Moritz Halbritter a7855622f2 Merge branch '3.1.x'
Closes gh-37157
2023-08-31 11:51:26 +02:00
Moritz Halbritter b86937bb8e Merge branch '3.0.x' into 3.1.x
Closes gh-37156
2023-08-31 11:51:15 +02:00
Moritz Halbritter 61739bd917 Prevent propagation for local fields when using W3C propagation
Closes gh-37109
2023-08-31 11:50:05 +02:00
Johnny Lim 847c6aec01 Fix metadata of management.otlp.metrics.export.base-time-unit
See gh-37094
2023-08-24 16:30:13 +02:00
Jonatan Ivanov 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
Phillip Webb 8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Moritz Halbritter 7bb337aeb1 Polish tests 2023-08-08 13:12:47 +02:00
Moritz Halbritter 4ea3c75331 Improve exception message if endpoint can't be found 2023-08-08 13:12:47 +02:00
Moritz Halbritter ed9169501e Polish 2023-08-08 13:12:47 +02:00
Moritz Halbritter 02a7c22f40 Revert "Use virtual threads in JmsHealthIndicator if enabled"
This reverts commit 6fc585c5d2.
2023-08-03 17:25:28 +02:00
Moritz Halbritter a843aca821 Revert "Polish"
This reverts commit 25eb3c8c18.
2023-08-03 17:25:15 +02:00
Moritz Halbritter 25eb3c8c18 Polish 2023-08-03 11:16:16 +02:00
Moritz Halbritter 6fc585c5d2 Use virtual threads in JmsHealthIndicator if enabled
Closes gh-36694
2023-08-03 10:32:42 +02:00
Moritz Halbritter e677eb7759 Polish Polish R2dbcObservationAutoConfiguration 2023-08-02 12:14:03 +02:00
Moritz Halbritter 20d264150b Polish R2dbcObservationAutoConfiguration 2023-08-02 11:41:30 +02:00
Scott Frederick f2ad08c292 Add since version to deprecated config properties
See gh-36482
2023-08-01 16:13:22 -05:00
Moritz Halbritter 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
Moritz Halbritter 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
Andy Wilkinson df4c65e494 Merge branch '3.1.x'
Closes gh-36568
2023-07-25 15:18:02 +01:00