Commit Graph

1770 Commits

Author SHA1 Message Date
hakan-krgn 6d9ce8a3b5 Polish code and javadoc
See gh-37112
2023-08-30 13:31:58 +01:00
Phillip Webb 8edec21a6f Update copyright year of changed files 2023-08-13 20:44:44 -07:00
Moritz Halbritter 62fb45f75f Replace contains/put/get pattern with computeIfAbsent 2023-08-08 13:12:47 +02:00
Moritz Halbritter ed9169501e Polish 2023-08-08 13:12:47 +02:00
Stephane Nicoll 37d8760652 Merge branch '3.1.x'
Closes gh-36739
2023-08-04 14:36:27 +02:00
Stephane Nicoll 1df70c9f9b Merge branch '3.0.x' into 3.1.x
Closes gh-36738
2023-08-04 14:36:15 +02:00
Stephane Nicoll 6ee002456d Merge branch '2.7.x' into 3.0.x
Closes gh-36737
2023-08-04 14:36:04 +02:00
Stephane Nicoll 747dbc35fe Warmup connection pool in ConnectionPoolMetricsTests
Closes gh-36474
2023-08-04 14:29:59 +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
Johnny Lim 5a205dbfd1 Polish
See gh-36620
2023-07-28 11:35:33 +01:00
Stephane Nicoll 746cb00833 Merge branch '3.1.x'
Closes gh-36517
2023-07-24 13:00:57 +02:00
Stephane Nicoll 48622f2b7d Merge branch '3.0.x' into 3.1.x
Closes gh-36516
2023-07-24 13:00:47 +02:00
Stephane Nicoll 74349d1192 Merge branch '2.7.x' into 3.0.x
Closes gh-36515
2023-07-24 13:00:38 +02:00
fzyzcjy e67bca121b Fix description of started and ready time metrics
See gh-36507
2023-07-24 12:57:06 +02:00
Andy Wilkinson 3affb3342e Deprecate auto-configuration for InfluxDB
Closes gh-35190
2023-07-20 13:31:10 +01:00
Stephane Nicoll 289d458a60 Start building against Spring Framework 6.1.0-M3 snapshots
See gh-36443
2023-07-18 15:04:42 +02:00
Stephane Nicoll 783bfb62e2 Merge branch '3.1.x'
Closes gh-36420
2023-07-17 10:04:14 +02:00
Stephane Nicoll d2912c6442 Update copyright year of changed files
See gh-36306
2023-07-17 09:40:57 +02:00
Christoph Dreis 8321887d6a Fix typos
See gh-36306
2023-07-17 09:40:16 +02:00
Andy Wilkinson 3b2551619f Merge branch '3.1.x' 2023-07-07 12:19:23 +01:00
Andy Wilkinson 1085c1707e Merge branch '3.0.x' into 3.1.x 2023-07-07 12:19:15 +01:00
Andy Wilkinson 732424f7cb Polish 2023-07-07 12:19:05 +01:00
Andy Wilkinson 8ed2ef5640 Merge branch '3.1.x'
Closes gh-36277
2023-07-07 12:07:25 +01:00
Andy Wilkinson c4157bb515 Merge branch '3.0.x' into 3.1.x
Closes gh-36276
2023-07-07 12:07:07 +01:00
Andy Wilkinson cc80bb78fe Merge branch '2.7.x' into 3.0.x
Closes gh-36275
2023-07-07 12:06:51 +01:00
Andy Wilkinson 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
Andy Wilkinson ce8253ea95 Merge branch '3.1.x'
Closes gh-36238
2023-07-05 09:51:35 +01:00
Andy Wilkinson c9f8d92656 Merge branch '3.0.x' into 3.1.x
Closes gh-36237
2023-07-05 09:47:43 +01:00
Johnny Lim 0fa58c04e7 Use Stream.toList()
See gh-36167
2023-07-05 09:38:19 +01:00
Phillip Webb 1cced11ea3 Merge branch '3.1.x'
Closes gh-36161
2023-07-02 14:01:26 +01:00
Phillip Webb dcde1fac7e Merge branch '3.0.x' into 3.1.x
Closes gh-36160
2023-07-02 14:01:08 +01:00
Phillip Webb 566549021b Merge branch '2.7.x' into 3.0.x
Closes gh-36159
2023-07-02 14:00:47 +01:00
Phillip Webb 51ee702dac Allow configprops endpoint stringify primitive wrappers
Update `ConfigurationPropertiesReportEndpoint` so that primitive
wrapper input values in the Environment are stringified for display.

Fixes gh-36076
2023-07-02 13:59:30 +01:00
Andy Wilkinson ea73203219 Merge branch '3.1.x'
Closes gh-36130
2023-06-30 08:48:51 +01:00
Andy Wilkinson f0fee86b62 Merge branch '3.0.x' into 3.1.x
Closes gh-36129
2023-06-30 08:48:40 +01:00
Andy Wilkinson fa72f90a10 Avoid NPE when a PeriodicTrigger has no initial delay
Closes gh-36081
2023-06-30 08:47:34 +01:00
Andy Wilkinson b645eb32ac Remove deprecated code that was to be removed in 3.2
Closes gh-36034
2023-06-23 18:14:22 +01:00
Andy Wilkinson 357c67a999 Merge branch '3.1.x' 2023-06-23 15:58:51 +01:00
Andy Wilkinson 3f7fe25cb9 Merge branch '3.0.x' into 3.1.x
Closes gh-36044
2023-06-23 15:58:36 +01:00
Andy Wilkinson 2fae5de245 Merge branch '2.7.x' into 3.0.x
Closes gh-36043
2023-06-23 15:50:02 +01:00
Andy Wilkinson d2966e1cbf Polish "Replace calls to verifyComplete() to avoid indefinite blocking"
See gh-35915
2023-06-23 12:38:12 +01:00
ThomazPassarelli f9da30faf1 Replace calls to verifyComplete() to avoid indefinite blocking
See gh-35915
2023-06-23 12:16:26 +01:00
Andy Wilkinson 1e17d8eeea Upgrade to Liquibase 4.22.0
Closes gh-35956
2023-06-19 16:30:52 +01:00
Phillip Webb 1de7edb615 Remove accidentally committed code 2023-06-16 15:21:03 -07:00
Phillip Webb 5d6a507142 Merge branch '3.0.x' into 3.1.x 2023-06-16 14:35:23 -07:00
Phillip Webb c192fb85b2 Merge branch '3.0.x' into 3.1.x
Closes gh-35922
2023-06-15 14:26:55 -07:00
Phillip Webb 4c8b93b37d Merge branch '2.7.x' into 3.0.x
Closes gh-35920
2023-06-15 14:26:36 -07:00
Phillip Webb 137f4ee451 Support reporting of custom Log4J2 log levels from the LoggersEndpoint
Support custom Log4J2 log levels by changing `LoggerConfiguration` so
that it can now report levels using a `LevelConfiguration` object
rather than the limited `LogLevel` enum.

The `Log4J2LoggingSystem` class now uses `LevelConfiguration.ofCustom`
for custom logging levels, rather than throwing an exception.

The `LoggersEndpoint` has also been updated so that it can return the
custom logger name.

Fixes gh-35227
2023-06-15 14:03:22 -07:00
Moritz Halbritter ebbb4d319d Polish 2023-06-07 10:53:03 +02:00
Phillip Webb e3ed87d165 Merge branch '3.0.x' 2023-05-12 13:21:52 -07:00
Phillip Webb 92e420a098 Merge branch '2.7.x' into 3.0.x 2023-05-12 13:14:12 -07:00
Phillip Webb e9c4a5d663 Polish 2023-05-12 13:01:30 -07:00
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg
See gh-35015
2023-05-05 11:34:55 +02:00
Andy Wilkinson 8494ad82cd Merge branch '3.0.x'
Closes gh-35255
2023-05-03 17:45:17 +01:00
Andy Wilkinson 0776d01f16 Merge branch '2.7.x' into 3.0.x
Closes gh-35254
2023-05-03 17:44:49 +01:00
Andy Wilkinson fad24d5ced Fix handling of default port in mail health indicator
Fixes gh-35247
2023-05-03 17:33:37 +01:00
Phillip Webb a890323758 Merge branch '3.0.x' 2023-05-02 14:52:42 -07:00
Phillip Webb 0f242ab3f7 Merge branch '2.7.x' into 3.0.x 2023-05-02 14:52:16 -07:00
Phillip Webb 6b646f6a8e Update copyright year of changed files 2023-05-02 14:52:12 -07:00
Moritz Halbritter d7a9f87b64 Disable Neo4j tests on aarch64 linux and mac
See gh-35228
2023-05-02 13:40:59 +02:00
Andy Wilkinson 9a0b5e0178 Merge branch '3.0.x'
Closes gh-35173
2023-04-26 12:48:50 +01:00
Andy Wilkinson 7ee1622995 Merge branch '2.7.x' into 3.0.x
Closes gh-35172
2023-04-26 12:48:16 +01:00
Andy Wilkinson 6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization
Closes gh-35164
2023-04-26 11:47:03 +01:00
Stephane Nicoll 2dcb849c0f Merge branch '3.0.x'
Closes gh-34939
2023-04-11 16:39:00 +02:00
Stephane Nicoll 320db790e7 Merge branch '2.7.x' into 3.0.x
Closes gh-34938
2023-04-11 16:38:46 +02:00
Stephane Nicoll 4b8829364e Polish "Use removeIf rather than Iterator-based removal"
See gh-34762
2023-04-11 16:32:26 +02:00
SeasonPan 0d13e31827 Use removeIf rather than Iterator-based removal
See gh-34762
2023-04-11 16:20:43 +02:00
Stephane Nicoll 6876556b60 Upgrade to Json Path 2.8.0
Closes gh-34878
2023-04-06 16:25:23 +02:00
Phillip Webb 3dbc3a1943 Merge branch '3.0.x' 2023-03-23 23:01:32 -07:00
Mortitz Halbritter 42187e7bff Polish 2023-03-23 23:00:58 -07:00
Phillip Webb da925242f3 Polish 'Add SanitizableData.withSanitizedValue method'
See gh-34615
2023-03-15 15:17:52 -07:00
Rohan Goyal f789c9a56e Add SanitizableData.withSanitizedValue method
See gh-34615
2023-03-15 15:10:51 -07:00
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2023-02-22 18:36:16 -08:00
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2023-02-21 23:17:57 -08:00
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2023-02-21 22:53:27 -08:00
abilan dbbc0de25b Remove hints for Spring Integration Graph
Related to spring-projects/spring-integration#3994

Spring Integration's `IntegrationGraphServer` can be used without
actuator or even Spring Boot at all. It is more natural to have
respective reflection hints exposed by Spring Integration itself.
See related GH issue and its fix which just does a migration of the
remove code from `IntegrationGraphEndpoint`.

See gh-33924
2023-02-14 19:44:34 +00:00
Moritz Halbritter 81c8574bca Merge branch '2.7.x' into 3.0.x
Closes gh-34070
2023-02-06 10:38:57 +01:00
Moritz Halbritter 33288493aa Remove exception field from Health class
Closes gh-34030
2023-02-06 10:38:26 +01:00
Moritz Halbritter 0a080736d8 Merge branch '2.7.x' into 3.0.x
Closes gh-34017
2023-01-31 10:50:30 +01:00
Johnny Lim 5eeb429e44 Polish
See gh-33966
2023-01-31 10:48:30 +01:00
Krzysztof Krason d3efd7e091 Use try with close
See gh-33987
2023-01-26 20:36:38 -08:00
Krzysztof Krason 0e68cae57f Use instanceof patterns
See gh-33987
2023-01-26 20:36:25 -08:00
Krzysztof Krason 6e46423983 Use diamond operators
See gh-33987
2023-01-26 20:35:08 -08:00
Moritz Halbritter f72f3579d0 Merge branch '2.7.x'
Closes gh-33919
2023-01-20 09:37:54 +01:00
Johnny Lim ebde850031 Add Javadoc since to OperationParameter.getAnnotation()
See gh-33914
2023-01-20 09:36:57 +01:00
Phillip Webb 71efc55bf9 Merge branch '2.7.x' 2023-01-18 16:31:53 -08:00
Phillip Webb 7c508fa324 Update copyright year of changed files 2023-01-18 15:37:58 -08:00
Moritz Halbritter 94f4a4396c Merge branch '2.7.x'
Closes gh-33880
2023-01-18 17:35:52 +01:00
Moritz Halbritter e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation
Closes gh-33878
2023-01-18 16:56:42 +01:00
Phillip Webb a889c539ab Merge branch '2.7.x' 2023-01-17 10:12:25 -08:00
Phillip Webb a0fe8241a7 Update copyright year of changed files 2023-01-17 10:07:03 -08:00
Moritz Halbritter 6dd7ac0821 Merge branch '2.7.x'
Closes gh-33856
2023-01-17 14:34:37 +01:00
Moritz Halbritter d7852cb176 Log failing calls to health indicators
See gh-33774
2023-01-17 14:33:53 +01:00
Moritz Halbritter f08842019e Merge branch '2.7.x'
Closes gh-33841
2023-01-16 11:34:31 +01:00
Moritz Halbritter 96175a8e50 Use OperationParameter consistently
Closes gh-31240
2023-01-16 11:23:21 +01:00
Moritz Halbritter 52760f6b78 Merge branch '2.7.x'
Closes gh-33756
2023-01-11 13:42:11 +01:00
Moritz Halbritter 0c65c41adf Polish 2023-01-11 11:29:58 +01:00
Moritz Halbritter c5b5449a07 Fix assertions in ThreadDumpEndpointTests 2023-01-11 10:48:57 +01:00
Phillip Webb a2ac38e203 Update copyright year of changed files 2023-01-09 15:46:07 -08:00
Phillip Webb 1621cfd578 Merge branch '2.7.x' 2023-01-09 15:44:44 -08:00
Phillip Webb 232807d388 Increase block timeout 2023-01-09 15:17:47 -08:00
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2023-01-09 11:10:20 +01:00
Phillip Webb f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb e4772cf3b7 Update copyright year of changed files 2022-12-22 00:59:32 -08:00
Scott Frederick fead976952 Adapt to changes in Couchbase client
See gh-33588
2022-12-21 11:48:39 -06:00
Moritz Halbritter 08659baeba Polish away public modifier on tests 2022-12-16 16:08:44 +01:00
Moritz Halbritter 725337f976 Make fields final
Closes gh-33537
2022-12-16 14:28:44 +01:00
Phillip Webb 93f8dc76ab Fix Neo4jReactiveHealthIndicator NoSuchElementException
Update `Neo4jReactiveHealthIndicator` to ensure that `result.records()`
is called before `result.consume()`. Prior to this commit, the indicator
used `zipWith` to merge records with a summary. This worked with the
previous RxJava based driver, but fails with the Reactor based driver
due to a `NoSuchElementException: Source was empty` error.

Fixes gh-33428
2022-11-30 21:03:49 -08:00
Phillip Webb 8849f72ac5 Merge branch '2.7.x' 2022-11-30 21:01:25 -08:00
Phillip Webb 06c6dafee2 Add Neo4jReactiveHealthIndicatorIntegrationTests
Add a full integration test for `Neo4jReactiveHealthIndicator`
to ensure that it works against a real server.

See gh-33428
2022-11-30 21:01:12 -08:00
Phillip Webb 8481004420 Polish 2022-11-30 21:01:12 -08:00
Johnny Lim 6027508cf7 Polish
See gh-33108
2022-11-16 10:00:36 +01:00
Brian Clozel 932f7d705f Start building against Spring Framework 6.0.0 SNAPSHOTs
See gh-33136
2022-11-14 16:40:30 +01:00
Phillip Webb 3d2071d044 Migrate endpoints to return OperationResponseBody types
Update types returned from endpoints to implement the
`OperationResponseBody` interface. This ensures that they will be
serialized using the isolated actuator `ObjectMapper`.

See gh-20291
2022-11-09 22:17:16 -08:00
Phillip Webb 1f8493fb29 Support isolated actuator ObjectMapper
Add `OperationResponseBody` tagging interface that can be used
to trigger the use of an isolated ObjectMapper specifically for
actuator responses.

The isolated mapper is provided by an `EndpointObjectMapper`
bean which is auto-configured unless specifically disabled
by the user.

WebMVC, WebFlux and Jersey integrations have been updated
to provide a link between the `OperationResponseBody` type
and the endpoint `ObjectMapper`.

See gh-20291
2022-11-09 22:17:13 -08:00
Andy Wilkinson 3a2703e8f6 Upgrade to Jakarta Mail 2.1 and switch to Eclipse Angus RI
Closes gh-33059
Closes gh-33050
2022-11-08 11:01:15 +00:00
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
2022-11-07 17:33:38 +00:00
Phillip Webb 179aa987ee Unify actuator descriptor class names
Update actuator endpoints to consistently use `...Descriptor` for
JSON support classes.

Closes gh-33022
2022-11-05 20:15:35 -07:00
Andy Wilkinson 9472cb2db7 Polish 2022-11-04 17:44:50 +00:00
Andy Wilkinson edecebb641 Upgrade to Neo4j Java Driver 5.2.0
Closes gh-33008
2022-11-04 17:23:01 +00:00
Phillip Webb 9856286a2d Refine actuator httpexhanges naming
See gh-32885
2022-10-28 12:50:59 -07:00
Andy Wilkinson 29f7a596fe Polish 2022-10-28 08:57:00 +01:00
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>
2022-10-27 16:34:42 -07:00
Johnny Lim 5067aab552 Polish
See gh-32840
2022-10-27 16:33:14 +02:00
Phillip Webb a59b6cb1f3 Polish 2022-10-25 21:56:53 -07:00
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2022-10-25 15:48:26 -07:00
Phillip Webb c8676a81de Merge branch '2.6.x' into 2.7.x 2022-10-25 15:48:04 -07:00
Phillip Webb d7ac20cd6c Update copyright year of changed files 2022-10-25 15:47:30 -07:00
Andy Wilkinson 99edda735e Polish 2022-10-25 12:57:58 +01:00
Andy Wilkinson b7fb345709 Revert workaround for multiple ImportRuntimeHints
Closes gh-32830
2022-10-24 10:20:50 +01:00
Johnny Lim fc61690675 Add missing @Test to sanitizeLists()
See gh-32792
2022-10-21 12:05:44 +01:00
Sébastien Deleuze 4e131bd627 Provide a workaround to allow multiple @ImportRuntimeHints
Provide a workaround for spring-projects/spring-framework#29361 so
that multiple `@ImportRuntimeHints` can be used in a type hierarchy.

The commit should cover Actuator web endpoint use cases with the
exception of Cloud Foundry endpoints which are not possible due to
package access issues.

See gh-29361
2022-10-20 17:12:58 -07:00
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
2022-10-20 15:29:31 +02:00
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
2022-10-19 22:06:40 +02:00
Madhura Bhave ce3c933f77 Adapt to Spring Security changes
Closes gh-32604
2022-10-19 11:46:27 -07:00
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
2022-10-19 19:33:31 +02:00
Phillip Webb 07dd388b58 Merge branch '2.7.x'
Closes gh-32776
2022-10-18 15:51:27 -07:00
Phillip Webb 8dec296dfd Merge branch '2.6.x' into 2.7.x
Closes gh-32775
2022-10-18 15:49:51 -07:00
Phillip Webb de111dba5c Polish 'Add DataSize serializer for configprops endpoint'
See gh-32645
2022-10-18 15:46:56 -07:00
Guirong Hu 3b25132e38 Add DataSize serializer for configprops endpoint
See gh-32645
2022-10-18 15:46:33 -07:00
Phillip Webb e3df6c5b6f Move @ConstructorBinding annotation and support add default support
Relocate `@ConstructorBinding` from the `boot.context.properties`
package to `boot.context.properties.bind` and update the
`DefaultBindConstructorProvider` to support it.

Closes gh-32660
2022-10-18 00:59:45 -07:00
Brian Clozel 5cee828546 Fix javadoc warnings in HTTP Observation support 2022-10-17 23:06:30 +02:00
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
2022-10-17 22:46:06 +02:00
Andy Wilkinson 7852c45a77 Generate reflection hints for loggers endpoint's responses
Some of the types that are returned are hidden behind a
Map<String, Object> so the operation annotations already been marked
as reflective isn't sufficient.

This commit uses `@RegisterReflectionForBinding` to register the
types that are used as (nested) values in the response maps.

Closes gh-32486
2022-10-12 15:56:22 +01:00
Stephane Nicoll cbf24bd1cd Upgrade to Elasticsearch Client 8.4.3
Closes gh-32671
2022-10-11 12:42:17 +02:00
Johnny Lim 73fd760137 Polish HTTP client observability changes
See gh-32484
See gh-32518

Closes gh-32636
2022-10-07 19:05:14 +02:00
Brian Clozel d25fc73dae Upgrade to Neo4J Java Driver 5.0.0
Closes gh-32620
2022-10-06 19:46:31 +02:00