Commit Graph

1352 Commits

Author SHA1 Message Date
Andy Wilkinson 4fd2e0c916 Polish "Fix typos"
See gh-30773
2022-05-03 14:09:53 +01:00
Andy Wilkinson f6d24dc1a8 Fix typos
See gh-30773
2022-05-03 14:09:37 +01:00
Phillip Webb dd5696b59b Update copyright year of changed files 2022-04-20 15:26:30 -07:00
Andy Wilkinson 27a936e466 Fix Elastic health indicator without RestHighLevelClient
Closes gh-28496
2022-04-13 10:02:47 +01:00
Andy Wilkinson 562627fb42 Deprecate auto-configuration for RestHighLevelClient
Closes gh-28598
2022-04-12 21:58:08 +01:00
Andy Wilkinson 6580f6c742 Align with latest changes in Micrometer 1.9 snapshots
See gh-30605
2022-04-12 11:47:34 +01:00
Andy Wilkinson b8b903527a Update tag keys to comply with Micrometer recommendations
Closes gh-30536
2022-04-11 15:21:35 +01:00
Moritz Halbritter 45f393b76b Merge branch '2.6.x' into 2.7.x
Closes gh-30437
2022-03-25 14:56:01 +01:00
Moritz Halbritter c003d5b533 Merge branch '2.5.x' into 2.6.x
Closes gh-30436
2022-03-25 14:55:31 +01:00
Moritz Halbritter 0ff8119a1b Sort entries in additional-spring-configuration metadata alphabetically
Closes gh-30434
2022-03-25 14:54:39 +01:00
Andy Wilkinson 64888b0deb Merge branch '2.6.x' into 2.7.x
Closes gh-30433
2022-03-25 12:03:24 +00:00
Jens Wilke 774f61fcb5 Add support for cache2k in memory caching
See gh-28498
2022-03-21 08:22:19 +01:00
Stephane Nicoll 626cfff940 Merge branch '2.6.x' into 2.7.x 2022-03-16 18:17:27 +01:00
Stephane Nicoll 8e7f7d3c76 Merge branch '2.5.x' into 2.6.x 2022-03-16 18:17:17 +01:00
Stephane Nicoll b97a3ae07a Revert unnecessary suppress warnings
See https://github.com/spring-projects/spring-framework/issues/28079
2022-03-16 18:10:58 +01:00
Stephane Nicoll 6baa248228 Start building against Spring Framework 5.3.17 snapshots
See gh-30188
2022-03-12 12:01:44 +01:00
Stephane Nicoll 71e6a836a6 Start building against Spring Framework 5.3.17 snapshots
See gh-30177
2022-03-12 11:50:03 +01:00
Stephane Nicoll 2620710480 Start building against Spring Framework 5.3.17 snapshots
See gh-30170
2022-03-11 21:22:48 +01:00
Andy Wilkinson 085fb0766f Merge branch '2.6.x' into 2.7.x
Closes gh-30162
2022-03-10 16:31:21 +00:00
Andy Wilkinson 0958498a47 Merge branch '2.5.x' into 2.6.x
Closes gh-30161
2022-03-10 16:31:09 +00:00
Andy Wilkinson 6eacc07de0 Fix handling of Flux responses from Actuator endpoints
Closes gh-30095
2022-03-10 16:10:39 +00:00
Moritz Halbritter 16f069ef47 Merge branch '2.5.x' into 2.6.x
Closes gh-30125
2022-03-09 12:10:05 +01:00
Moritz Halbritter d14980ed5e Polish "Tweak performance for Prometheus scraping endpoint"
See gh-30085
2022-03-09 12:08:55 +01:00
Peter Paul Bakker fb3f3c52cf Tweak performance for Prometheus scraping endpoint
Reduce the number of times capacity growth is needed inside the StringWriter.
A typical default SpringBoot Prometheus page has more than 11k characters.
Best performance results when no capacity growth is needed at all, so base
it on previous metrics page size plus some room for possible extra metric info.

See gh-30085
2022-03-09 12:08:26 +01:00
Moritz Halbritter 93f31ee063 Polish "Tweak performance for Prometheus scraping endpoint"\n\nSee gh-30085 2022-03-09 11:31:23 +01:00
Peter Paul Bakker e2ebb56911 Tweak performance for Prometheus scraping endpoint
Reduce the number of times capacity growth is needed inside the StringWriter.
A typical default SpringBoot Prometheus page has more than 11k characters.
Best performance results when no capacity growth is needed at all, so base
it on previous metrics page size plus some room for possible extra metric info.

See gh-30085
2022-03-09 11:22:20 +01:00
Andy Wilkinson 4846be9506 Align with latest repackaging of CacheMeterBinder in Micrometer
See gh-30014
2022-03-03 15:44:12 +00:00
Andy Wilkinson ff7321cc5a Polish "Support overriding the default SanitizingFunction"
See gh-30006
2022-03-03 14:24:51 +00:00
Guirong Hu fb9112c891 Support overriding the default SanitizingFunction
See gh-30006
2022-03-03 14:19:14 +00:00
Moritz Halbritter 7897a913a7 Start building against Micrometer 1.9.0-M4 snapshots
Micrometer duplicated the binders in a separate module named
micrometer-binders, and marked the binders in the core module as
deprecated. This commit changes the imports to use the new binders in
the micrometer-binders module. Additionally, the auto-configurations
honor user-supplied beans which use the old binders in the
micrometer-core module.

See gh-30014
2022-03-01 09:20:07 +01:00
Henning Poettker e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility
See gh-29200
2022-02-04 09:57:59 +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
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 9821cdfd8b Remove deprecated code
Closes gh-29290
2022-01-07 14:42:14 +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 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 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 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 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 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 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
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
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