Commit Graph

429 Commits

Author SHA1 Message Date
Andy Wilkinson 73c6cc1b5d Merge branch '2.0.x' 2018-10-10 12:43:22 +01:00
Andy Wilkinson 839e686c9e Fix Checkstyle violation 2018-10-10 12:43:06 +01:00
Andy Wilkinson 467169aaaf Merge branch '2.0.x' 2018-10-10 12:20:58 +01:00
Andy Wilkinson 9e14fc6b8b Cope with hanging call to connection.start() in JmsHealthIndicator
Previously, if the call to connection.start() hung, JmsHealthIndicator
would also hang and then never respond.

This commit introduces the use of an additional thread that waits for
up to 5 seconds for the connection to start. If the call to start
does not complete within that time, the connection is closed. The
call to close causes the call to start to throw an exception, thereby
stopping the hang and allowing the indicator to report that the
broker is down.

Closes gh-10809
2018-10-10 12:20:34 +01:00
Andy Wilkinson 2216b78f1e Merge branch '2.0.x' 2018-10-08 15:53:09 +01:00
Andy Wilkinson d3b3c8c64e Honour management.metrics.web.server.auto-time-requests with WebFlux
Closes gh-13895
2018-10-08 15:52:50 +01:00
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
2018-10-05 18:12:41 -07:00
Phillip Webb 01b8667dd7 Update copyright year for changed files 2018-10-05 13:40:07 -07:00
Stephane Nicoll 91b4dc2f69 Polish "Add reactive health indicator for Couchbase"
Closes gh-13926
2018-10-05 13:57:31 +02:00
Mikalai Lushchytski 20ff0d97e4 Add reactive health indicator for Couchbase
See gh-13926
2018-10-05 13:57:17 +02:00
Johnny Lim 335775892b Polish
See gh-14667
2018-10-03 13:57:18 +02:00
Phillip Webb d76bba5e6f Migrate from ExpectedException rule to AssertJ
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
2018-10-02 10:55:28 -07:00
Stephane Nicoll 2d36a6f952 Merge branch '2.0.x' 2018-10-01 10:50:58 -04:00
Johnny Lim 1eca492c5e Polish
See gh-14621
2018-10-01 10:46:27 -04:00
Stephane Nicoll cbae22f0c9 Polish "Migrate size properties to DataSize"
Closes gh-14549
2018-09-21 16:27:28 +02:00
Andy Wilkinson c974192497 Polish "Add outcome tag to MVC and WebFlux HTTP request metrics"
Closes gh-14486
2018-09-18 12:30:28 +01:00
Michael McFadyen 9e9dd40959 Add outcome tag to MVC and WebFlux HTTP request metrics
See gh-14486
2018-09-18 12:00:12 +01:00
Andy Wilkinson 6da483f970 Merge branch '2.0.x' 2018-09-18 11:59:52 +01:00
Andy Wilkinson 6fba477d5e Remove redundant handling of a null exchange from WebFluxTags.uri()
Closes gh-14504
2018-09-18 11:59:19 +01:00
Andy Wilkinson eefa7e9f78 Merge branch '2.0.x' 2018-09-18 11:30:44 +01:00
Andy Wilkinson 6020cb67d3 Polish javadoc of status method on WebFluxTags and WebMvcTags 2018-09-18 11:30:35 +01:00
durigon 7aaeefbc0e Use Matcher from pre-compiled Pattern rather than String for replaceAll
Closes gh-14483
2018-09-17 10:54:54 +01:00
Stephane Nicoll 7ff41e7c8c Polish 2018-09-05 13:39:51 +02:00
Stephane Nicoll ca8be3f6bd Polish "Add Health details using maps"
Closes gh-14305
2018-09-05 13:39:18 +02:00
Michael Pratt 5c86f9eca4 Add Health details using maps
See gh-14305
2018-09-05 13:20:03 +02:00
Phillip Webb 9d1b3a2b49 Merge branch '2.0.x' 2018-09-04 16:25:17 -07:00
Phillip Webb 9af6b3422f Polish 2018-09-04 16:18:47 -07:00
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 2018-09-04 08:52:35 +02:00
Johnny Lim ca57e58ee5 Polish
See gh-14293
2018-09-04 08:52:13 +02:00
Stephane Nicoll e0ee4f22a5 Merge branch '2.0.x' 2018-09-04 08:49:04 +02:00
Johnny Lim 3eef927499 Use InvalidEndpointRequestException for MetricsEndpoint
Closes gh-14291
2018-09-04 08:33:33 +02:00
Stephane Nicoll 0590c4de32 Merge branch '2.0.x' 2018-08-29 17:38:15 +02:00
Stephane Nicoll f9081a2c23 Revert "Polish some joining collectors"
See gh-14221
2018-08-29 17:37:33 +02:00
Stephane Nicoll 5af7835e83 Merge branch '2.0.x' 2018-08-28 17:18:20 +02:00
dreis2211 afda71e419 Polish some joining collectors
Closes gh-14221
2018-08-28 17:17:46 +02:00
dreis2211 422a436df1 Polish some Collectors
See gh-13727
2018-08-27 18:09:02 +02:00
Stephane Nicoll 429cd8d114 Optimize use of Jackson ObjectMapper instances
Closes gh-1789
2018-08-23 14:09:48 +02:00
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
2018-08-18 11:27:35 +02:00
Madhura Bhave d724f154f4 Merge branch '2.0.x' 2018-08-16 15:45:20 -07:00
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
2018-08-16 15:41:02 -07:00
Andy Wilkinson 971caad6f8 Merge branch '2.0.x' 2018-08-16 10:19:05 +01:00
Andy Wilkinson 3e093035b4 Merge branch '1.5.x' into 2.0.x 2018-08-16 10:18:52 +01:00
Madhura Bhave 64f9d33956 Merge branch '2.0.x' 2018-08-15 16:58:21 -07:00
Johnny Lim 5f3f1a1f11 Polish
Closes gh-14067
2018-08-15 16:54:46 -07:00
Stephane Nicoll d0f272960e Merge branch '2.0.x' 2018-08-15 10:43:28 +03:00
Johnny Lim b4abccc07c Polish
See gh-14049
2018-08-15 10:43:04 +03:00
Andy Wilkinson 2756d87b3f Merge branch '2.0.x' 2018-08-09 11:15:13 +01:00
Andy Wilkinson 27f5e46587 Polish "Fix NPE in FlywayEndpoint when migration.installedOn is null"
Closes gh-14019
2018-08-09 11:10:21 +01:00
artsiom 83fbdc6ea8 Fix NPE in FlywayEndpoint when migration.installedOn is null
See gh-14019
2018-08-09 11:10:02 +01:00
Stephane Nicoll a12ca0a0dc Merge branch '2.0.x' 2018-08-08 16:05:34 +02:00