Commit Graph

414 Commits (865b7ae47f942545506934ef0bcc3352fc669a05)

Author SHA1 Message Date
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
Phillip Webb 2d70a7ae5e Polish caught exception names
Prefer `ex` over `e`.
7 years ago
Phillip Webb 41efea51a7 Polish ternary expressions
Consistently format ternary expressions and always favor `!=` as the
the check.
7 years ago
Phillip Webb 8c0c0ee55a Merge branch '2.0.x' 7 years ago
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 7 years ago
Andy Wilkinson 0526594a3c Merge branch '2.0.x' 7 years ago
Andy Wilkinson f019d5c85b Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll fb8a5a9864 Polish "Add cache actuator endpoint"
This commit improves the initial proposal by providing a by name read
operation that returns the detail of a particular cache. It also adds
more tests and complete API documentation for the feature.

Closes gh-12216
7 years ago
Johannes Edmeier 1a57673345 Add cache actuator endpoint
This commits adds an actuator endpoint which lists the caches per
context and cacheManager and provides a delete operation to clear the
caches. As the statistics are exposed via the metrics endpoint they are
not included

See gh-12216
7 years ago
Brian Clozel 1ef0098ab5 Add WebClient metrics support
This commit adds support for Actuator Metrics for WebClient.
This support mirrors the current behavior for `RestTemplate`, reusing
the same metric name `"http.client.requests"` and tags.

`WebClient` is instrumented by a `MetricsWebClientFilterFunction` which
is applied by a `WebClientCustomizer`. This instrumentation happens
automatically only if you create an instance of `WebClient` using an
auto-configured `WebClient.Builder` bean.

This infrastructure is reusing de facto the `MeterFilter` that has been
added for `RestTemplate` in order to limit the "uri" tag cardinality.

Closes gh-12228
7 years ago