Commit Graph

2077 Commits (6c448094880bf2fc53f14606de64d812eb37cfa3)

Author SHA1 Message Date
Phillip Webb 32b9945632 Polish 2 years ago
Andy Wilkinson 3a2703e8f6 Upgrade to Jakarta Mail 2.1 and switch to Eclipse Angus RI
Closes gh-33059
Closes gh-33050
2 years ago
Andy Wilkinson b67c427259 Upgrade to Servlet 6.0 and related EE 10 specs
Co-authored-by: Phillip Webb <pwebb@vmware.com>

Closes gh-33036
Closes gh-33037
Closes gh-33038
Closes gh-33039
Closes gh-33040
Closes gh-33041
Closes gh-33042
Closes gh-33043
2 years ago
Phillip Webb 179aa987ee Unify actuator descriptor class names
Update actuator endpoints to consistently use `...Descriptor` for
JSON support classes.

Closes gh-33022
2 years ago
Phillip Webb 34b4ae8e05 Merge branch '2.7.x'
Closes gh-33019
2 years ago
Andy Wilkinson 604aa4d512 Align auto-configured Lettuce metrics with Lettuce's defaults
Closes gh-32986
2 years ago
Andy Wilkinson 8e08931411 Merge branch '2.7.x'
Closes gh-32990
2 years ago
Andy Wilkinson 394ae76b04 Merge branch '2.6.x' into 2.7.x
Closes gh-32989
2 years ago
Andy Wilkinson fcd3413ba0 Allow histograms to be disabled for Lettuce metrics
Closes gh-32985
2 years ago
Andy Wilkinson beea06f515 Polish "Handle custom observation name for HTTP reqs in max URI tag filters"
See gh-32973
2 years ago
Johnny Lim 89fe895cd6 Handle custom observation name for HTTP reqs in max URI tag filters
See gh-32973
2 years ago
Brian Clozel 0acaa0e460 Adapt to observation changes in Framework
See spring-projects/spring-framework#29388
2 years ago
Moritz Halbritter 05c5b1225c Replace Tag to KeyValues adapter code
Closes gh-32876
2 years ago
Moritz Halbritter 7aff82009f Revert "Register no-op tracer bean if tracing is disabled"
This reverts commit 2d75a8a9eb.
2 years ago
Moritz Halbritter 2d75a8a9eb Register no-op tracer bean if tracing is disabled
Closes gh-32907
2 years ago
Andy Wilkinson 11cff48271 Start building against Micrometer Tracing 1.0.0 snapshots
See gh-32937
2 years ago
Phillip Webb 2b5a29d514 No longer log hostname during application start
Remove hostname logging since `InetAddress.getLocalHost().getHostName()`
causes a network lookup and can take a long time.

Closes gh-32908
2 years ago
Phillip Webb 9856286a2d Refine actuator httpexhanges naming
See gh-32885
2 years ago
Andy Wilkinson 29f7a596fe Polish 2 years ago
Phillip Webb 3e50836b1a Rename httptrace endpoint and related classes to httpexchanges
Rename `/actuator/httptrace` to `/actuator/httpexchanges` to better
describe its purpose and to remove confusion with distribute tracing.

This change also takes the opportunity to improve the code by making
the `HttpExchange` class (previously `HttpTrace`) fully immutable.

Closes gh-32885

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>
2 years ago
Johnny Lim 8d17d2d443 Handle null span in LazyTracingSpanContextSupplier consistently
See gh-32817
2 years ago
Johnny Lim 5067aab552 Polish
See gh-32840
2 years ago
Marcin Grzejszczak b753170807 Add missing BaggageTextMapPropagator for OTel W3C
Without this change we're missing the BaggageTextMapPropagator for
OTel. This means that we're not propagating remote-fields
(only baggage via the 'baggage' field).

With this change we're adding the missing propagator as
THE LAST entry in the composite TextMapPropagator. It has to be
last cause with the latest Snapshots of Micrometer Tracing it
will append the remote field baggage to existing baggage in the
context extracted via the W3CBaggagePropagator.

See gh-32898
2 years ago
Phillip Webb a59b6cb1f3 Polish 2 years ago
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2 years ago
Andy Wilkinson 99edda735e Polish 2 years ago
Brian Clozel 685fa900f8 Auto-configure Observation instrumentation for WebFlux
Prior to this commit, Spring Boot would offer a specific Metrics
instrumentation for WebFlux applications through a `WebFilter` and
custom Tag providers.

As of Spring Framework 6.0, the Observation instrumentation is done
directly in WebFlux, also with a `WebFilter`. While this allows both
metrics and traces, some features cannot be supported in the same way
with this new infrastructure.
The former `WebFilter` has been removed and the Tagging infrastructure
deprecated in favor of custom Observation conventions. This commit
provides an adapter layer so that developers can refactor their custom
tagging solution to the convention way, during the deprecation phase,
without losing any feature.

Closes gh-32539
2 years ago
Brian Clozel 9948fc3e39 Use GraphQL Observation instrumentation
This commit migrates the existing metrics support (added in #29140) to
the new `Observation` instrumentation contributed in
spring-projects/spring-graphql#501.

We cannot have a smoother migration path here as the instrumentation
does not use the same context information for metadata extraction.

Closes gh-32794
2 years ago
Madhura Bhave ce3c933f77 Adapt to Spring Security changes
Closes gh-32604
2 years ago
Phillip Webb 2e74878ba4 Downgrade to OpenSAML 4.0.1
See gh-32604
2 years ago
Brian Clozel e5c12c2b56 Move HTTP client observation auto-configuration
This commit moves the observation auto-configuration from the metrics
package to the observation package for consistency.

See gh-32484
See gh-32518
2 years ago
Brian Clozel b2fe807d47 Move MVC metrics to Observation auto-configuration
This commit moves the entire Metrics auto-configuration for Spring MVC
to the new `Observation` API and the instrumentation contributed in
Spring Framework.

Closes gh-32538
2 years ago
Brian Clozel cbca457eff Adapt to HTTP Observation changes in Framework
This commit adapts to the renames/package changes in the HTTP
Observation support in Spring Framework.

See spring-projects/spring-framework#29334
2 years ago
Andy Wilkinson 4700a00d94 Auto-configure CompositeSpanHandler with Brave
Closes gh-32753
2 years ago
Andy Wilkinson d593d194de Polish "Add auto-configuration for Exemplars"
See gh-32415
2 years ago
Jonatan Ivanov c5b2bc3dc7 Add auto-configuration for Exemplars
See gh-32415
2 years ago
Andy Wilkinson 81ee173877 Polish
See gh-32399
2 years ago
Andy Wilkinson 1af21fe33f Polish "Use TracingAwareMeterObservationHandler if tracing is configured"
See gh-32399
2 years ago
Jonatan Ivanov 415b9025c8 Use TracingAwareMeterObservationHandler if tracing is configured
See gh-32399
2 years ago
Bertolt Meier 647a2905c8 Add checkstyle rule for List.of() / Set.of() / Map.of()
This commits adds a checkstyle rule to not use List.of(), Set.of()
and Map.of(), preferring Collections.emptyList(), emptySet(), and
emptyMap() respectively.

It replaces usages of these methods across the codebase.

See gh-32655
2 years ago
Johnny Lim 1032f8cc94 Polish Micrometer tracing changes
See gh-32627
2 years ago
Andy Wilkinson e4544c1785 Use new constructor to configure W3CPropagation without baggage
Closes gh-32524
2 years ago
Andy Wilkinson 180d0edbca Decouple AutoTimeProperties from Micrometer Core
Closes gh-32676
2 years ago
Andy Wilkinson 7e9e64a2ea Revert "Merge pull request #32399 from jonatan-ivanov"
This reverts commit ad40ef3398, reversing
changes made to 6eb32647f5.
2 years ago
Jonatan Ivanov a0ceb2c3ff Use TracingAwareMeterObservationHandler if tracing is configured
See gh-32399
2 years ago
Jonatan Ivanov fff4aaaac1 Fix Observation lifecycle issues in ObservationAutoConfigurationTests
See gh-32662
2 years ago
Andy Wilkinson 403803837a Adapt to changes in REST Docs for documenting query parameters
See gh-32623
2 years ago
Andy Wilkinson 4dfd770406 Ensure that metrics and observation properties are enabled
Closes gh-32676
2 years ago
Johnny Lim 73fd760137 Polish HTTP client observability changes
See gh-32484
See gh-32518

Closes gh-32636
2 years ago
Marcin Grzejszczak dfd148fb76 Make auto-configured Brave Tracer more compliant with OTel tracer
By default we will not support joined spans and the trace ID will
be 128-bit.

See gh-32615
2 years ago
Brian Clozel 3e6ad67f16 Switch to Micrometer 1.10.0-SNAPSHOT
See gh-32598
2 years ago
Stephane Nicoll d106fc266a Revert "Adapt to deprecations in Spring Framework snapshots"
This reverts commit ff6acbe972.
2 years ago
Stephane Nicoll ff6acbe972 Adapt to deprecations in Spring Framework snapshots 2 years ago
Andy Wilkinson 7c4e46e538 Allow thread dump endpoint to call ThreadMXBean in a native image
Closes gh-31680
2 years ago
Phillip Webb e0b67889a8 Use Stream.toList instead of Stream.collect when possible
Update code to make use of `Stream.toList()` whenever possible.

Closes gh-28177
2 years ago
Andy Wilkinson 3ab36074dc Make management.tracing.enabled are first-class property
This will allow metadata to be generated for it automatically.

Closes gh-31656
2 years ago
Andy Wilkinson 6d4390e034 Simplify ConditionalOnEnabledTracing
Closes gh-32572
2 years ago
Andy Wilkinson 69c8959e6d Remove remnants of references to GlobalKeyValuesProviders
Closes gh-31841
2 years ago
Stephane Nicoll c2b8d3de21 Declare beans that can be instantiated at build-time static
This commit updates the bean factory methods for beans that can be
instantiated at build-time to be static. Doing so makes sure that
the enclosing configuration class does not have to be resolved in
order to create the instance.

Closes gh-32570
2 years ago
Johnny Lim d6cfcd0825 Fix compile errors
Closes gh-32569
2 years ago
Andy Wilkinson 522cb1c0ea Polish deprecation warnings
See gh-32541
2 years ago
Andy Wilkinson dbcb291b7a Polish
See gh-32541
2 years ago
Andy Wilkinson bcb5e84129 Avoid using reflection when creating composite health contributors
Closes gh-32541
2 years ago
Andy Wilkinson 51df7813a5 Remove code deprecated in 2.x and add since and forRemoval attributes
Closes gh-32548
Closes gh-32549
2 years ago
Brian Clozel 5b092f5d80 Polish
See gh-32518
2 years ago
Brian Clozel 8b4a20d6cd Use Observation infrastructure for instrumenting WebClient
As of spring-projects/spring-framework#28341, `WebClient` is
instrumented directly for `Observation`.
This commit removes the custom `ExchangeFilterFunction` that previously
instrumented the client for metrics.

As a result, the relevant tag providers are now deprecated and adapted
as `ObservationConvention` for the time being.

Closes gh-32518
2 years ago
Stephane Nicoll 3702c71fc1 Adapt to Spring AOT changes 2 years ago
Andy Wilkinson 17953eeb33 Merge branch '2.7.x'
Closes gh-32544
2 years ago
Andy Wilkinson 3ef633b096 Merge branch '2.6.x' into 2.7.x
Closes gh-32543
2 years ago
Andy Wilkinson 84a25c7dcf Configure Log4j2 classpath overrides consistently
Closes gh-32537
2 years ago
Andy Wilkinson f10d696c46 Merge branch '2.7.x'
Closes gh-32536
2 years ago
Andy Wilkinson 9f5b7db553 Merge branch '2.6.x' into 2.7.x
Closes gh-32535
2 years ago
Andy Wilkinson be48f37a83 Fix LogbackMetrics auto-config test with Logback and Log4j2 on cp
Closes gh-32533
2 years ago
dreis2211 388134713e Remove unused MockReactiveWebServerFactory
See gh-32526
2 years ago
Andy Wilkinson 0bfa9cd704 Upgrade to Logback 1.4 and SLF4J 2.0
Closes gh-12649
2 years ago
Andy Wilkinson 574242b44f Polish "Break cycles between Zipkin senders and HTTP client observation"
See gh-32528
2 years ago
Marcin Grzejszczak b41ed44b60 Break cycles between Zipkin senders and HTTP client observation
Previously, RestTemplateBuilder and WebClient.Builder beans were used
to create the HTTP client for sending out spans. Those same beans are
also instrumented for observability which results in a cycle.

This commit breaks the cycle by not using the application-web
builders to create the RestTemplate and WebClient's used by the Zipkin
senders. Instead, builders are created inline, with new callbacks
being introduced to allow the user to customize these Zipkin-specific
builders.

See gh-32528
2 years ago
Andy Wilkinson 8c74b62888 Polish "Prefer WebClient to RestTemplate for Zipkin's Sender"
See gh-32529
2 years ago
Marcin Grzejszczak cd3b3d468a Prefer WebClient to RestTemplate for Zipkin's Sender
Previously, a Webclient-based sender was only for reactive web
applications, falling back to a RestTemplate-based sender in all
other cases.

With this commit we now prefer to use WebClient if it is available,
irrespective of the web application type. The assumption is that
if the user has WebClient on the classpath, it's either a reactive
web application, or it's a servlet web application or non-web
application but WebClient is preferred.

See gh-32529
2 years ago
Brian Clozel eac50a8f0c Auto-configure Observation support for RestTemplate
Prior to this commit, Spring Boot would auto-configure a customizer that
instruments `RestTemplate` through a `RestTemplateBuilder`. This would
install a request interceptor that instrumented client exchanges for
producing metrics.

As of spring-projects/spring-framework#28341, the instrumentation is
done at the `RestTemplate` level directly using the `Observation` API.
The `Tag` (now `KeyValue`) extraction, observation name and
instrumentation behavior now lives in the Spring Framework project.

This commit updates the auto-configuration to switch from Boot-specific
Metrics instrumentation to a generic Observation instrumentation.
As a migration path, some configuration properties are deprecated in
favor of the new `management.observations.*` namespace.

Closes gh-32484
2 years ago
Andy Wilkinson 36a4b36ccb Polish "Add support for MDC, Context Propagation (via B3 and W3C), and Baggage"
See gh-32480
2 years ago
Marcin Grzejszczak 52d1436dc6 Add support for MDC, Context Propagation (via B3 and W3C), and Baggage
See gh-32480
2 years ago
Andy Wilkinson 5449397463 Require micrometer-tracing-bridge-otel to auto-configure OTel
Closes gh-32503
2 years ago
Andy Wilkinson 6cc3619675 Require micrometer-tracing-bridge-brave to auto-configure Brave
Closes gh-32502
2 years ago
Vedran Pavic 230f2cda84 Migrate to AuthorizationFilter in Spring Security auto-config
This commit updates Servlet based Spring Security auto-configuration
to use AuthorizationFilter, which is intended to supersede
FilterSecurityInterceptor.

See gh-31255
2 years ago
Scott Frederick 08022ba86e Remove support for locating imports using spring.factories
With this commit, loading `@AutoConfiguration`,
`@ImportAutoConfiguration`, and `@ManagementContextConfiguration`
classes is supported with `.imports` files only. Support for loading
these classes with `spring.factories` is removed.

Closes gh-29699
2 years ago
Scott Frederick f9c341c75a Revert "Generate the AutoConfiguration.imports file from annotations"
This reverts commit da4de7d67d.
2 years ago
Scott Frederick d62d7ca75d Revert "Generate ManagementContextConfiguration.imports file from annotations"
This reverts commit 6b3b0dd3a6.
2 years ago
Andy Wilkinson b084019d34 Reverse the order of tracing and metrics handlers
Closes gh-32463

Co-authored-by: Jonatan Ivanov <jonatan.ivanov@gmail.com>
2 years ago
Andy Wilkinson 78a64d7f61 Allow DefaultMeterObservationHandler to be replaced by user's bean
Closes gh-32462

Co-authored-by: Jonatan Ivanov <jonatan.ivanov@gmail.com>
2 years ago
Andy Wilkinson 5cb68eab1e Remove HotSpot specifics from HeapDumper strategy interface
Closes gh-27533
2 years ago
Stephane Nicoll 84298e3326 Adapt to API change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/29005
2 years ago
Andy Wilkinson 144fdaa703 Merge branch '2.6.x' into 2.7.x
Closes gh-32283
2 years ago
Andy Wilkinson 78f4242e46 Build with Gradle 7.5 while still supporting Gradle 6.8+
Closes gh-32281
2 years ago
Brian Clozel 89c61e9093 Adapt GlobalObservationConvention imports
See micrometer-metrics/micrometer#3387
2 years ago
Phillip Webb 46be4a3f30 Merge branch '2.7.x' 2 years ago
Phillip Webb e88a682220 Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb 85697ac482 Update copyright year of changed files 2 years ago
Jonatan Ivanov 13a2ea9194 Build against Micrometer 1.10.0-M5 and Tracing 1.0.0-M8 snapshots
See gh-32048

Co-authored-by: Marcin Grzejszczak <mgrzejszczak@vmware.com>
2 years ago
Stephane Nicoll e5d0e34268 Adapt to recent changes in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/29082
See https://github.com/spring-projects/spring-framework/issues/28877
2 years ago
Scott Frederick 6b3b0dd3a6 Generate ManagementContextConfiguration.imports file from annotations
This commit adds the
`ManagementContextConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module.

Closes gh-32222
2 years ago
Scott Frederick da4de7d67d Generate the AutoConfiguration.imports file from annotations
This commit adds the `AutoConfigurationImportsAnnotationProcessor` to
the `spring-boot-autoconfigure-processor` annotation processor
module. When added to a project build, the annotation processor will
generate the
`org.springframework.boot.autoconfigure.AutoConfiguration.imports`
file automatically from `@AutoConfiguration`-annotated classes. It
also applies the annotation processor to the Spring Boot build.

Closes gh-31228
2 years ago
Andy Wilkinson 795ea289db Adapt to BindingReflectionHintsRegistrar moving package 2 years ago
Andy Wilkinson cf8e84d406 Adapt to BindingReflectionHintsRegistrar moving into spring-core 2 years ago
Andy Wilkinson d6e9a03136 Adapt to synthesized annotation changes in Framework 2 years ago
Phillip Webb 44f1949c5e Polish hint API calls 2 years ago
Madhura Bhave 47effdcade Support role-based sanitization for actuator endpoints
Closes gh-32156
2 years ago
Stephane Nicoll 24a52aa66d Annotate actuator internal infrastructure with @Reflective
This commit simplifies the registration of hints for the infrastructure
of the Actuator that is invoked via reflection.
2 years ago
Stephane Nicoll e6977777cc Merge branch '2.7.x'
Closes gh-32100
2 years ago
Stephane Nicoll ca63a6e9ad Merge branch '2.6.x' into 2.7.x
Closes gh-32099
2 years ago
Stephane Nicoll 191593cf15 Review Git contribution documentation
Closes gh-31904
2 years ago
Madhura Bhave cea6492c4a Align default JMX and WEB endpoint exposures
Closes gh-32005
2 years ago
Stephane Nicoll 888ccfea2d Adapt to changes in Spring Framework 2 years ago
Andy Wilkinson ba93e6c0ed Restore support for Jersey
Closes gh-28637
2 years ago
Andy Wilkinson fb2f7c1e38 Fix test to create correct type of child context
Closes gh-32002
2 years ago
Madhura Bhave 0991bd3983 Harmonize data configuration
Any classes that rely on Spring Data being on the classpath
have been moved under a data package.

Certain configuration properties have also been updated to
accurately reflect whether Spring Data is required for the
auto-configuration to work.

Closes gh-11574
2 years ago
Stephane Nicoll 1af5994d8f Adapt to API change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/28927
2 years ago
Andy Wilkinson 2f0dfc341c Merge branch '2.7.x'
Closes gh-31972
2 years ago
Andy Wilkinson 700460c322 Merge branch '2.6.x' into 2.7.x
Closes gh-31971
2 years ago
Andy Wilkinson fa73b73898 Fail build on missing configuration property descriptions
Closes gh-31916
2 years ago
Johnny Lim 6a4681baf5 Polish
See gh-31948
2 years ago
Moritz Halbritter eaf8683e8d Fix timeunit in ZipkinConfigurations to milliseconds instead of seconds
Closes gh-31957
2 years ago
Moritz Halbritter 767631e2cc Fix bean chicken and egg problem with WavefrontSender
Closes gh-31954
2 years ago
Brian Clozel 38f1bc9793 Reinstate Spring for GraphQL auto-configuration
This commit adds the Spring for GraphQL auto-configuration back
into Spring Boot 3.0, now that a 1.1.0 release is scheduled with the
required baseline. This release also needs GraphQL Java 19.0 as a
baseline.

Closes gh-31809
2 years ago
Madhura Bhave a82b95c955 Merge branch '2.7.x' into main
Closes gh-31927
2 years ago
Madhura Bhave 2884ec81e9 Merge branch '2.6.x' into 2.7.x
Closes gh-31926
2 years ago
Madhura Bhave cc15eb0b96 Configure existing probes at additional path when necessary
Fixes gh-30612
2 years ago
Stephane Nicoll db0e008c01 Register composed annotations explicitly
Closes gh-31919
2 years ago
Phillip Webb 22144987e9 Update copyright year of changed files 2 years ago
Phillip Webb e08c16dfd6 Polish 2 years ago
Phillip Webb 57e967576e Adapt to upstream Spring Framework AOT changes 2 years ago
Stephane Nicoll fdb1ee5f97 Adapt to deprecations in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/27954
See gh-29699
2 years ago
Stephane Nicoll c413f9adbe Merge branch '2.7.x'
Closes gh-31884
2 years ago
Stephane Nicoll 53a652ec65 Merge branch '2.6.x' into 2.7.x
Closes gh-31883
2 years ago
Adrian Bob aad9c8906a Disable auto-detection in tests that start Hazelcast
This commit updates test configurations to disable auto-detection of
Hazelcast instances.

See gh-31863
2 years ago
Stephane Nicoll 782e3f75b6 Polish Hazelcast configuration
This commit updates the XSD to 4.2 and removes the "tcp-ip" network
option as it is disabled by default.

See gh-31863
2 years ago
Stephane Nicoll 193c1d7acf Adapt to changes in DefaultGenerationContext
See https://github.com/spring-projects/spring-framework/issues/28877
2 years ago
Phillip Webb 7377d85096 Merge branch '2.7.x'
Closes gh-31866
2 years ago
Phillip Webb a4ef6a7c5c Merge branch '2.6.x' into 2.7.x
Closes gh-31865
2 years ago
Phillip Webb f8412847dc Update copyright year for "Fix typos in code and documentation"
See gh-31734
2 years ago
Marc Wrobel dbfc6bded4 Fix typos in code and documentation
See gh-31734
2 years ago
Phillip Webb b93dbd56e8 Merge branch '2.7.x' 2 years ago
Phillip Webb 3931e82841 Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb 4bcec6e0ee Polish 2 years ago
Olga Maciaszek-Sharma 57dc274284 Switch to Spring Framework SNAPSHOTs
Switch to Spring Framework SNAPSHOTs and adapt to updated APIs.

See gh-31834
2 years ago
Andy Wilkinson de672f4330 Merge branch '2.7.x'
Closes gh-31819
2 years ago
Andy Wilkinson 2e98cafcca Merge branch '2.6.x' into 2.7.x
Closes gh-31818
2 years ago
Andy Wilkinson ab2b04fafd Find health contributors in ancestor contexts in non-reactive apps
Previously, health contributors in a non-reative app were found by
retrieving them from the application context rather than via
dependency injection. This results in only contributors from the
current context being found, with contributors in ancestor contexts
ignored.

This commit moves to injection of the contributors, aligning the
behaviour with that of a reactive application.

Closes gh-27308
2 years ago
Vedran Pavic f1bf80f5e1 Upgrade to Flyway 9.0.1
See gh-31723
2 years ago
Andy Wilkinson 18d3d4de5d Merge branch '2.7.x'
Closes gh-31805
2 years ago
Andy Wilkinson 10e19d504a Merge branch '2.6.x' into 2.7.x
Closes gh-31804
2 years ago
Andy Wilkinson 628c2cd0b1 Ensure JMX endpoints are uniquely named in a context hierarchy
Closes gh-31718
2 years ago
Moritz Halbritter 5030cfedcc Revert "Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer"
This reverts commit 04391275c1.
2 years ago
Andy Wilkinson 5c057a2730 Auto-configure the new Elasticsearch clients
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.

As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.

Closes gh-30647
Closes gh-28597
Closes gh-31755
2 years ago
Stephane Nicoll 51cba6ec72 Polish "Add AOT support for actuator"
See gh-31671
2 years ago
Moritz Halbritter 584b7d1343 Add AOT support for actuator
Mainly adds reflection hints for the actuator infrastructure.
Also adds the OperationReflectiveProcessor, which registers the
@ReadMethod, @DeleteMethod and @WriteMethod annotated methods for
reflection and adds reflection hints for method return types.

See gh-31671
2 years ago
Andy Wilkinson 3405a54f9e Exclude Jetty toolchain dependencies in favor of official API artifacts
Closes gh-31720
2 years ago
Madhura Bhave 7c56a45d3e Drop support for String path matching for MVC endpoints
Closes gh-31700
2 years ago
Stephane Nicoll 9cace34a19 Merge branch '2.7.x'
Closes gh-31705
2 years ago
Stephane Nicoll b8647551cb Merge branch '2.6.x' into 2.7.x
Closes gh-31704
2 years ago
Johnny Lim b17cb9b92b Polish gh-31231
See gh-31540
2 years ago
Madhura Bhave d66e108703 Revert actuator changes related to path pattern parsing
See gh-31547
2 years ago
Madhura Bhave 7954f5e566 Adapt to change in default strategy for URL path matching in Spring MVC
Closes gh-31547
2 years ago
Andy Wilkinson 08d37b7fb6 Merge branch '2.7.x'
Closes gh-31694
2 years ago
Andy Wilkinson 1c2b0ae705 Merge branch '2.6.x' into 2.7.x
Closes gh-31693
2 years ago
Andy Wilkinson 7c55639167 Depend on log4j-api directly rather than via Elastic's transitives
Closes gh-31692
2 years ago
Andy Wilkinson 99fabfa934 Revert "Remove spring-aspects dependency following fix in Data JPA"
This reverts commit cd6c7cd6c9.

The fix in Spring Data JPA is incomplete so we need to reinstate the
workaround.
2 years ago
Andy Wilkinson cd6c7cd6c9 Remove spring-aspects dependency following fix in Data JPA
The recent changes in Spring Data JPA [1] mean that we no longer need
a dependency on spring-aspects for Data JPA's hint registration to
succeed.

5821272112
2 years ago
Andy Wilkinson 9b113272d1 Reinstate support for Hibernate Metrics
Closes gh-31675
2 years ago
Oliver Drotbohm b10c57551c Upgrade to Hibernate 6.1.1.Final
This commit makes the following potentially breaking changes:

- Dependency management for modules that do not exist in Hibernate
  6.1 has been removed.
- Hibernate's modules are now in the org.hibernate.orm group. Users
  not using the starter or using modules that are not in the starter
  will have to update their build configuration accordingly.
- spring.jpa.hibernate.use-new-id-generator-mappings has been removed
  as Hibernate no longer supports switching back to the old ID
  generator mappings.

Co-authored-by: Andy Wilkinson <wilkinsona@vmware.com>

Closes gh-31674
2 years ago
Andy Wilkinson acd8d05315 Update copyright date of changed file 2 years ago
Andy Wilkinson efc5391496 Adapt to deprecations in Framework's scheduling APIs
See gh-31241
2 years ago
Moritz Halbritter 8639552405 Start building against Micrometer Tracing 1.0.0-M6 snapshots
See gh-31657
2 years ago
Andy Wilkinson 2821629d54 Remove unchecked raw casts that are now redundant
Closes gh-31326
2 years ago
Andy Wilkinson 7f00378eaf Polish "Start building against Spring Data 2022.0.0-M5 snapshots"
See gh-31582
2 years ago
Andy Wilkinson 19b7e012f3 Upgrade to Prometheus Client 0.16.0
Closes gh-31597
2 years ago
Andy Wilkinson e9136e023b Adapt to trailing slashes no longer being matched by default
See gh-31563
2 years ago
Moritz Halbritter 04391275c1 Make MeterRegistry lazy in TimerObservationHandlerObservationRegistryCustomizer
Closes gh-31580
2 years ago
dreis2211 458f989cf3 Use switch expressions where appropriate
See gh-31527
2 years ago
Andy Wilkinson 631b1e0d76 Merge branch '2.7.x'
Closes gh-31526
2 years ago
Andy Wilkinson 1e08f545d0 Merge branch '2.6.x' into 2.7.x
Closes gh-31525
2 years ago
Andy Wilkinson f49b16c645 Upgrade to Spring Java Format 0.0.34
Closes gh-31524
2 years ago
Stephane Nicoll fe39598e81 Adapt to latest API change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/28585
2 years ago
Phillip Webb b85469a5a5 Merge branch '2.7.x'
Closes gh-31502
2 years ago
Phillip Webb d64f601dfd Merge branch '2.6.x' into 2.7.x
Closes gh-31501
2 years ago
Phillip Webb aed4c47adb Polish CompositeHandlerExceptionResolver
See gh-31495
2 years ago
Guirong Hu 3592292e4b Use ExceptionHandler when Spring MVC uses a different management port
Update `CompositeHandlerExceptionResolver` to search for beans in
all contexts. Note that `BeanFactoryUtils.beansOfTypeIncludingAncestors`
cannot not be used since we need to pick up all beans, even if they
have the same name.

See gh-31495
2 years ago
Moritz Halbritter bb6c56e5f0 Polish "Add WebClient based sender for Zipkin"
See gh-30792
2 years ago
StefanBratanov 12037bd131 Add WebClient based sender for Zipkin
See gh-30792
2 years ago
Moritz Halbritter bc931cb32c Revert "Polish EndpointRequest"
This reverts commit 35997a30a3.
2 years ago
Moritz Halbritter 35997a30a3 Polish EndpointRequest
- Remove redundant cast
2 years ago
Moritz Halbritter c8c552d95b Polish ObservationAutoConfiguration
- Use a better name for the "only metrics, no tracing" case
2 years ago
Moritz Halbritter 06cdc91c85 Polish ObservationAutoConfiguration
- Use a better name for the "only metrics, no tracing" case
- Use more concrete return types
2 years ago
dreis2211 5db04da275 Use pattern matching for instanceof where appropriate
See gh-31475
2 years ago
Johnny Lim 43c2f1c03c Polish AutoConfigureObservability changes
See gh-31457
2 years ago
Johnny Lim aab59c5f2e Static-import Mockito.mock()
See gh-31443
2 years ago
Phillip Webb 657fa3e64e Merge branch '2.7.x'
Closes gh-31409
2 years ago
Phillip Webb 7c91ebb1b0 Merge branch '2.6.x' into 2.7.x
Closes gh-31408
2 years ago
Phillip Webb ae6311ddda Prevent Logback from accidentally being used in Log4J2LoggingSystemTests
Update `Log4J2LoggingSystemTests` to exclude Logback and include
'log4j-slf4j-impl'. The `ModifiedClassPathClassLoader` has also been
updated so that it no longer automatically excludes `log4j` artifacts,
instead we now use `@ClassPathExclusions` on the relevant tests.

Fixes gh-19365
2 years ago
Phillip Webb 85dcbf6100 Merge branch '2.7.x'
Closes gh-31385
2 years ago