Andy Wilkinson
a71d19bce7
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27488
2021-07-26 11:26:08 +01:00
Andy Wilkinson
388068cdff
Polish "Sanitize URIs with non-alpha characters in their schemes"
...
See gh-27482
2021-07-26 11:13:58 +01:00
Billy Tobon
bafa9c4784
Sanitize URIs with non-alpha characters in their schemes
...
See gh-27482
2021-07-26 11:03:18 +01:00
Andy Wilkinson
eaca9c7a83
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27473
2021-07-23 13:09:27 +01:00
Andy Wilkinson
ee07d6c3ca
Increase response timeout for server-bound WebTestClients
...
Closes gh-27472
2021-07-23 13:06:25 +01:00
Andy Wilkinson
bb26b7bdf5
Polish
...
Closes gh-27431
2021-07-21 11:53:10 +01:00
izeye
734293d491
Polish
...
See gh-27418
2021-07-21 11:17:43 +01:00
Andy Wilkinson
4a533e14c3
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27428
2021-07-21 11:06:40 +01:00
dreis2211
4d0c98011e
Polishing
...
See gh-27417
2021-07-21 11:05:59 +01:00
Andy Wilkinson
d4159130a5
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27346
2021-07-15 11:50:51 +01:00
Andy Wilkinson
7a23a12ce0
Fix configprops endpoint's handling of config tree values
...
Fixes gh-27327
2021-07-15 11:50:40 +01:00
Andy Wilkinson
9a81d2fe09
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27332
2021-07-14 17:19:39 +01:00
Andy Wilkinson
c005e1de9a
Rename test classes to match our naming conventions
...
Closes gh-27331
2021-07-14 17:19:11 +01:00
Madhura Bhave
ed22e4a897
Merge branch '2.4.x' into 2.5.x
2021-07-13 15:18:40 -07:00
Madhura Bhave
23b377e1a1
Fix typo
2021-07-13 15:18:17 -07:00
Andy Wilkinson
685b78f504
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27304
2021-07-13 14:56:26 +01:00
Andy Wilkinson
49baacbc1c
Polish "Mark Redis as down when cluster_state is fail"
...
See gh-27300
2021-07-13 14:56:01 +01:00
Hoan Vu Hong
f31141de09
Mark Redis as down when cluster_state is fail
...
See gh-27300
2021-07-13 14:35:59 +01:00
Phillip Webb
2c518f1dff
Merge branch '2.4.x' into 2.5.x
2021-06-23 21:02:05 -07:00
Phillip Webb
a76e5c043e
Update copyright year of changed files
2021-06-23 21:01:45 -07:00
Andy Wilkinson
d635e1e779
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26923
2021-06-16 08:28:05 +01:00
Andy Wilkinson
fe078c8afc
Avoid capturing URI template when interceptor won't use it
...
Previously, the URI template handler installed by the client metrics
interceptor would always capture the URI template and push it onto the
deque, irrespective of whether auto timing was enabled. When
auto-timing is disabled the deque is never polled so this led to its
unrestricted growth.
This commit updates the URI template handler so that a URI template is
only pushed onto the deque when the auto timing configuration enables
the interceptor.
Fixes gh-26915
2021-06-16 08:27:51 +01:00
Andy Wilkinson
866f1e34c1
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26873
2021-06-11 19:53:05 +01:00
Andy Wilkinson
37d395bad2
Try to stabilize flaky MetricsWebClientFilterFunction test
...
Closes gh-26855
2021-06-11 19:48:34 +01:00
Andy Wilkinson
c5728c9560
Merge branch '2.4.x'
...
Closes gh-26827
2021-06-09 09:13:21 +01:00
Andy Wilkinson
303edac6bb
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26826
2021-06-09 09:13:06 +01:00
Andy Wilkinson
d1e1796f76
Consider overridden getRootUri() when getting root URI
...
Fixes gh-26812
2021-06-09 09:12:37 +01:00
Phillip Webb
850088de32
Merge branch '2.4.x'
...
Closes gh-26823
2021-06-08 18:17:33 -07:00
Phillip Webb
d5264664e6
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26822
2021-06-08 18:17:18 -07:00
Phillip Webb
1f6983c4c9
Make CompositeHealth.getDetails() public
...
Change `CompositeHealth.getDetails()` to public so that it serializes
correctly when `MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS` is
disabled.
Fixes gh-26797
2021-06-08 18:17:09 -07:00
Stephane Nicoll
5ac5038176
Merge branch '2.4.x'
2021-06-04 17:49:52 +02:00
Stephane Nicoll
aea8597114
Merge branch '2.3.x' into 2.4.x
2021-06-04 17:49:40 +02:00
Stephane Nicoll
6490edc16d
Polish
2021-06-04 17:46:42 +02:00
Andy Wilkinson
b9abcba778
Merge branch '2.4.x'
...
Closes gh-26596
2021-05-19 13:38:20 +01:00
Andy Wilkinson
ff45e4c418
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26595
2021-05-19 13:15:18 +01:00
Andy Wilkinson
936c31c7a7
Prevent metrics failures from adversely affecting web responses
...
Fixes gh-24151
2021-05-19 13:14:52 +01:00
Stephane Nicoll
d3c817b7ba
Polish "Remove unnecessary throws declaration in tests"
...
See gh-26441
2021-05-17 09:36:53 +02:00
weixsun
8a2be288a3
Remove unnecessary throws declaration in tests
...
See gh-26441
2021-05-17 09:31:51 +02:00
Stephane Nicoll
367fd64c23
Merge branch '2.4.x'
...
Closes gh-26325
2021-04-30 13:40:32 +02:00
Stephane Nicoll
c134c38a68
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26324
2021-04-30 13:40:24 +02:00
Stephane Nicoll
af70da0e92
Update copyright year of changed file
...
See gh-26321
2021-04-30 13:35:28 +02:00
Matthias Stock
6c8c735027
Fix typo in NamedContributors Javadoc
...
See gh-26321
2021-04-30 13:35:17 +02:00
Phillip Webb
beaf03a008
Update copyright year of changed files
2021-04-15 12:22:48 -07:00
izeye
e27c85698d
Polish
...
See gh-26135
2021-04-15 16:31:10 +02:00
izeye
4987880afa
Polish
...
See gh-25980
2021-04-12 08:37:02 +02:00
Phillip Webb
f03f74ff0a
Add Spring Data Repository metrics support
...
Add support for Spring Data Repository metrics by integrating with
Spring Data's new `RepositoryMethodInvocationListener` support.
Closes gh-22217
2021-04-09 23:49:25 -07:00
Phillip Webb
9f16491535
Rework @Timer annotation support
...
Rework existing `@Timer` annotation support to remove duplicate code
and offer general purpose utilities that can be used in future metrics
support.
See gh-23112
See gh-22217
2021-04-09 23:39:39 -07:00
Phillip Webb
3d7e5e3abd
Polish
2021-04-09 23:38:32 -07:00
Phillip Webb
15fe41868e
Polish 'Support @Timed annotation for WebFlux'
...
Extract common method logic to a `HandlerMethodTimedAnnotations`
utility class and also add some caching. Also move the test code
into a single class.
See gh-23112
2021-04-08 23:01:21 -07:00
anshlykov
4ff4a9b082
Support @Timed annotation for WebFlux
...
Update `MetricsWebFilter` to support `@Timed` annotations on the WebFlux
handler methods or beans.
See gh-23112
2021-04-08 23:00:08 -07:00