Commit Graph

2357 Commits

Author SHA1 Message Date
Brian Clozel 46b7bd2f23 Add configuration property to enable micrometer annotations
Prior to this commit, the Micrometer annotations support (`@Timed`,
`@Counted`...) was guarded by the presence of both Micrometer and
AspectJ on the classpath.

This signal is too weak, considering the startup performance impact and
the fact that the AspectJ dependency can be brought transitively in many
cases.

This commit adds a new `micrometer.observations.annotations.enabled`
property that is set to `false` by default to only process the
annotations support when this property is enabled.

Fixes gh-39128
2024-01-15 13:51:15 +01:00
Andy Wilkinson 7e382e7bf6 Merge branch '3.2.x'
Closes gh-39123
2024-01-12 17:08:36 +00:00
Andy Wilkinson 145fe15daf Merge branch '3.1.x' into 3.2.x
Closes gh-39122
2024-01-12 17:08:23 +00:00
Andy Wilkinson 3df77c67ec Fix request mapping of endpoint path-mapped to /
Closes gh-35426
2024-01-12 17:07:48 +00:00
Andy Wilkinson 907e4d97f7 Merge branch '3.2.x'
Closes gh-39117
2024-01-12 13:02:56 +00:00
Andy Wilkinson 6ec56da919 Ensure that reactive actuator security has an auth manager
This is a follow-on from afad358 and ensures that the auto-configured
security for Actuator in a WebFlux app has an authentication manager
to back its use of HTTP basic and form login.

Fixes gh-39069
2024-01-12 13:02:31 +00:00
Phillip Webb 653474fc46 Polish 2024-01-11 21:40:18 -08:00
Moritz Halbritter a424ba2055 Restore configuration property for http requests names when using WebFlux
Closes gh-39083
2024-01-11 16:28:23 +01:00
Moritz Halbritter cb3745ff92 Restore configuration property for http requests names when using WebFlux
Closes gh-39083
2024-01-11 16:26:57 +01:00
Andy Wilkinson 17e9f0cb8e Merge branch '3.2.x'
Closes gh-39093
2024-01-11 11:36:38 +00:00
Andy Wilkinson 7087897507 Merge branch '3.1.x' into 3.2.x
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson 45c32854a5 Fix Checkstyle upgrade
Closes gh-38746
2024-01-10 15:37:38 +00:00
Moritz Halbritter 3e705e8d56 Polish "Use unknown_service as default application name for OpenTelemetry"
See gh-38219
2024-01-10 11:42:22 +01:00
Lenin Jaganathan 470029aff1 Use unknown_service as default application name for OpenTelemetry
See gh-38219
2024-01-10 11:42:12 +01:00
Jonatan Ivanov 820396fdff Add ProcessInfoContributor
This InfoContributor exposes information about
the process of the application.

See gh-38371
2024-01-10 08:45:49 +01:00
Moritz Halbritter 7120dc07ae Adapt to changes in Brave tagged fields handling
See gh-38724

See gh-37435
2024-01-09 11:37:15 +01:00
adispezo 0ca55bf0a6 Add local and tagged correlation fields
Local fields only work in Brave and not with OpenTelemetry.

Tagged fields work both with Brave and with OpenTelemetry.

See gh-37435
2024-01-09 11:35:40 +01:00
Moritz Halbritter 2cce123bb5 Add property to control 'path' field inclusion in error responses
By default it is included.

Closes gh-38619
2024-01-09 09:33:00 +01:00
Moritz Halbritter c4be302fdb Auto-configure SpanTagAnnotationHandler
Closes gh-38662
2024-01-09 09:03:51 +01:00
Andy Wilkinson 93a2b1cda0 Remove dependency management for Dropwizard Metrics
Closes gh-39034
2024-01-08 09:43:37 +00:00
Andy Wilkinson a1c7c0bccc Upgrade to AssertJ 3.25.1
Closes gh-38997
2024-01-04 17:26:35 +00:00
Phillip Webb 5354ad15b3 Merge branch '3.1.x'
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou 8599e5a986 Remove unnecessary `toString()` calls
See gh-38739
2023-12-19 22:38:34 -08:00
Phillip Webb 1d10e51755 Adapt to upstream Spring Security changes 2023-12-14 20:33:09 -08:00
Moritz Halbritter c50172d5c7 Undeprecate 'management.metrics.tags'
Closes gh-38583
2023-12-13 08:26:11 +01:00
Moritz Halbritter ff82b8d1c1 Add auto-configuration for a no-op tracer
This auto-configuration ensures, if Micrometer Tracing is on the
classpath, that there is always a tracer. It backs off if there is
already a tracer, for example contributed by the Brave or the Otel
auto-configurations, which are run before.

See gh-38568
2023-12-12 11:29:43 +01:00
Moritz Halbritter 02347abefb Disable propagation of traces if tracing is disabled
Closes gh-38641
2023-12-05 11:19:43 +01:00
Moritz Halbritter a0fc2d48cd Merge branch '3.1.x' 2023-12-05 11:19:32 +01:00
Moritz Halbritter 350bc26bbe Reinstate 'management.tracing.enabled' property
See gh-38626
2023-12-05 11:18:18 +01:00
Moritz Halbritter 4d01d95fbc Merge branch '3.1.x'
Closes gh-38627
2023-12-01 14:45:53 +01:00
Moritz Halbritter 3d4d1e80ca Remove management.tracing.enabled from documentation
Closes gh-38626
2023-12-01 14:43:13 +01:00
Brian Clozel 0321a8a05b Configure ObservationRegistry on JmsListener
Prior to this commit, we set in gh-37388 the ObservationRegistry on the
auto-configured JmsTemplate bean. This enables observations and context
propagation when sending JMS messages.

This commit applies the same to the `DefaultJmsListenerContainerFactory`
and the `DefaultJmsListenerContainerFactoryConfigurer`, in order to
enable observations on `@JmsListener` annotated methods.

This commit also refactors the support implemented in gh-37388 to avoid
relying on a bean post processor and instead set the observation
registry directly in the main auto-configuration: while Micrometer core
is an actuator-only dependency, Micrometer Observation API is a compile
dependnecy for spring-jms itself and there is no need to separate
concerns there.

Fixes gh-38613
2023-12-01 09:36:00 +01:00
Moritz Halbritter 6cb9af11e8 Merge branch '3.1.x'
Closes gh-38610
2023-11-30 09:03:27 +01:00
Moritz Halbritter 203cd542c0 Clear MeterRegistry before each test case
Closes gh-38604
2023-11-30 09:02:22 +01:00
Andy Wilkinson 75a8955659 Only start management context when parent has a web server
Fixes gh-38554
2023-11-28 17:45:12 +00:00
Moritz Halbritter f613ab89b9 Auto-configure observations for RestClients
Closes gh-38500
2023-11-23 09:28:09 +01:00
Andy Wilkinson 9c68a2ab87 Integrate child management context with parent context's lifecycle
Previously, the child management context was created when the
parent context's web server was initialized and it wasn't stopped
or closed until the parent context was closed. This resulted in
the child context being left running when the parent context was
stopped. This would then cause a failure when the parent context
was started again as another web server initialized event would be
received and a second child management context would be started.

This commit updates the initialization of the child management
context to integrate it with the lifecycle of the parent context.
The management context is now created the first time the parent
context is started. It is stopped when the parent context is
stopped and restarted if the parent context is started again.
This lifecycle management is done using a phase that ensures
that the child context is not started until the parent context's
web server has been started.

Fixes gh-38502
2023-11-22 19:50:22 +00:00
Johnny Lim 175b6473c7 Polish
See gh-38389
2023-11-22 10:16:19 +01:00
Phillip Webb 59493e8306 Fix failing tests following version upgrades 2023-11-20 21:03:17 -08:00
Moritz Halbritter d8ce901011 Close meter registries early in the shutdown process
Closes gh-38240
2023-11-16 09:26:02 +01:00
Andy Wilkinson 517026ab9f Merge branch '3.1.x'
Closes gh-38366
2023-11-15 16:00:20 +00:00
Andy Wilkinson 37b2567aeb Merge branch '3.0.x' into 3.1.x
Closes gh-38365
2023-11-15 16:00:05 +00:00
Andy Wilkinson ff555c5ceb Merge branch '2.7.x' into 3.0.x
Closes gh-38364
2023-11-15 15:57:39 +00:00
Andy Wilkinson 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
Moritz Halbritter 7a8a393154 Revert "Close meter registries early in the shutdown process"
This reverts commit f62c1188a1.
2023-11-15 14:17:07 +01:00
Moritz Halbritter 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
Phillip Webb 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
Claudio Nave 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
Phillip Webb 0ea75f0f65 Polish 2023-11-05 10:53:25 -08:00
Phillip Webb cc4ef32efe Merge branch '3.1.x' 2023-11-02 14:19:12 -07:00
Phillip Webb 47c1088111 Polish 2023-11-02 14:19:07 -07:00
Moritz Halbritter 20edbb402f Merge branch '3.1.x' 2023-10-31 10:23:13 +01:00
Moritz Halbritter 607ed86edb Merge branch '3.0.x' into 3.1.x 2023-10-31 10:23:01 +01:00
Moritz Halbritter dccf378d49 Polish CloudFoundryActuatorAutoConfiguration 2023-10-31 10:09:44 +01:00
Moritz Halbritter e0985331c0 Polish ReactiveCloudFoundrySecurityService 2023-10-31 09:56:35 +01:00
Moritz Halbritter 9152217c96 Fix JUnit's @Nested usage 2023-10-31 09:49:01 +01:00
Moritz Halbritter 627a821d5f Polish ReactiveTokenValidator 2023-10-31 09:49:01 +01:00
Moritz Halbritter 0e63326beb Merge branch '3.1.x'
Closes gh-38080
2023-10-27 14:21:26 +02:00
Moritz Halbritter 140ba4039d Merge branch '3.0.x' into 3.1.x
Closes gh-38079
2023-10-27 14:20:07 +02:00
Moritz Halbritter 43a3fbf449 Move "Sanitize Sensitive Values" in docs
Closes gh-35917
2023-10-27 14:16:48 +02:00
Moritz Halbritter 79f8bfaeb7 Merge branch '3.1.x'
Closes gh-38073
2023-10-27 10:55:10 +02:00
Moritz Halbritter 790ee9afb5 Add FailureAnalyzer for NoSuchHealthContributorFailureExceptions
Closes gh-36489
2023-10-27 10:48:48 +02:00
Moritz Halbritter 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
Johnny Lim b5d4983829 Polish
See gh-37984
2023-10-23 11:15:27 +02:00
Phillip Webb d638bbb0ba Merge branch '3.1.x'
Closes gh-37967
2023-10-19 21:25:44 -07:00
Phillip Webb 1d456e09d2 Merge branch '3.0.x' into 3.1.x
Closes gh-37966
2023-10-19 21:12:52 -07:00
Phillip Webb a0b999c8b4 Merge branch '2.7.x' into 3.0.x
Closes gh-37965
2023-10-19 20:55:51 -07:00
Phillip Webb abdad1cabe Constently use assertThatExceptionOf... assertions
Closes gh-37964
2023-10-19 20:17:26 -07:00
Johnny Lim 446677375e Polish gh-35082
See gh-37831
2023-10-12 14:17:02 +02:00
Andy Wilkinson 81cbf05b41 Merge branch '3.1.x'
Closes gh-37839
2023-10-12 11:39:19 +01:00
Andy Wilkinson 19b877fc14 Merge branch '3.0.x' into 3.1.x
Closes gh-37838
2023-10-12 11:39:06 +01:00
Andy Wilkinson f780cc6d03 Merge branch '2.7.x' into 3.0.x
Closes gh-37837
2023-10-12 11:38:32 +01:00
Andy Wilkinson 11311dbf6d Register task executor metrics when using lazy init
Fixes gh-37832
2023-10-12 11:19:33 +01:00
Andy Wilkinson bdaf7a7603 Merge branch '3.1.x'
Closes gh-37830
2023-10-11 15:06:09 +01:00
Andy Wilkinson 411586347c Merge branch '3.0.x' into 3.1.x
Closes gh-37829
2023-10-11 15:04:21 +01:00
Andy Wilkinson 781ac2ece2 Merge branch '2.7.x' into 3.0.x
Closes gh-37828
2023-10-11 15:02:36 +01:00
Moritz Halbritter 1bd14652d8 Apply Wavefront token type to auto-configured WavefrontSender
Closes gh-37165
2023-10-11 09:12:26 +02:00
Andy Wilkinson 5280cfeec0 Adapt to breaking API change in Micrometer
See gh-37703
2023-10-10 17:56:56 +01:00
Jonatan Ivanov 346db8e795 Add auto-configuration for SpanAspect
See gh-37640
2023-10-05 11:26:21 +02:00
Moritz Halbritter fbec06a134 Support new CSP auth method for Wavefront
Closes gh-37165
2023-10-05 10:44:19 +02:00
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 d59ea2f038 Start building against Micrometer Tracing 1.1.6 snapshots
See gh-37694
2023-10-04 10:00:18 +01:00
Andy Wilkinson 7907358875 Start building against Micrometer Tracing 1.0.11 snapshots
See gh-37679
2023-10-04 09:52:49 +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