Commit Graph

1233 Commits

Author SHA1 Message Date
Andy Wilkinson b375f9fac0 Ignore parameters when checking if */* is accepted
Previously the parameters were not ignored so */*;q=0.8 was not
identified as accepting */*. As a result, the most recent producible
content type was returned rather than the default.

This commit updates the argument resolver to ignore parameters.
The default content type is now produced in response to a request
that accepts */*, irrespective of its parameters.

Fixes gh-28446
2021-10-28 12:27:34 +01:00
Andy Wilkinson 50d4eaad63 Merge branch '2.4.x' into 2.5.x
Closes gh-28439
2021-10-22 15:23:07 +01:00
Leo Li 1586232761 Polish
See gh-28367
2021-10-22 15:11:57 +01:00
Phillip Webb cf8a1b8b04 Merge branch '2.4.x' into 2.5.x
Closes gh-28353
2021-10-14 12:24:04 -07:00
Phillip Webb b68b3737d7 Sanitize flattened VCAP_SERVICES properties
Update `Sanitizer` to also include flattened `vcap.services.*`
properties.

Fixes gh-28085
2021-10-14 12:22:57 -07:00
Phillip Webb 2430d8a41a Merge branch '2.4.x' into 2.5.x
Closes gh-28347
2021-10-14 11:27:17 -07:00
Phillip Webb 4dc5142128 Prevent cache from consuming too much memory
Change the cache in `CachingOperationInvoker` to be a reference based
map and also clean stale entries when a specific threshold is met.

Fixes gh-28313
2021-10-14 11:23:56 -07:00
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
2021-10-06 09:57:19 +01:00
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
2021-10-06 09:52:45 +01:00
Andy Wilkinson 437a1601ef Fix broken content negotiation for Prometheus with OpenMetrics
Update Prometheus `TextOutputFormat` so that OpenMetrics is used in
preference to text output when an appropriate accept header is found.

If the accept header contains `*/*` or is missing then the text format
will be used.

See gh-28130
2021-10-05 11:11:52 +01:00
Phillip Webb d8141e6a8d Allow Producible enums to indicate a default value
Add an `isDefault()` method to `Producible` which can be used to
indicate which of the enum values should be used when the accept header
is `*/*` or `null`.

Prior to this commit, the last enum value was always used as the
default.

See gh-28130
2021-10-05 09:39:28 +01:00
Phillip Webb a862ebc254 Merge branch '2.4.x' into 2.5.x
Closes gh-28081
2021-09-21 15:20:19 -07:00
Phillip Webb bbb4ac1542 Sanitize SPRING_APPLICATION_JSON by default
Update `Sanitizer` default keys to include `SPRING_APPLICATION_JSON`.

Fixes gh-28045
2021-09-21 15:18:50 -07:00
Phillip Webb 5ba69634c9 Merge branch '2.4.x' into 2.5.x 2021-09-21 11:17:55 -07:00
Phillip Webb dfd36673f7 Update copyright year of changed files 2021-09-21 11:17:19 -07:00
Phillip Webb cfeafee826 Polish 2021-09-21 11:16:46 -07:00
Andy Wilkinson b2b691b1d0 Merge branch '2.4.x' into 2.5.x
Closes gh-28069
2021-09-20 19:04:48 +01:00
Andy Wilkinson c2361aeb04 Make WebMvcMetricsFilter set status consistently for all exceptions
Closes gh-27988
2021-09-20 18:07:18 +01:00
Andy Wilkinson 6d8ba3e8b1 Merge branch '2.4.x' into 2.5.x
Closes gh-27757
2021-08-18 17:56:32 +01:00
Andy Wilkinson ffbd28b60a Polish "Polish access modifiers for test classes"
See gh-27736
2021-08-18 17:52:42 +01:00
izeye 8a425dedfd Polish access modifiers for test classes
See gh-27736
2021-08-18 17:38:40 +01:00
Andy Wilkinson 35ea3b234d Prevent repository metrics from causing a circular reference
Fixes gh-27591
2021-08-12 10:26:16 +01:00
Stephane Nicoll a393c2982c Merge branch '2.4.x' into 2.5.x
Closes gh-27616
2021-08-10 09:58:40 +02:00
Stephane Nicoll cd0bb969db Fix Potential NPE in TomcatMetricsBinder.findContext()
Closes gh-27576
2021-08-10 09:58:18 +02:00
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