root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 17 Packages Projects Releases Wiki Activity
35,348 Commits 23 Branches 347 Tags 279 MiB
Commit Graph

1316 Commits

Author SHA1 Message Date
Andy Wilkinson 8aa9d0c13d Merge branch '2.5.x' 
Closes gh-28198
 2021-10-05 11:12:22 +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
Madhura Bhave ef2a5daa59 Polish 2021-09-21 16:56:47 -07:00
Phillip Webb 1829dc4960 Merge branch '2.5.x' 
Closes gh-28082
 2021-09-21 15:20:30 -07: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 667e5ca30c Polish 2021-09-21 14:45:01 -07:00
Phillip Webb 98a0e07dd5 Polish "Add startup time metrics" 
See gh-27878
 2021-09-21 14:45:00 -07:00
Phillip Webb 55a1ec72cc Update copyright year of changed files 2021-09-21 11:25:50 -07:00
Phillip Webb 4c2c4ec16c Merge branch '2.5.x' 2021-09-21 11:25:36 -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
Stephane Nicoll 6c8c8502e3 Log failing calls to health indicators 
Closes gh-22632

Co-authored-by: Madhura Bhave <bhavem@vmware.com>
 2021-09-21 11:01:07 -07:00
dreis2211 cf0fcafd13 Polish 
See gh-27940
 2021-09-21 08:08:29 +02:00
Andy Wilkinson 36b7aa9948 Merge branch '2.5.x' 
Closes gh-28070
 2021-09-20 19:04:58 +01: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
Stephane Nicoll 7957d97528 Polish 2021-09-16 14:12:23 +02:00
Stephane Nicoll c62a6819fe Polish "Add startup time metrics" 
See gh-27878
 2021-09-16 13:33:08 +02:00
bono007 2e67963bfe Add startup time metrics 
See gh-27878
 2021-09-16 13:19:20 +02:00
Stephane Nicoll b626adf1ee Polish "Add support for configuring the path of disk space metrics" 
See gh-27660
 2021-09-16 07:41:35 +02:00
bono007 08251b26d0 Add support for configuring the path of disk space metrics 
See gh-27660
 2021-09-16 07:13:21 +02:00
Stephane Nicoll 726a2591fb Start building against Micrometer 1.8.0-M3 snapshots 
See gh-27931
 2021-09-11 08:35:48 +02:00
Madhura Bhave 393081f2e6 Enable PathPattern based matching for MVC actuators 
Closes gh-24645
 2021-09-08 16:23:16 -07:00
Madhura Bhave 253f98c3e7 Add pluggable abstraction for applying custom sanitization rules 
Closes gh-27840
 2021-08-30 21:31:15 -07:00
Phillip Webb b1b3bdc9b1 Polish 2021-08-27 22:35:18 -07:00
Madhura Bhave 8fd9eb72d4 Allow part of a composite contributor in a health group 
Closes gh-23027

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-08-18 15:44:10 -07:00
Andy Wilkinson fd2fbcb3c6 Merge branch '2.5.x' 
Closes gh-27758
 2021-08-18 18:28:34 +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 fbeb5f19b7 Merge branch '2.5.x' 
Closes gh-27636
 2021-08-12 10:36:18 +01:00
Stephane Nicoll 57050fade4 Fix typo 2021-08-12 11:32:18 +02:00
Andy Wilkinson 35ea3b234d Prevent repository metrics from causing a circular reference 
Fixes gh-27591
 2021-08-12 10:26:16 +01:00
Madhura Bhave 49c86e6e1b Allow health groups to be configured at an additional path 
Closes gh-25471

Co-authored-by: Phillip Webb <pwebb@vmware.com>
 2021-08-11 19:25:25 -07:00
Stephane Nicoll 72433e8f53 Merge branch '2.5.x' 
Closes gh-27617
 2021-08-10 09:58:50 +02: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 64c0eceec7 Add support for dumping the heap on OpenJ9 
Closes gh-26466
 2021-07-30 15:35:59 +01:00
Andy Wilkinson 5163bdab22 Merge branch '2.5.x' 
Closes gh-27489
 2021-07-26 11:26:39 +01: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 355226c21e Merge branch '2.5.x' 
Closes gh-27474
 2021-07-23 13:09:37 +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
Phillip Webb 7e9ac39f0d Update copyright year of changed files 2021-07-22 09:50:37 -07:00
Andy Wilkinson 37f690323f Polish 
Closes gh-27432
 2021-07-21 11:55:38 +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 c211c971f1 Polishing 
Closes gh-27429
 2021-07-21 11:07:15 +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 6f0b23502e Merge branch '2.5.x' 
Closes gh-27347
 2021-07-15 11:51:48 +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 e1049a55ff Avoid retrieving values from Record beyond session boundary 
See gh-27294
 2021-07-14 19:42:10 +01:00
Andy Wilkinson 9f9c89a357 Polish "Use server version from database in Neo4j health details" 
See gh-27294
 2021-07-14 17:40:43 +01:00
Gerrit Meier f7fd0ac527 Use server version from database in Neo4j health details 
See gh-27294
 2021-07-14 17:37:40 +01:00
Andy Wilkinson 8db63db564 Merge branch '2.5.x' 
Closes gh-27333
 2021-07-14 17:19:59 +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
Stephane Nicoll dc5acb0019 Remove deprecated code flagged for removal 
Closes gh-27303
 2021-07-14 11:50:01 +02:00
Madhura Bhave 111ea31036 Merge branch '2.5.x' into main 2021-07-13 15:19:24 -07: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 9b82836f0e Merge branch '2.5.x' 
Closes gh-27305
 2021-07-13 14:56:36 +01: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
Andy Wilkinson d21f8df1ad Polish "Auto-configure Jetty connection and SSL metrics" 
See gh-26418
 2021-07-13 14:01:15 +01:00
bono007 e6c43a32c8 Auto-configure Jetty connection and SSL metrics 
See gh-26418
 2021-07-13 14:01:15 +01:00
Stephane Nicoll c16ef0a006 Upgrade to Neo4j Java Driver 4.3.3 
Closes gh-27278
 2021-07-12 09:13:10 +02: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