Commit Graph

1673 Commits (4e5f16f2bc9f484eea1ec54b5800b0dcfe22c77c)

Author SHA1 Message Date
Phillip Webb 5d6a507142 Merge branch '3.0.x' into 3.1.x 1 year ago
Phillip Webb c192fb85b2 Merge branch '3.0.x' into 3.1.x
Closes gh-35922
1 year ago
Phillip Webb 4c8b93b37d Merge branch '2.7.x' into 3.0.x
Closes gh-35920
1 year ago
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
1 year ago
Moritz Halbritter ebbb4d319d Polish 1 year ago
Phillip Webb e3ed87d165 Merge branch '3.0.x' 2 years ago
Phillip Webb 92e420a098 Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb e9c4a5d663 Polish 2 years ago
Marc Leroux b61834c92d Replace Mockito argument captors with assertArg
See gh-35015
2 years ago
Andy Wilkinson 8494ad82cd Merge branch '3.0.x'
Closes gh-35255
2 years ago
Andy Wilkinson 0776d01f16 Merge branch '2.7.x' into 3.0.x
Closes gh-35254
2 years ago
Andy Wilkinson fad24d5ced Fix handling of default port in mail health indicator
Fixes gh-35247
2 years ago
Phillip Webb a890323758 Merge branch '3.0.x' 2 years ago
Phillip Webb 0f242ab3f7 Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb 6b646f6a8e Update copyright year of changed files 2 years ago
Moritz Halbritter d7a9f87b64 Disable Neo4j tests on aarch64 linux and mac
See gh-35228
2 years ago
Andy Wilkinson 9a0b5e0178 Merge branch '3.0.x'
Closes gh-35173
2 years ago
Andy Wilkinson 7ee1622995 Merge branch '2.7.x' into 3.0.x
Closes gh-35172
2 years ago
Andy Wilkinson 6b9bc012a5 Check that BPP and BFPP bean methods won't cause eager initialization
Closes gh-35164
2 years ago
Stephane Nicoll 2dcb849c0f Merge branch '3.0.x'
Closes gh-34939
2 years ago
Stephane Nicoll 320db790e7 Merge branch '2.7.x' into 3.0.x
Closes gh-34938
2 years ago
Stephane Nicoll 4b8829364e Polish "Use removeIf rather than Iterator-based removal"
See gh-34762
2 years ago
SeasonPan 0d13e31827 Use removeIf rather than Iterator-based removal
See gh-34762
2 years ago
Stephane Nicoll 6876556b60 Upgrade to Json Path 2.8.0
Closes gh-34878
2 years ago
Phillip Webb 3dbc3a1943 Merge branch '3.0.x' 2 years ago
Mortitz Halbritter 42187e7bff Polish 2 years ago
Phillip Webb da925242f3 Polish 'Add SanitizableData.withSanitizedValue method'
See gh-34615
2 years ago
Rohan Goyal f789c9a56e Add SanitizableData.withSanitizedValue method
See gh-34615
2 years ago
Phillip Webb 0b15962aca Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb c4de86c244 Merge branch '2.7.x' into 3.0.x 2 years ago
Phillip Webb df5898a146 Reformat code following spring-javaformat upgrade 2 years ago
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
2 years ago
Moritz Halbritter 81c8574bca Merge branch '2.7.x' into 3.0.x
Closes gh-34070
2 years ago
Moritz Halbritter 33288493aa Remove exception field from Health class
Closes gh-34030
2 years ago
Moritz Halbritter 0a080736d8 Merge branch '2.7.x' into 3.0.x
Closes gh-34017
2 years ago
Johnny Lim 5eeb429e44 Polish
See gh-33966
2 years ago
Krzysztof Krason d3efd7e091 Use try with close
See gh-33987
2 years ago
Krzysztof Krason 0e68cae57f Use instanceof patterns
See gh-33987
2 years ago
Krzysztof Krason 6e46423983 Use diamond operators
See gh-33987
2 years ago
Moritz Halbritter f72f3579d0 Merge branch '2.7.x'
Closes gh-33919
2 years ago
Johnny Lim ebde850031 Add Javadoc since to OperationParameter.getAnnotation()
See gh-33914
2 years ago
Phillip Webb 71efc55bf9 Merge branch '2.7.x' 2 years ago
Phillip Webb 7c508fa324 Update copyright year of changed files 2 years ago
Moritz Halbritter 94f4a4396c Merge branch '2.7.x'
Closes gh-33880
2 years ago
Moritz Halbritter e8d809fe65 Replace 'via' with 'over' or 'through' in the documentation
Closes gh-33878
2 years ago
Phillip Webb a889c539ab Merge branch '2.7.x' 2 years ago
Phillip Webb a0fe8241a7 Update copyright year of changed files 2 years ago
Moritz Halbritter 6dd7ac0821 Merge branch '2.7.x'
Closes gh-33856
2 years ago
Moritz Halbritter d7852cb176 Log failing calls to health indicators
See gh-33774
2 years ago
Moritz Halbritter f08842019e Merge branch '2.7.x'
Closes gh-33841
2 years ago
Moritz Halbritter 96175a8e50 Use OperationParameter consistently
Closes gh-31240
2 years ago
Moritz Halbritter 52760f6b78 Merge branch '2.7.x'
Closes gh-33756
2 years ago
Moritz Halbritter 0c65c41adf Polish 2 years ago
Moritz Halbritter c5b5449a07 Fix assertions in ThreadDumpEndpointTests 2 years ago
Phillip Webb a2ac38e203 Update copyright year of changed files 2 years ago
Phillip Webb 1621cfd578 Merge branch '2.7.x' 2 years ago
Phillip Webb 232807d388 Increase block timeout 2 years ago
Krzysztof Krason cf6493f65c Simplify AssertJ assertions and also make them more readable
See gh-33653
2 years ago
Phillip Webb f588793445 Update copyright year of changed files 2 years ago
Phillip Webb e4772cf3b7 Update copyright year of changed files 2 years ago
Scott Frederick fead976952 Adapt to changes in Couchbase client
See gh-33588
2 years ago
Moritz Halbritter 08659baeba Polish away public modifier on tests 2 years ago
Moritz Halbritter 725337f976 Make fields final
Closes gh-33537
2 years ago
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
2 years ago
Phillip Webb 8849f72ac5 Merge branch '2.7.x' 2 years ago
Phillip Webb 06c6dafee2 Add Neo4jReactiveHealthIndicatorIntegrationTests
Add a full integration test for `Neo4jReactiveHealthIndicator`
to ensure that it works against a real server.

See gh-33428
2 years ago
Phillip Webb 8481004420 Polish 2 years ago
Johnny Lim 6027508cf7 Polish
See gh-33108
2 years ago
Brian Clozel 932f7d705f Start building against Spring Framework 6.0.0 SNAPSHOTs
See gh-33136
2 years ago
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
2 years ago
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
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
Andy Wilkinson 9472cb2db7 Polish 2 years ago
Andy Wilkinson edecebb641 Upgrade to Neo4j Java Driver 5.2.0
Closes gh-33008
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 5067aab552 Polish
See gh-32840
2 years ago
Phillip Webb a59b6cb1f3 Polish 2 years ago
Phillip Webb 4be3218cb6 Merge branch '2.7.x' 2 years ago
Phillip Webb c8676a81de Merge branch '2.6.x' into 2.7.x 2 years ago
Phillip Webb d7ac20cd6c Update copyright year of changed files 2 years ago
Andy Wilkinson 99edda735e Polish 2 years ago
Andy Wilkinson b7fb345709 Revert workaround for multiple ImportRuntimeHints
Closes gh-32830
2 years ago
Johnny Lim fc61690675 Add missing @Test to sanitizeLists()
See gh-32792
2 years ago
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
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
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
Phillip Webb 07dd388b58 Merge branch '2.7.x'
Closes gh-32776
2 years ago
Phillip Webb 8dec296dfd Merge branch '2.6.x' into 2.7.x
Closes gh-32775
2 years ago
Phillip Webb de111dba5c Polish 'Add DataSize serializer for configprops endpoint'
See gh-32645
2 years ago
Guirong Hu 3b25132e38 Add DataSize serializer for configprops endpoint
See gh-32645
2 years ago
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
2 years ago
Brian Clozel 5cee828546 Fix javadoc warnings in HTTP Observation support 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 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
2 years ago