Commit Graph

332 Commits

Author SHA1 Message Date
Madhura Bhave 4eff07f6c0 Merge branch '2.0.x' 2018-06-28 12:49:34 -07:00
Madhura Bhave fddc9e9c7e Support multiple paths in DispatcherServletPathProvider
Closes gh-13603
2018-06-28 12:36:58 -07:00
Andy Wilkinson 4cccc9a886 Merge branch '2.0.x' 2018-06-28 14:27:21 +01:00
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
2018-06-28 14:27:02 +01:00
Andy Wilkinson 80ede14510 Merge branch '2.0.x' 2018-06-25 11:25:21 +01:00
Andy Wilkinson 911453d478 Merge branch '1.5.x' into 2.0.x 2018-06-25 11:25:10 +01:00
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.
2018-06-19 16:05:40 +02:00
Johnny Lim 403f8927c3 Polish CachesEndpoint
Closes gh-13487
2018-06-15 13:56:39 +02:00
Johnny Lim de3c3cd755 Add CLIENT_NAME_NONE to WebClientExchangeTags 2018-06-12 09:20:46 +02:00
Johnny Lim c908445bff Use a precompiled pattern in WebClientExchangeTags.extractPath() 2018-06-12 14:56:02 +09:00
Madhura Bhave 87506248b0 Merge branch '2.0.x' 2018-06-07 12:53:37 -07:00
Madhura Bhave ed734d7e43 Trace filter ignores invalid requests
Fixes gh-12987
2018-06-07 09:27:49 -07:00
Phillip Webb ade1397ea2 Merge branch '2.0.x' 2018-06-04 17:28:54 -07:00
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.
2018-06-04 17:27:34 -07:00
Madhura Bhave 360d392eb1 Merge branch '2.0.x' 2018-06-04 12:51:07 -07:00
Madhura Bhave 60a4d67b13 Handle special characters in TraceableHttpServletRequest
Fixes gh-13273
2018-06-04 12:50:11 -07:00
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
2018-06-04 18:59:17 +02:00
Andy Wilkinson 92629ac5af Merge branch '2.0.x' 2018-06-04 15:43:58 +01:00
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
2018-06-04 15:43:48 +01:00
Vedran Pavic 205b1c1327 Upgrade to Hazelcast 3.10.1
Closes gh-13322
2018-06-01 09:30:42 +02:00
Stephane Nicoll f06627c408 Allow CompositeHealthIndicator to be created with a Map as before
See gh-4965
2018-05-30 16:09:07 +02:00
Stephane Nicoll c8f57acca6 Merge branch '2.0.x' 2018-05-29 16:03:00 +02:00
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
2018-05-29 15:56:22 +02:00
Stephane Nicoll 39861bf819 Merge branch '2.0.x' 2018-05-29 14:18:26 +02:00
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
2018-05-29 14:12:23 +02:00
Stephane Nicoll 3bbdeee70b Merge branch '2.0.x' 2018-05-29 09:33:03 +02:00
Johnny Lim bd2053aa17 Use more Tag constants
Closes gh-13286
2018-05-29 09:32:26 +02:00
Johnny Lim de01e7aad4 Polish
See gh-13243
2018-05-28 09:46:40 +02:00
Stephane Nicoll f91b53747a Merge branch '2.0.x' 2018-05-28 09:41:41 +02:00
Johnny Lim f385a1cb11 Polish
Closes gh-13243
2018-05-28 09:36:15 +02:00
Phillip Webb 68ffbafbae Fix checkstyle violations 2018-05-26 00:01:45 -07:00
Phillip Webb 3702da4573 Formatting 2018-05-25 23:52:38 -07:00
Stephane Nicoll 4464a5f5bd Remove code deprecated in 2.0
Closes gh-12962
2018-05-22 14:48:25 +02:00
Phillip Webb c5f63c19a4 Merge branch '2.0.x' 2018-05-21 21:38:32 -07:00
Phillip Webb 2dc4f1df00 Polish 2018-05-21 21:32:42 -07:00
Stephane Nicoll afe6abb20d Merge branch '2.0.x' 2018-05-17 15:31:02 +02:00
Johnny Lim 75639aa682 Polish
Closes gh-13192
2018-05-17 15:29:50 +02:00
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
2018-05-17 15:26:38 +02:00
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
2018-05-16 17:48:41 +02:00
Stephane Nicoll 95b251590e Polish "Introduce HealthIndicatorRegistry"
See gh-4965

Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
2018-05-16 17:39:20 +02:00
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
2018-05-16 13:59:34 +02:00
Stephane Nicoll 24024b00da Merge branch '2.0.x' 2018-05-14 17:42:15 +02:00
Stephane Nicoll 2be1c8f527 Polish "Set classloader for JMX endpoints to application classloader"
Closes gh-12209
2018-05-14 17:41:47 +02:00
David Herberth e44c81672f Set classloader for JMX endpoints to application classloader
See gh-12209
2018-05-14 17:41:31 +02:00
Stephane Nicoll b0433d66c1 Merge branch '2.0.x' 2018-05-11 14:24:13 +02:00
dreis2211 e6a23fa3ff Remove unnecessary semicolons
Closes gh-13144
2018-05-11 14:23:47 +02:00
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
2018-05-09 11:08:23 +02:00
Andy Wilkinson a41c9eb736 Merge branch '2.0.x' 2018-05-09 09:14:48 +01:00
Andy Wilkinson c826310fd1 Polish 2018-05-09 08:44:15 +01:00
Johnny Lim 96ce71ddc4 Polish
Closes gh-13078
2018-05-07 14:55:13 +02:00