Commit Graph

523 Commits (245d3cf9f40b9de25abe208e0e1a6652fbc11071)

Author SHA1 Message Date
Phillip Webb 20ecf73cd1 Polish "Add Prometheus push gateway support"
Rework Prometheus push gateway support so that the central class can
be used outside of auto-configuration. The shutdown flags have also
been replaced with a single "shutdown-operation" property since it's
unlikely that both "push" and "delete" will be required.

It's also possible now to supply a `TaskScheduler` to the manager.

See gh-14353
6 years ago
Phillip Webb 01b8667dd7 Update copyright year for changed files 6 years ago
Stephane Nicoll 91b4dc2f69 Polish "Add reactive health indicator for Couchbase"
Closes gh-13926
6 years ago
Mikalai Lushchytski 20ff0d97e4 Add reactive health indicator for Couchbase
See gh-13926
6 years ago
Johnny Lim 335775892b Polish
See gh-14667
6 years ago
Phillip Webb d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
6 years ago
Stephane Nicoll 2d36a6f952 Merge branch '2.0.x' 6 years ago
Johnny Lim 1eca492c5e Polish
See gh-14621
6 years ago
Stephane Nicoll cbae22f0c9 Polish "Migrate size properties to DataSize"
Closes gh-14549
6 years ago
Andy Wilkinson c974192497 Polish "Add outcome tag to MVC and WebFlux HTTP request metrics"
Closes gh-14486
6 years ago
Michael McFadyen 9e9dd40959 Add outcome tag to MVC and WebFlux HTTP request metrics
See gh-14486
6 years ago
Andy Wilkinson 6da483f970 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 6fba477d5e Remove redundant handling of a null exchange from WebFluxTags.uri()
Closes gh-14504
6 years ago
Andy Wilkinson eefa7e9f78 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 6020cb67d3 Polish javadoc of status method on WebFluxTags and WebMvcTags 6 years ago
durigon 7aaeefbc0e Use Matcher from pre-compiled Pattern rather than String for replaceAll
Closes gh-14483
6 years ago
Stephane Nicoll 7ff41e7c8c Polish 6 years ago
Stephane Nicoll ca8be3f6bd Polish "Add Health details using maps"
Closes gh-14305
6 years ago
Michael Pratt 5c86f9eca4 Add Health details using maps
See gh-14305
6 years ago
Phillip Webb 9d1b3a2b49 Merge branch '2.0.x' 6 years ago
Phillip Webb 9af6b3422f Polish 6 years ago
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 6 years ago
Johnny Lim ca57e58ee5 Polish
See gh-14293
6 years ago
Stephane Nicoll e0ee4f22a5 Merge branch '2.0.x' 6 years ago
Johnny Lim 3eef927499 Use InvalidEndpointRequestException for MetricsEndpoint
Closes gh-14291
6 years ago
Stephane Nicoll 0590c4de32 Merge branch '2.0.x' 6 years ago
Stephane Nicoll f9081a2c23 Revert "Polish some joining collectors"
See gh-14221
6 years ago
Stephane Nicoll 5af7835e83 Merge branch '2.0.x' 6 years ago
dreis2211 afda71e419 Polish some joining collectors
Closes gh-14221
6 years ago
dreis2211 422a436df1 Polish some Collectors
See gh-13727
6 years ago
Stephane Nicoll 429cd8d114 Optimize use of Jackson ObjectMapper instances
Closes gh-1789
6 years ago
Vedran Pavic 644ab5f3e4 Align SessionsEndpoint with Spring Session API improvements
This commit aligns SessionsEndpoint with
FindByIndexNameSessionRepository API improvements that simplifies
retrieval of sessions by principal name.

Closes gh-14124
6 years ago
Madhura Bhave d724f154f4 Merge branch '2.0.x' 6 years ago
Madhura Bhave b93c2b9a9f Allow actuator endpoints to be used with mvcMatchers
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.

For all other applications, AntPathRequestMatcher is used as
a delegate.

Closes gh-13962
6 years ago
Andy Wilkinson 971caad6f8 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 3e093035b4 Merge branch '1.5.x' into 2.0.x 6 years ago
Madhura Bhave 64f9d33956 Merge branch '2.0.x' 6 years ago
Johnny Lim 5f3f1a1f11 Polish
Closes gh-14067
6 years ago
Stephane Nicoll d0f272960e Merge branch '2.0.x' 6 years ago
Johnny Lim b4abccc07c Polish
See gh-14049
6 years ago
Andy Wilkinson 2756d87b3f Merge branch '2.0.x' 6 years ago
Andy Wilkinson 27f5e46587 Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null"
Closes gh-14019
6 years ago
artsiom 83fbdc6ea8 Fix NPE in FlywayEndpoint when migration.installedOn is null
See gh-14019
6 years ago
Stephane Nicoll a12ca0a0dc Merge branch '2.0.x' 6 years ago
Stephane Nicoll a023bd030a Add configurable timeout for Couchbase health indicator
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.

Closes gh-13879
6 years ago
Stephane Nicoll 13d5b00fe7 Merge branch '2.0.x' 6 years ago
Stephane Nicoll fbf3c48bf8 Fix setter detection in `configprops` endpoint
Previously, the setter of a property whose second letter is upper-case (
such as `oAuth2Uri`) was not detected properly. The JavaBean spec states
that, in such a case, the first letter should not be capitalized (i.e.
the setter should be `setoAuth2Uri` rather than `setOAuth2Uri`).

This commit makes sure that Jackson uses standard bean names and fixes
the setter detection algorithm to take this case into account.

Closes gh-13878
6 years ago
Stephane Nicoll 6a2cb883a5 Merge branch '2.0.x' 6 years ago
Stephane Nicoll f731f6aa39 Restore customization of HTTP trace request headers
This commit restore the use of the `postProcessRequestHeaders` method
when overridden in a custom HttpExchangeTracer implementation.

Closes gh-13924
6 years ago
Johnny Lim 7b72fe0ffa Polish
See gh-13963
6 years ago
Stephane Nicoll 0c1b229764 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 4e45f36bd1 Clean basePath if necessary
This commit makes sure that ServletEndpointRegistrar does not add a
duplicate `/` if the basePath is suffixed with it already

Close gh-13964
6 years ago
Phillip Webb 80da9cf5eb Merge branch '2.0.x' 6 years ago
Phillip Webb aeb885192e Polish ternary expressions 6 years ago
Phillip Webb ce9c053cbf Fix checkstyle issues on master
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
6 years ago
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 6 years ago
Phillip Webb 63b609827e Fix checkstyle method order issues
Fix checkstyle issues with method ordering following the
spring-javaformat upgrade.

See gh-13932
6 years ago
Phillip Webb e6a68b39a3 Fix checkstyle javadoc issues
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
6 years ago
Phillip Webb 7fc455654a Fix checkstyle ternary issues
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
6 years ago
Phillip Webb b5b60c2053 Merge branch '2.0.x' 6 years ago
Phillip Webb 9a9111af21 Support path discovery for main dispatcher servlet
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
6 years ago
Stephane Nicoll 1e7aa7c4bc Fix Spring Integration imports 6 years ago
Stephane Nicoll af0aa11d15 Polish "Add reactive health indicator for Cassandra"
Closes gh-13864
6 years ago
artsiom 61c41555c8 Add reactive health indicator for Cassandra
See gh-13864
6 years ago
Stephane Nicoll 0c41384e50 Merge branch '2.0.x' 6 years ago
Stephane Nicoll a25b6bd473 Restore support for TransactionAwareCacheDecorator
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-13861
6 years ago
Stephane Nicoll f3ef7caf09 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 829ac3fbef Prevent headers to be mutated
This commit rework 1189ccc to prevent a mutate call on the original
headers map.

Closes gh-13871
6 years ago
Stephane Nicoll 2ad548485c Merge branch '2.0.x' 6 years ago
Stephane Nicoll 1a0afc6bbe Polish "Use Collection.removeIf() where possible"
Closes gh-13871
6 years ago
dreis2211 1189ccc936 Use Collection.removeIf() where possible
See gh-13871
6 years ago
Stephane Nicoll 6dc0cb4f67 Merge branch '2.0.x' 6 years ago
Johannes Edmeier ab1f8cf77b Add metric description and base unit to metrics endpoint
See gh-13813
6 years ago
Stephane Nicoll 237f2fb494 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 592754d806 Polish "Make sure exception tag values are not empty in web metrics"
Closes gh-13187
6 years ago
Jon Schneider ee37dc1c31 Make sure exception tag values are not empty in web metrics
See gh-13187
6 years ago
Andy Wilkinson 6a189cee06 Merge branch '2.0.x' 6 years ago
Andy Wilkinson a57d0f0853 Reinstate order of WebMvcMetricsFilter
Closes gh-13781
6 years ago
Johnny Lim 58df752af4 Polish
See gh-13790
6 years ago
Andy Wilkinson 1ea91ece23 Merge branch '2.0.x' 6 years ago
Andy Wilkinson cced3514a7 Polish 6 years ago
Stephane Nicoll 5fcf45c4d0 Merge branch '2.0.x' 6 years ago
Stephane Nicoll 3423c5dddb Detect DispatcherServlets registered via ServletRegistrationBean
Previously, when a DispatcherServlet was registered via a
ServletRegistrationBean, the mappings endpoint did not expose any
information about it as it wasn't detected.

This commit fixes the detection of available DispatcherServlets in the
context so that the mappings endpoint include them all.

Closes gh-13186
6 years ago
Stephane Nicoll 8426e3c2c9 Merge branch '2.0.x' 6 years ago
Johnny Lim 46e6aa5963 Fix query string encoding in TraceableHttpServletRequest
Closes gh-13545
6 years ago
Stephane Nicoll 8c691273e3 Merge branch '2.0.x' 6 years ago
Johnny Lim 0de8317979 Separate logging from getUrlMappings()
Closes gh-13710
6 years ago
Stephane Nicoll 0b48e223f3 Merge branch '2.0.x' 6 years ago
Johnny Lim ab6adc8265 Polish
Closes gh-13616
6 years ago
Brian Clozel bdd95f09a4 Polish WebClient metrics support
This commit improves the for Actuator Metrics in WebClient.

Unlike the server couterpart of WebFlux, using a `retry` operator on a
`WebClient` pipeline does resubscribes to the whole chain.
The previous implementation recorded start time at the time of pipeline
build phase, but outside of it. This doesn't work since retrying the
same pipeline doesn't update the recorded start time and the duration of
sequential calls are cumulative.

This is now fixed using the Reactor `Context`, since we're now recording
the start time at subscription time and record metrics on `onNext` and
`onError` signals.

Closes gh-12228
6 years ago
Andy Wilkinson b6b37c91bb Upgrade to Flyway 5.1.3
Closes gh-13672
6 years ago
Madhura Bhave 4eff07f6c0 Merge branch '2.0.x' 6 years ago
Madhura Bhave fddc9e9c7e Support multiple paths in DispatcherServletPathProvider
Closes gh-13603
6 years ago
Andy Wilkinson 4cccc9a886 Merge branch '2.0.x' 6 years ago
Andy Wilkinson a5d20ffed7 Avoid NPE when creating method tag for WebFlux req with non-standard method
Previously, a NullPointerException would occur when WebFluxTags
attempted to create a method Tag for a request with a non-standard
method.

This commit updates WebFluxTags to use getMethodValue(), which will
never return null, rather than getMethod(), which may return null,
when determining the tag's value for the given request.

Closes gh-13596
6 years ago
Andy Wilkinson 80ede14510 Merge branch '2.0.x' 6 years ago
Andy Wilkinson 911453d478 Merge branch '1.5.x' into 2.0.x 6 years ago
Brian Clozel cc894ce4f2 Fix Micrometer tag providers after HttpStatus changes
Since SPR-16898, `HttpStatus.toString()` has changed and we should
instead rely on `HttpStatus.value()` to get the HTTP status number.
7 years ago
Johnny Lim 403f8927c3 Polish CachesEndpoint
Closes gh-13487
7 years ago
Johnny Lim de3c3cd755 Add CLIENT_NAME_NONE to WebClientExchangeTags 7 years ago
Johnny Lim c908445bff Use a precompiled pattern in WebClientExchangeTags.extractPath() 7 years ago
Madhura Bhave 87506248b0 Merge branch '2.0.x' 7 years ago
Madhura Bhave ed734d7e43 Trace filter ignores invalid requests
Fixes gh-12987
7 years ago
Phillip Webb ade1397ea2 Merge branch '2.0.x' 7 years ago
Phillip Webb 571c50e43f Switch to functional web code to use static imports
Update the samples and tests to use the more idiomatic static import
style.
7 years ago
Madhura Bhave 360d392eb1 Merge branch '2.0.x' 7 years ago
Madhura Bhave 60a4d67b13 Handle special characters in TraceableHttpServletRequest
Fixes gh-13273
7 years ago
Brian Clozel bd8106d77f Upgrade to Spring Framework 5.1
As of Spring Framework 5.1, we're depending on the Reactor Californium
release train.
Reactor Netty is now at version 0.8 and changed its artifact
coordinates, package names and broke several APIs. Spring Framework is
now up-to-date with those changes and this commit does the same for
Spring Boot.

Note that in that process, the `NettyServerCustomizer` has been changed
since the former `HttpServerOptions.Builder` API is now gone from
Reactor Netty, and we're now relying on immutable server instances
instead of a stateful builder pattern.

See gh-13321
7 years ago
Andy Wilkinson 92629ac5af Merge branch '2.0.x' 7 years ago
Andy Wilkinson ea51cfabca Avoid uri tag explosion when use of path variable is undetected
Previously, WebMvcTags would fall back to using the request’s path
info if Spring MVC’s best matching path pattern attribute was not
available. For non-Spring MVC web frameworks that support path
variables, such as Jersey, this led to an explosion of URI tags that
could exhaust the heap.

Closes gh-12447
7 years ago
Vedran Pavic 205b1c1327 Upgrade to Hazelcast 3.10.1
Closes gh-13322
7 years ago
Stephane Nicoll f06627c408 Allow CompositeHealthIndicator to be created with a Map as before
See gh-4965
7 years ago
Stephane Nicoll c8f57acca6 Merge branch '2.0.x' 7 years ago
Stephane Nicoll faa9910e46 Enable cache when a SecurityContext parameter is used
This commit restores caching for the main read operation when the
SecurityContext does not expose a principal (i.e. guest access).

Closes gh-13238
7 years ago
Stephane Nicoll 39861bf819 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 4259817572 Fix extension discovery when endpoint instance is sub-classed
This commit fixes endpoint extension discovery when the related endpoint
is sub-classed. Previously, a strict by type check was applied against
the `endpoint` attribute of `EndpointExtension`.

Rather than using a `Class` check, this commit extracts the id of an
endpoint and uses it to match its extension, if any.

Closes gh-13082
7 years ago
Stephane Nicoll 3bbdeee70b Merge branch '2.0.x' 7 years ago
Johnny Lim bd2053aa17 Use more Tag constants
Closes gh-13286
7 years ago
Johnny Lim de01e7aad4 Polish
See gh-13243
7 years ago
Stephane Nicoll f91b53747a Merge branch '2.0.x' 7 years ago
Johnny Lim f385a1cb11 Polish
Closes gh-13243
7 years ago
Phillip Webb 68ffbafbae Fix checkstyle violations 7 years ago
Phillip Webb 3702da4573 Formatting 7 years ago
Stephane Nicoll 4464a5f5bd Remove code deprecated in 2.0
Closes gh-12962
7 years ago
Phillip Webb c5f63c19a4 Merge branch '2.0.x' 7 years ago
Phillip Webb 2dc4f1df00 Polish 7 years ago
Stephane Nicoll afe6abb20d Merge branch '2.0.x' 7 years ago
Johnny Lim 75639aa682 Polish
Closes gh-13192
7 years ago
Stephane Nicoll b51b997b70 Run specific health check
This commit improves the `health` endpoint to run health check for a
particular component or, if that component is itself a composite, an
instance of that component.

Concretely, it is now possible to issue a `GET` on
`/actuator/health/{component}` and
`/actuator/health/{component}/instance` to retrieve the health of a
component or an instance of a composite component, respectively.

If details cannot be showed for the current user, any request leads to a
404 and does not invoke the health check at all.

Closes gh-8865
7 years ago
Stephane Nicoll 2c176a3770 Add support for ReactiveHealthIndicatorRegistry
This commit updates the initial proposal to add support for reactive
use cases as well. A reactive application can use
ReactiveHealthIndicatorRegistry as an alternative to
HealthIndicatorRegistry.

Closes gh-4965
7 years ago
Stephane Nicoll 95b251590e Polish "Introduce HealthIndicatorRegistry"
See gh-4965

Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
7 years ago
Vedran Pavic d829d522be Introduce HealthIndicatorRegistry
This commit introduces HealthIndicatorRegistry which handles
registration of HealthIndicator instances. Registering new
HealthIndicator instances is now possible in runtime.

See gh-4965
7 years ago
Stephane Nicoll 24024b00da Merge branch '2.0.x' 7 years ago
Stephane Nicoll 2be1c8f527 Polish "Set classloader for JMX endpoints to application classloader"
Closes gh-12209
7 years ago
David Herberth e44c81672f Set classloader for JMX endpoints to application classloader
See gh-12209
7 years ago
Stephane Nicoll b0433d66c1 Merge branch '2.0.x' 7 years ago
dreis2211 e6a23fa3ff Remove unnecessary semicolons
Closes gh-13144
7 years ago
Stephane Nicoll c72df104d8 Improve caches endpoint format
This commit adds an intermediate "caches" element so that additional
cache manager attributes can be added in the future.

Closes gh-13079
7 years ago
Andy Wilkinson a41c9eb736 Merge branch '2.0.x' 7 years ago
Andy Wilkinson c826310fd1 Polish 7 years ago
Johnny Lim 96ce71ddc4 Polish
Closes gh-13078
7 years ago
Phillip Webb c578a30e90 Polish 7 years ago
Phillip Webb a323a85e3b Merge branch '2.0.x' 7 years ago
Phillip Webb 975e986fef Polish 7 years ago
Phillip Webb 7b120c1c97 Formatting 7 years ago
Phillip Webb 42c053cf1b Merge branch '2.0.x' 7 years ago
Phillip Webb 5b3cb8a698 Update copyright header year for changed files 7 years ago
Phillip Webb 57bfbfb3ad Fix checkstyle errors 7 years ago
Phillip Webb 6e09e497f2 Formatting 7 years ago
Phillip Webb b6a2a46f78 Merge branch '2.0.x' 7 years ago