Andy Wilkinson
f29eed89ca
Reinstate merge of pull request #31713 from dreis2211
...
This reverts commit 8deef6cb42
.
2022-07-19 19:57:24 +01:00
Andy Wilkinson
8deef6cb42
Revert "Merge pull request #31713 from dreis2211"
...
This reverts commit 590bfd8a5c
, reversing
changes made to 993e1bf5f2
.
2022-07-19 17:29:14 +01:00
Andy Wilkinson
5c057a2730
Auto-configure the new Elasticsearch clients
...
This commit introduces auto-configuration for the new Elasticsearch
clients that are based upon their new Java client. The new Java
client builds on top of their existing low-level REST client,
replacing the high-level REST client which has been deprecated.
As part of introducing support for the new Elasticsearch client,
the auto-configuration for the templates (both imperative and
reactive) provided by Spring Data has also been updated to use the
new templates that build upon the new Java client.
As part of these changes, support for the high-level REST client and
the old Spring Data Elasticsearch templates has been removed. One
significant change is that the new reactive template is no longer
based on WebClient. As a result, the WebClient-specific configuration
property has been removed.
Closes gh-30647
Closes gh-28597
Closes gh-31755
2022-07-19 15:26:42 +01:00
Moritz Halbritter
0291388f2a
Polish
2022-07-19 14:26:00 +02:00
Moritz Halbritter
13c920b2a9
Add AOT support for ReactiveHealthEndpointWebExtension
...
See gh-31530
2022-07-19 14:24:20 +02:00
Stephane Nicoll
51cba6ec72
Polish "Add AOT support for actuator"
...
See gh-31671
2022-07-19 13:02:49 +02:00
Moritz Halbritter
584b7d1343
Add AOT support for actuator
...
Mainly adds reflection hints for the actuator infrastructure.
Also adds the OperationReflectiveProcessor, which registers the
@ReadMethod, @DeleteMethod and @WriteMethod annotated methods for
reflection and adds reflection hints for method return types.
See gh-31671
2022-07-19 13:02:48 +02:00
dreis2211
5adccb7857
Fix deprecations in javadocs
...
See gh-31713
2022-07-18 14:31:21 +02:00
Andy Wilkinson
3405a54f9e
Exclude Jetty toolchain dependencies in favor of official API artifacts
...
Closes gh-31720
2022-07-14 13:55:26 +01:00
Madhura Bhave
7c56a45d3e
Drop support for String path matching for MVC endpoints
...
Closes gh-31700
2022-07-13 14:03:32 -07:00
Stephane Nicoll
8e3aaf1cf4
Merge branch '2.7.x'
...
Closes gh-31707
2022-07-13 14:12:28 +02:00
Stephane Nicoll
3e4a5703c6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31706
2022-07-13 14:11:44 +02:00
Stephane Nicoll
628a7b0c5c
Update copyright year of changed files
...
See gh-31516
2022-07-13 14:08:22 +02:00
“Jakub
ed7b333138
Add missing descriptions for HTTP Server and Data repositories metrics
...
See gh-31516
2022-07-13 13:55:36 +02:00
Stephane Nicoll
9cace34a19
Merge branch '2.7.x'
...
Closes gh-31705
2022-07-13 13:50:36 +02:00
Stephane Nicoll
b8647551cb
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31704
2022-07-13 13:50:17 +02:00
Johnny Lim
b17cb9b92b
Polish gh-31231
...
See gh-31540
2022-07-13 13:49:13 +02:00
Madhura Bhave
d66e108703
Revert actuator changes related to path pattern parsing
...
See gh-31547
2022-07-12 15:25:41 -07:00
Madhura Bhave
7954f5e566
Adapt to change in default strategy for URL path matching in Spring MVC
...
Closes gh-31547
2022-07-12 09:59:44 -07:00
Andy Wilkinson
efc5391496
Adapt to deprecations in Framework's scheduling APIs
...
See gh-31241
2022-07-08 17:53:55 +01:00
Moritz Halbritter
d58f33f1ce
Polish AbstractExposableEndpoint
2022-07-08 16:16:53 +02:00
Moritz Halbritter
96c0e4783b
Polish ShutdownEndpoint
2022-07-08 16:14:04 +02:00
Moritz Halbritter
8639552405
Start building against Micrometer Tracing 1.0.0-M6 snapshots
...
See gh-31657
2022-07-08 14:01:13 +02:00
Andy Wilkinson
7f00378eaf
Polish "Start building against Spring Data 2022.0.0-M5 snapshots"
...
See gh-31582
2022-07-07 16:32:13 +01:00
Andy Wilkinson
e9136e023b
Adapt to trailing slashes no longer being matched by default
...
See gh-31563
2022-07-07 14:16:20 +01:00
Andy Wilkinson
97d96eebdf
Adapt ControllerEndpointHandlerMapping to PathPatternParser default
...
See gh-31547
2022-07-07 14:15:23 +01:00
dreis2211
458f989cf3
Use switch expressions where appropriate
...
See gh-31527
2022-06-24 16:19:28 +01:00
Andy Wilkinson
631b1e0d76
Merge branch '2.7.x'
...
Closes gh-31526
2022-06-24 13:10:10 +01:00
Andy Wilkinson
1e08f545d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31525
2022-06-24 13:05:06 +01:00
Andy Wilkinson
f49b16c645
Upgrade to Spring Java Format 0.0.34
...
Closes gh-31524
2022-06-24 12:57:52 +01:00
dreis2211
5db04da275
Use pattern matching for instanceof where appropriate
...
See gh-31475
2022-06-20 17:55:36 +01:00
Phillip Webb
85dcbf6100
Merge branch '2.7.x'
...
Closes gh-31385
2022-06-14 09:38:36 -07:00
Phillip Webb
e0947459b6
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31384
2022-06-14 09:38:05 -07:00
Phillip Webb
9f8a262e6b
Log a warning when a health indicator takes too long to run
...
Update `HealthEndpointSupport` so that it logs a warning if a health
indicator takes too long to respond.
Fixes gh-31231
2022-06-14 09:32:07 -07:00
Stephane Nicoll
b0f5fb51fc
Adapt to deprecation of NestedServletException
2022-06-14 17:45:31 +02:00
Andy Wilkinson
bf56665718
Polish "Add PUT shutdown operation for Prometheus Push Gateway"
...
See gh-31104
2022-05-26 20:04:09 +01:00
Mattia Cansirro Cortorillo
0f99c43198
Add PUT shutdown operation for Prometheus Push Gateway
...
See gh-31104
2022-05-26 19:58:53 +01:00
Andy Wilkinson
4bb5ba2bd0
Merge branch '2.7.x'
2022-05-26 18:26:52 +01:00
Andy Wilkinson
935d1264e0
Merge branch '2.6.x' into 2.7.x
2022-05-26 18:13:08 +01:00
Andy Wilkinson
3d203d0215
Polish
2022-05-26 17:30:39 +01:00
Andy Wilkinson
5dfa5adb75
Merge branch '2.7.x'
...
Closes gh-31178
2022-05-26 15:54:58 +01:00
Andy Wilkinson
455ee0ce22
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31177
2022-05-26 15:53:38 +01:00
Andy Wilkinson
ee45fd2fc8
Remove redundant throws declarations from internal APIs
...
Closes gh-31176
2022-05-26 15:47:35 +01:00
Andy Wilkinson
b3a4982f31
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31174
2022-05-26 14:01:23 +01:00
Andy Wilkinson
cbf42dea14
Update deprecation messages to change removal version from 2.8 to 3.0
...
Closes gh-30903
2022-05-26 13:59:03 +01:00
Andy Wilkinson
96c2d08fc4
Remove support for Solr as it is not compatible with Jetty 11
...
Closes gh-31054
2022-05-18 11:33:55 +01:00
Phillip Webb
ea41e89c6c
Merge branch '2.5.x' into 2.6.x
2022-05-17 22:21:10 -07:00
Phillip Webb
7d2f1bafc0
Update copyright year of changed files
2022-05-17 22:20:05 -07:00
Scott Frederick
8a1c8b5c2c
Fix deprecation warning
...
See gh-30978
2022-05-17 19:25:24 -05:00
Scott Frederick
8e38e28e94
Merge branch '2.7.x'
2022-05-17 18:47:13 -05:00
Scott Frederick
03deb1d067
Merge branch '2.6.x' into 2.7.x
...
Closes gh-31089
2022-05-17 18:46:59 -05:00
Scott Frederick
f395cfa255
Merge branch '2.5.x' into 2.6.x
...
Closes gh-31088
2022-05-17 18:46:38 -05:00
Scott Frederick
50e27333d2
Tolerate failures when recording WebClient metrics
...
Fixes gh-30978
2022-05-17 18:45:37 -05:00
Andy Wilkinson
3892b56a32
Adapt to breaking changes in Couchbase Driver 3.3
...
See gh-31031
2022-05-13 15:34:11 +01:00
Andy Wilkinson
c2a3652709
Merge branch '2.7.x'
2022-05-12 11:53:46 +01:00
Andy Wilkinson
7e88daf288
Update messages for APIs deprecated in 2.7
...
In all likelihood there will not be a 2.9 release so this commit
updates the message for deprecations made in 2.7 to indicate that
removal will not occur until 3.0.
See gh-30903
2022-05-12 11:12:09 +01:00
Andy Wilkinson
69a88b1938
fixup! Upgrade to Couchbase Client 3.3.0
2022-05-10 19:04:11 +01:00
Andy Wilkinson
3db1715694
Merge branch '2.7.x'
2022-05-06 18:15:38 +01:00
Andy Wilkinson
833e3aec27
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30887
2022-05-06 18:15:20 +01:00
Andy Wilkinson
d10addffe3
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30886
2022-05-06 18:15:01 +01:00
christophejan
a1f3d68ead
Improve debug logging of requests to actuator endpoints on WebFlux
...
See gh-30880
2022-05-06 17:49:27 +01:00
Andy Wilkinson
4a030343d3
Merge branch '2.7.x'
2022-05-06 11:40:11 +01:00
Andy Wilkinson
c61cd7761e
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30883
2022-05-06 11:37:30 +01:00
Andy Wilkinson
5258cd2814
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30882
2022-05-06 11:29:22 +01:00
Andy Wilkinson
0e7c3547dd
Prohibit usage of Micrometer nullability annotations
...
Closes gh-30881
2022-05-06 11:29:08 +01:00
Andy Wilkinson
541ab69aff
Merge branch '2.7.x'
2022-05-03 15:18:20 +01:00
Andy Wilkinson
4cd850cfc0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30851
2022-05-03 15:17:13 +01:00
Andy Wilkinson
fa327a783d
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30850
2022-05-03 15:14:00 +01:00
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
c7374fd415
Update copyright year of changed files
2022-04-20 15:30:20 -07:00
Phillip Webb
7a6ca8ce25
Merge branch '2.7.x'
2022-04-20 15:30:01 -07:00
Phillip Webb
dd5696b59b
Update copyright year of changed files
2022-04-20 15:26:30 -07:00
Stephane Nicoll
2d663f2e94
Upgrade to Spring Data 2021.2.0-RC1
...
Closes gh-30610
2022-04-20 08:05:15 +02:00
Andy Wilkinson
fe46392144
Merge branch '2.7.x'
2022-04-13 10:04:02 +01:00
Andy Wilkinson
27a936e466
Fix Elastic health indicator without RestHighLevelClient
...
Closes gh-28496
2022-04-13 10:02:47 +01:00
Andy Wilkinson
258ae5e153
Merge branch '2.7.x'
2022-04-12 21:58:41 +01:00
Andy Wilkinson
562627fb42
Deprecate auto-configuration for RestHighLevelClient
...
Closes gh-28598
2022-04-12 21:58:08 +01:00
Brian Clozel
77b7f2f1ce
Switch to Spring Framework SNAPSHOTs
...
See gh-30624
2022-04-12 17:02:03 +02:00
Andy Wilkinson
44211564a4
Adapt to latest changes in Micrometer 2.0 snapshots
...
See gh-29666
2022-04-12 15:25:43 +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
8d18e5fc0e
Merge branch '2.7.x'
2022-04-11 15:23:10 +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
5ab9112bbc
Add auto-configuration for Micrometer 2.0.0 Observation API
...
- Adds a ObservationRegistry bean
- Add support for ObservationRegistryCustomizers
- Enables timer creation for observations if micrometer-core is on
the classpath
- Registers ObservationPredicate, GlobalTagsProvider and
ObservationHandler on the MeterRegistry
- Applies grouping to the ObservationHandlers: MeterObservationHandler
are added to a FirstMatchingCompositeObservationHandler
- If micrometer-tracing is on the classpath, the
TracingObservationHandler are added to a
FirstMatchingCompositeObservationHandler
Closes gh-29666
2022-04-05 13:57:31 +02:00
Moritz Halbritter
e431842668
Merge branch '2.7.x'
2022-03-25 14:56:49 +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
Stephane Nicoll
2088381d4b
Merge branch '2.7.x'
2022-03-21 10:06:56 +01:00
Jens Wilke
774f61fcb5
Add support for cache2k in memory caching
...
See gh-28498
2022-03-21 08:22:19 +01:00
Andy Wilkinson
e60001fb16
Adapt to deprecations in Spring Data Redis
...
See gh-30200
2022-03-18 11:16:55 +00: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
f97bf544bf
Polish
2022-03-10 17:11:50 +00:00
Andy Wilkinson
14128ffc27
Merge branch '2.7.x'
2022-03-10 16:31:52 +00: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
2816fc37a8
Merge branch '2.7.x'
2022-03-09 11:32:58 +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
Moritz Halbritter
1793cee00f
Start building against Micrometer 2.0.0-M3
...
See gh-29753
2022-03-04 11:03:22 +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
bd0829a382
Merge branch '2.7.x'
2022-03-03 14:48:03 +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
Phillip Webb
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
Madhura Bhave
bf1ed5f2f8
Update copyright header on changed files
2022-02-16 14:24:22 -08:00
Madhura Bhave
44b88cc88c
Allow @ConstructorBinding to be optional
...
This commit makes @ConstructorBinding optional for a type
that has a single parameterized constructor. An @Autowired annotation
on any of the constructors indicates that the type should not be constructor
bound.
Since @ConstructorBinding is now deduced for a single parameterized constructor,
the annotation is no longer needed at the type level.
Closes gh-23216
2022-02-16 13:47:26 -08:00
Stephane Nicoll
b22e3d51dc
Merge branch '2.7.x'
2022-02-04 10:10:29 +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
Phillip Webb
a282f912e6
Organize imports
...
Organize imports according to updated checkstyle rules.
2022-02-02 19:16:13 -08:00
Phillip Webb
501d174db0
Merge branch '2.7.x'
2022-02-02 10:38:46 -08:00
Brian Clozel
b1c815830f
Upgrade to RxJava 3.x and remove older generations
...
As Spring Framework removed support for RxJava 1.x and 2.x, we should do
the same and only provide dependency management for RxJava 3.x.
Closes gh-28212
2022-02-01 11:38:50 +01:00
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
4d03f89a55
Harmonize dependency upgrades with Spring Boot 2.7.0-M1
...
Closes gh-29476
2022-01-19 10:39:18 +01: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
Andy Wilkinson
1dbfcf8b57
Reinstate support for Spring Data Couchbase
...
Closes gh-28976
2022-01-04 16:38:16 +00: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
Scott Frederick
29a21d4621
Remove support for Spring Data Couchbase and Couchbase caching
...
Fixes gh-28613
2021-11-30 15:39:28 +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
2a342ef416
Merge branch '2.5.x'
...
Closes gh-28662
2021-11-12 23:40:35 +00:00
Andy Wilkinson
5e4a502b2d
Merge branch '2.4.x' into 2.5.x
...
Closes gh-28661
2021-11-12 20:31:25 +00:00
Andy Wilkinson
2cec3971d7
Prohibit unwanted dependencies in all modules not just starters
...
Closes gh-28658
2021-11-12 20:04:35 +00: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