root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
38,652 Commits 23 Branches 345 Tags 276 MiB
Commit Graph

1391 Commits

Author SHA1 Message Date
Stephane Nicoll 41fb9cf562 Merge branch '2.7.x' 2022-02-01 11:15:49 +01:00
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x 
Closes gh-29613
 2022-02-01 11:07:31 +01:00
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x 
Closes gh-29612
 2022-02-01 10:59:08 +01:00
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito" 
See gh-29178
 2022-02-01 10:03:18 +01:00
Yanming Zhou b49418aaaf Enforce use of BDDMockito 
1. Replace Mockito.verify*() with BDDMockito.then()
2. Replace Mockito.doReturn() with BDDMockito.willReturn()
3. Adjust checkstyle rule

See gh-29178
 2022-02-01 09:37:15 +01:00
Andy Wilkinson de3b9a4910 Remove code deprecated for removal in 2.x 
Closes gh-29482
 2022-01-19 17:25:14 +00:00
Stephane Nicoll abb88b9aeb Upgrade to Micrometer 2.0.0-M1 
Closes gh-29279
 2022-01-14 09:09:17 +01:00
Stephane Nicoll 90b8d2190f Adapt to latest change in Spring Data Elasticsearch 2022-01-12 10:04:44 +01:00
Stephane Nicoll 5f67546534 Adapt to latest API change in SD Elasticsearch 
See gh-29292
 2022-01-09 22:24:05 +01:00
Stephane Nicoll 9e27bddfc7 Start building against Spring Data 2021.2.0-M1 snapshots 
This commit also upgrades to Elasticsearch 7.16.2

See gh-29223
See gh-29292
 2022-01-08 19:57:50 +01:00
Stephane Nicoll 11e604af41 Merge branch '2.7.x' 2022-01-07 14:43:19 +01:00
Stephane Nicoll 9821cdfd8b Remove deprecated code 
Closes gh-29290
 2022-01-07 14:42:14 +01:00
Stephane Nicoll c62aa0deab Remove support for Hazelcast 3 
Closes gh-29287
 2022-01-07 10:22:27 +01:00
Stephane Nicoll 025fe4fd43 Merge branch '2.7.x' 2022-01-06 17:50:15 +01:00
Stephane Nicoll 69d1c3674a Upgrade to latest Hazelcast 3.x in integration tests 2022-01-06 17:41:26 +01:00
Stephane Nicoll a780e87e9c Upgrade to Hazelcast 5.0.2 
See gh-29265
 2022-01-06 17:38:06 +01:00
Phillip Webb b25e92f3e2 Merge branch '2.6.x' into 2.7.x 2022-01-04 12:24:34 -08:00
Stephane Nicoll abb622023d Merge branch '2.7.x' 2022-01-04 14:23:48 +01:00
Stephane Nicoll d24720d958 Polish "Expose OS information as an InfoContributor" 
See gh-28907
 2022-01-04 14:08:24 +01:00
Jonatan Ivanov c700f686c6 Expose OS information as an InfoContributor 
See gh-28907
 2022-01-04 13:58:39 +01:00
izeye 728206dba0 Polish GraphQL changes 
See gh-29140
Closes gh-29194
 2022-01-03 17:36:57 +01:00
Stephane Nicoll e10b582a09 Merge branch '2.7.x' 2022-01-03 09:33:42 +01:00
Stephane Nicoll a20f959fbc Merge branch '2.6.x' into 2.7.x 2022-01-03 09:33:33 +01:00
Stephane Nicoll c469c41127 Merge branch '2.5.x' into 2.6.x 2022-01-03 09:33:23 +01:00
Stephane Nicoll 04ce0e65cd Polish assertion 2022-01-03 09:26:22 +01:00
Stephane Nicoll 09486b8fc7 Merge branch '2.7.x' 2021-12-27 12:03:11 +01:00
Stephane Nicoll 2b140950e3 Merge branch '2.6.x' into 2.7.x 
Closes gh-29176
 2021-12-27 12:02:57 +01:00
izeye 7fbb5749d1 Polish 
See gh-29157
 2021-12-27 12:01:50 +01:00
Brian Clozel 88ee4fab36 Polish 
See gh-29140
 2021-12-21 10:33:51 +01:00
Brian Clozel f61c87c3a7 Revert "Merge branch '2.7.x'" 
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
 2021-12-21 09:05:06 +01:00
Brian Clozel f0677a119c Merge branch '2.7.x' 2021-12-21 09:04:10 +01:00
Brian Clozel a7839bc9b9 Add Metrics support for Spring GraphQL 
This commit adds the required infrastructure for instrumenting the
GraphQL engine and datafetchers in order to collect metrics.

With this infrastructure, we can collect metrics such as:

* "graphql.request", a timer for GraphQL query
* "graphql.datafetcher", a timer for GraphQL datafetcher calls
* "graphql.request.datafetch.count", a distribution summary of
  datafetcher count per query
* "graphql.error", an error counter

See gh-29140
 2021-12-21 08:34:24 +01:00
Stephane Nicoll 2d7e478a55 Merge branch '2.7.x' 2021-12-18 12:25:01 +01:00
Stephane Nicoll 4fa0e87ba1 Merge branch '2.6.x' into 2.7.x 2021-12-18 12:24:51 +01:00
Stephane Nicoll efa93506e6 Fix checkstyle violations 2021-12-18 12:23:53 +01:00
Madhura Bhave 1c17a851b7 Merge branch '2.7.x' into main 2021-12-17 17:57:45 -08:00
Madhura Bhave d803c53e02 Merge branch '2.6.x' into 2.7.x 
Closes gh-29109
 2021-12-17 17:57:33 -08:00
Madhura Bhave 4cc8012bfa Handle WebServerNamespace in CachingOperationInvoker 
Fixes gh-28882
 2021-12-17 17:55:06 -08:00
Phillip Webb 003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -08:00
Andy Wilkinson 3c8d4d33e1 Upgrade to Spring Data Elasticsearch 7.16.0 
Closes gh-28987
 2021-12-10 21:43:29 +00:00
Stephane Nicoll c83ab9bbc5 Merge branch '2.7.x' 2021-12-09 15:51:29 +01:00
Stephane Nicoll 89635eafa3 Update copyright year of changed files 
See gh-28862
 2021-12-09 15:48:47 +01:00
Stefano Cordio a5c56043b9 Simplify AssertJ usage 
See gh-28862
 2021-12-09 15:39:02 +01:00
Andy Wilkinson fe7b13ec46 Upgrade to Spring Framework 6 and Jakarta EE 9 
Closes gh-28619
Closes gh-28620
Closes gh-28621
Closes gh-28622
Closes gh-28623
Closes gh-28624
Closes gh-28625
Closes gh-28626
Closes gh-28627
Closes gh-28628
Closes gh-28629
Closes gh-28630
Closes gh-28631
Closes gh-28632
Closes gh-28633
Closes gh-28634
Closes gh-28635
Closes gh-28636
Closes gh-28638
Closes gh-28639
Closes gh-28640
Closes gh-28644
Closes gh-28645
Closes gh-28650
Closes gh-28711
Closes gh-28866
Closes gh-28867
Closes gh-28868
Closes gh-28872

See gh-28641
See gh-28642
See gh-28643
See gh-28646
See gh-28647
See gh-28648
See gh-28649
See gh-28721
See gh-28869
See gh-28871
 2021-11-30 20:32:16 +00:00
Andy Wilkinson 8bf2ffd93c Drop support for Jersey until jersey-spring6 is available 
Closes gh-28808
 2021-11-30 15:39:39 +00:00
Andy Wilkinson 64bf33038d Remove support for EhCache 2 
Closes gh-28588
 2021-11-30 15:38:23 +00:00
Stephane Nicoll 88aa849f90 Merge branch '2.5.x' 2021-11-29 09:37:31 +01:00
Stephane Nicoll 1bb3f906a7 Polish 
See gh-28836
 2021-11-29 09:35:51 +01:00
Stephane Nicoll 490ec8974d Merge branch '2.5.x' 
Closes gh-28761
 2021-11-20 17:30:35 +01:00
Stephane Nicoll 667bca05ec Polish "Add package info for Spring Data metrics support" 
See gh-28756
 2021-11-20 17:29:52 +01:00
charissathomas 42ae5114ef Create package-info.java 
Closes #28731
 2021-11-20 17:29:22 +01:00
Andy Wilkinson e340429a1a Merge branch '2.5.x' 
Closes gh-28469
 2021-10-28 12:50:23 +01:00
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 3605388787 Merge branch '2.5.x' 
Closes gh-28440
 2021-10-22 15:24:13 +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 37426df148 Merge branch '2.5.x' 
Closes gh-28354
 2021-10-14 12:25:38 -07: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 4da7d2a6a7 Merge branch '2.5.x' 
Closes gh-28348
 2021-10-14 11:27:35 -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 84b553a8ca Upgrade to Jackson Bom 2.13.0 
Closes gh-28298
 2021-10-13 10:32:17 +01:00
Stephane Nicoll cc8d7fc605 Polish contribution 
See gh-28239
 2021-10-13 09:10:11 +02:00
Leo Li 1770f065a5 Polish 
See gh-28239
 2021-10-13 09:07:33 +02:00
Andy Wilkinson 1a505964ee Merge branch '2.5.x' 
Closes gh-28207
 2021-10-06 10:03:24 +01: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
dreis2211 c5088a3bd3 Avoid explicit initialization of Atomics with their default values 
See gh-28162
 2021-10-05 15:37:00 +02:00
Stephane Nicoll 5d17257a52 Polish "Add Java InfoContributor" 
See gh-28136
 2021-10-05 15:11:58 +02:00
Jonatan Ivanov fc87da7ef3 Add Java InfoContributor 
See gh-28136
 2021-10-05 13:52:42 +02:00
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