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
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
izeye
e27c85698d
Polish
...
See gh-26135
2021-04-15 16:31:10 +02:00
izeye
4987880afa
Polish
...
See gh-25980
2021-04-12 08:37:02 +02:00
Phillip Webb
f03f74ff0a
Add Spring Data Repository metrics support
...
Add support for Spring Data Repository metrics by integrating with
Spring Data's new `RepositoryMethodInvocationListener` support.
Closes gh-22217
2021-04-09 23:49:25 -07:00
Phillip Webb
9f16491535
Rework @Timer annotation support
...
Rework existing `@Timer` annotation support to remove duplicate code
and offer general purpose utilities that can be used in future metrics
support.
See gh-23112
See gh-22217
2021-04-09 23:39:39 -07:00
Phillip Webb
3d7e5e3abd
Polish
2021-04-09 23:38:32 -07:00
Phillip Webb
15fe41868e
Polish 'Support @Timed annotation for WebFlux'
...
Extract common method logic to a `HandlerMethodTimedAnnotations`
utility class and also add some caching. Also move the test code
into a single class.
See gh-23112
2021-04-08 23:01:21 -07:00
anshlykov
4ff4a9b082
Support @Timed annotation for WebFlux
...
Update `MetricsWebFilter` to support `@Timed` annotations on the WebFlux
handler methods or beans.
See gh-23112
2021-04-08 23:00:08 -07:00
Phillip Webb
e4164d0143
Fix package tangle in endpoint package
...
Fix package tangle in the actuator endpoint package by relocating a
few classes.
The `Producible` and `ProducibleOperationArgumentResolver` classes have
been moved from `endpoint.annotation` to `endpoint` since they aren't
directly tied to annotations.
The `ApiVersion` class has been moved from `endpoint.http` to
`endpoint` since it needs to implement `Producible` and isn't really
tied to HTTP.
Closes gh-25914
2021-04-07 16:54:37 -07:00
Phillip Webb
807ea1af0d
Update copyright year of changed files
2021-04-06 14:59:52 -07:00
Stephane Nicoll
b11602aeaa
Polish "Add Quartz actuator endpoint"
...
This commit reworks the initial proposal so that jobs and triggers are
treated as first class concepts.
`/actuator/quartz` now returns the group names for jobs and triggers.
`actuator/quartz/jobs` returns the job names, keyed by the available
group names, while `/actuator/quartz/triggers` does the same for
triggers.
`/actuator/jobs/{groupName}` provides an overview of a job group. It
provides a map of job names with the class name of the job.
implementation
`/actuator/triggers/{groupName}` provides an overview of a trigger
group. There are five supported trigger implementations: cron, simple,
daily time interval, calendar interval, and custom for any other
implementation. Given that each implementation has specific settings,
triggers are split in five objects.
`/actuator/jobs/{groupName}/{jobName}` provides the full details of a
particular job. This includes a sanitized data map and a list of
triggers ordered by next fire time.
`/actuator/triggers/{groupName}/{triggerName}` provides the full details
of a particular trigger. This includes the state, its type, and a
dedicate object containing implementation-specific settings.
See gh-10364
2021-04-06 12:13:28 +02:00
Vedran Pavic
9795061360
Add Quartz actuator endpoint
...
See gh-10364
2021-04-06 11:36:54 +02:00
Stephane Nicoll
dd916f908f
Merge branch '2.4.x'
...
Closes gh-25880
2021-04-04 11:19:13 +02:00
izeye
852e5778a3
Polish
...
See gh-25875
2021-04-04 11:12:03 +02:00
Brian Clozel
72a1eb6384
Allow to manually tag request metrics with exceptions
...
Prior to this commit, some exceptions handled at the controller or
handler function level would:
* not bubble up to the Spring Boot error handling support
* not be tagged as part of the request metrics
This situation is inconsistent because in general, exceptions handled at
the controller level can be considered as expected behavior.
Also, depending on how the exception is handled, the request metrics
might not be tagged with the exception.
This will be reconsidered in gh-23795.
This commit prepares a transition to the new situation. Developers can
now opt-in and set the handled exception as a request attribute. This
well-known attribute will be later read by the metrics support and used
for tagging the request metrics with the exception provided.
This mechanism is automatically used by the error handling support in
Spring Boot.
Closes gh-24028
2021-04-01 21:09:46 +02:00
Andy Wilkinson
03e92d794b
Merge branch '2.4.x'
...
Closes gh-25845
2021-03-31 17:29:33 +01:00
Andy Wilkinson
0e4b66a3ea
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25844
2021-03-31 17:29:11 +01:00
Andy Wilkinson
1a84b0610e
Align PushGatewayManager's exception handling with PushMeterRegistry's
...
Previously, would log an error for any exception and also stop
publishing for an UnknownHostException. By constrast, Micrometer's
PushMeterRegistry treats all exceptions the same, logging a warning
and continuing with subsequent push attempts.
This commit updates the push gateway manager's behaviour to match
PushMeterRegistry. UknownHostExceptions no longer receive special
treatment and push (and delete) failures are now logged as warnings
rather than errors.
Fixes gh-25804
2021-03-31 17:01:08 +01:00
Phillip Webb
8c31d29acf
Merge branch '2.4.x'
2021-03-30 09:29:59 -07:00
Phillip Webb
a28a3ae090
Merge branch '2.3.x' into 2.4.x
2021-03-30 09:25:46 -07:00
Phillip Webb
9c8a97809d
Consistent use of @deprecated since
...
Restore the patch version number for consistency with `@since`
tags.
See gh-25808
2021-03-30 09:20:30 -07:00
Andy Wilkinson
d9ce30b15c
Merge branch '2.3.x' into 2.4.x
...
See gh-25825
2021-03-30 09:23:24 +01:00
Andy Wilkinson
8b6eef6f1d
Consistent use of @deprecated since
...
See gh-25808
2021-03-30 09:22:45 +01:00
Phillip Webb
44b1751bb4
Merge branch '2.4.x'
...
Closes gh-25826
2021-03-29 15:48:20 -07:00
Phillip Webb
363f5829d1
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25825
2021-03-29 15:46:50 -07:00
Phillip Webb
26dd1b9a26
Update deprecations with for removal targets
...
Update all deprecation tags to include a removal target.
Closes gh-25808
2021-03-29 15:44:58 -07:00
Brian Clozel
61573fbf14
Record server metrics for cancelled connections
...
Prior to this commit, the Actuator instrumentation for WebFlux servers
would not record metrics in two cases:
* the client disconnects before the response has been sent
* a server timeout is triggered before the response is sent
This commit improves the existing instrumentation to record metrics in
these cases. Since the causes of timeouts/disconnections can vary a lot,
the chosen "outcome" tag for metrics is "UNKNOWN".
Closes gh-23606
2021-03-29 21:31:18 +02:00
Andy Wilkinson
9cc7f0b54d
Generalize script-based DB initialization and add R2DBC initializer
...
See gh-24741
2021-03-29 11:51:02 +01:00
Phillip Webb
38584f0694
Merge branch '2.4.x'
...
Closes gh-25785
2021-03-24 12:24:14 -07:00
Phillip Webb
5274cf2459
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25784
2021-03-24 12:23:44 -07:00
Phillip Webb
130cc5b036
Chain caught InvalidEndpointRequestExceptions
...
Update `AbstractWebMvcEndpointHandlerMapping` to chain any caught
InvalidEndpointRequestExceptions so that a more complete stacktrace
is available. The exception has also been updated to a
`ResponseStatusException` so that the reason can be propagated.
Fixes gh-25642
2021-03-24 12:22:26 -07:00
Andy Wilkinson
90b4ced7a6
Move DataSource init auto-config out of DataSourceAutoConfiguration
...
Previously, the auto-configuration for DataSource initialization and
the properties used to configure it were part of the general
DataSource auto-configuration and properties.
This commit moves the auto-configuration of DataSource initialization
out into a separate top-level auto-configuration class. Similarly,
the properties for configuring DataSource initialization have been
moved from `spring.datasource.*` into `spring.sql.init.*`.
The old initialization-related `spring.datasource.*` properties have
been deprecated but can still be used. When they are used, they new,
separate initialization auto-configuration will back off. In other
words, the initialization related `spring.datasource.*` properties
and the `spring.sql.init.*` properties cannot be used in combination.
Closes gh-25323
2021-03-24 14:57:29 +00:00
Phillip Webb
11a94ee6f0
Merge branch '2.3.x' into 2.4.x
2021-03-23 12:52:07 -07:00
Phillip Webb
82127fdaa3
Update copyright year of changed files
2021-03-23 12:50:49 -07:00
Andy Wilkinson
ce3dfc5792
Merge branch '2.4.x'
...
Closes gh-25767
2021-03-23 13:42:15 +00:00
Andy Wilkinson
33cf8b3bc4
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25765
2021-03-23 13:06:35 +00:00
Andy Wilkinson
bf6f36a783
Apply any root URI to RestTemplate metric's URI tag
...
Previously, a root URI configured via RestTemplateBuilder's rootUri
method and RootUriTemplateHandler was not taken into account when
generated the URI tag for RestTemplate request metrics.
This commit updates MetricsClientHttpRequestInterceptor to be aware
of RootUriTemplateHandler and capture the URI template once the
root URI has been applied.
Fixes gh-25744
2021-03-23 13:05:54 +00:00
Phillip Webb
26ee346510
Polish 'Support OpenMetrics text format with Prometheus'
...
Closes gh-25564
2021-03-18 20:50:43 -07:00
Andy Wilkinson
11b4a19dee
Support OpenMetrics text format with Prometheus
...
Update `PrometheusScrapeEndpoint` so that it can produce both classic
Prometheus text output as well as Openmetrics output.
See gh-25564
2021-03-18 20:50:40 -07:00
Phillip Webb
c81a0223cc
Refine 'Allow operations to produce different output'
...
Refine the new `Producible` support so that it can also be used with
`@ReadOperation`, `@WriteOperation` and `@DeleteOperation` annotations.
This update allows the same enum to be used both as an argument and as
an indicator of the media-types that an operation may produce.
Closes gh-25738
2021-03-18 20:50:27 -07:00
Andy Wilkinson
1ec49cee8b
Allow operations to produce different output
...
Update the actuator @Enpoint` infrastructure code so that operations
may inject enums that indicate the type of output to produce. A new
`Producible` interface can be implemented by any enum that indicates
the mime-type that an enum value produces.
The new `OperationArgumentResolver` provides a general strategy for
resolving operation arguments with `ProducibleOperationArgumentResolver`
providing support for `Producible` enums. Existing injection support has
been refactored to use the new resolver.
See gh-25738
2021-03-18 20:36:18 -07:00
Phillip Webb
663fd8ce5e
Update copyright year of changed files
2021-03-18 14:49:52 -07:00
Stephane Nicoll
2c8e78b082
Merge branch '2.4.x'
...
Closes gh-25574
2021-03-10 15:15:42 +01:00
Stephane Nicoll
6840440220
Merge branch '2.3.x' into 2.4.x
...
Closes gh-25573
2021-03-10 15:15:21 +01:00
Stephane Nicoll
f38e863fbc
Properly subscribe to CloseableConnectionFactory#close
...
Closes gh-25565
2021-03-10 15:03:27 +01:00
Stephane Nicoll
36f8a7b9a6
Upgrade copyright year of changed files
...
See gh-25451
2021-02-27 11:23:07 +01:00
izeye
c823f44e76
Polish
...
See gh-25451
2021-02-27 11:22:05 +01:00
Andy Wilkinson
f09630f73c
Allow additional keys to be configured for value sanitization
...
Closes gh-25384
2021-02-24 19:28:29 +00:00
Andy Wilkinson
10ef991e1d
Sanitize sensitive portion of the value of url and urls keys
...
Closes gh-25387
2021-02-24 14:42:25 +00:00
izeye
9f0f7d59ef
Fix Javadoc since tag for ConfigurationPropertiesReportEndpointWebExtension
...
See gh-25314
2021-02-16 14:32:47 +01:00
Stephane Nicoll
a16a2de3c3
Merge branch '2.4.x'
...
Closes gh-25296
2021-02-15 10:13:16 +01:00
Stephane Nicoll
0bc03c7141
Associate application classloader to auto-configured Hazelcast instance
...
Closes gh-24836
2021-02-15 10:08:23 +01:00
Stephane Nicoll
b92bb9332b
Polish "Filter properties with a particular prefix"
...
See gh-24718
2021-02-10 17:32:18 +01:00
bono007
ad7c69a9cd
Filter properties with a particular prefix
...
This commit improves the configprops endpoint to allow filtering
properties based on a particular prefix
See gh-24718
2021-02-10 15:30:02 +01:00
Stephane Nicoll
948f61b4ca
Polish contribution
...
See gh-25006
2021-02-09 09:10:56 +01:00
dreis2211
634dd979d1
Migrate from deprecated methods in AbstractWebFluxEndpointHandlerMapping
...
See gh-25006
2021-02-09 09:10:42 +01:00
Andy Wilkinson
db781a0d84
Merge branch '2.4.x'
...
See gh-25077
2021-02-02 15:14:18 +00:00
Andy Wilkinson
788a42d694
Merge branch '2.3.x' into 2.4.x
...
See gh-25076
2021-02-02 15:12:27 +00:00
Andy Wilkinson
67479b6380
Add junit-platform-launcher dependency by convention
...
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb
61502bde9a
Replace deprecated constructor with mutate builder
...
Update `ControllerEndpointHandlerMapping` to use the new `mutate()`
builder rather than deprecated constructors.
Closes gh-24999
2021-01-26 22:42:18 -08:00
Phillip Webb
c9a2c4e326
Merge branch '2.4.x'
2021-01-26 19:06:48 -08:00
Phillip Webb
d06407ec0a
Update copyright year of changed files
2021-01-26 19:06:14 -08:00
Phillip Webb
ab0a628d81
Merge branch '2.4.x'
2021-01-26 17:38:11 -08:00
Phillip Webb
d95d7a0245
Update code for Spring Framework 5.3.4
...
See gh-24998
2021-01-26 17:35:54 -08:00
Andy Wilkinson
d15ec4cdb4
Upgrade to Liquibase 4.2.2
...
Closes gh-24952
2021-01-21 09:47:58 +00:00
Stephane Nicoll
012a199773
Remove Spring Data Solr support
...
In preparation to the upgrade to Spring Data 2021.0, this commit removes
auto-configuration for Spring Data Solr.
Closes gh-24939
2021-01-20 15:03:42 +01:00
Andy Wilkinson
48002e969f
Merge branch '2.4.x'
...
Closes gh-24882
2021-01-19 10:53:41 +00:00
Andy Wilkinson
3ad2832cb2
Fix pattern extraction when MVC is using a PathPatternParser
...
Fixes gh-24874
2021-01-19 10:34:11 +00:00
Stephane Nicoll
0669f5604d
Merge branch '2.4.x'
...
Closes gh-24873
2021-01-18 17:09:01 +01:00
Stephane Nicoll
59b01324ae
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24872
2021-01-18 17:08:36 +01:00
Stephane Nicoll
1ad5a3fe2e
Update copyright of changed file
...
See gh-24753
2021-01-18 17:01:31 +01:00
izeye
ddfa1e632b
Make MetricsClientHttpRequestInterceptor defensive against metrics recoding failures
...
See gh-24753
2021-01-18 17:00:26 +01:00
Stephane Nicoll
2c2c160579
Remove deprecated code
...
See gh-24806
2021-01-15 14:14:33 +01:00
Phillip Webb
304c49d73f
Merge branch '2.4.x'
...
Closes gh-24795
2021-01-12 17:38:27 -08:00
Phillip Webb
26f143b8d3
Support @Name annotation on /actuator/configprops
...
Update `ConfigurationPropertiesReportEndpoint` so that supports
constructor parameters annotated with `@Name`.
Fixes gh-24713
2021-01-12 17:38:17 -08:00
Stephane Nicoll
632c1239e6
Polish "Add support for GET requests for /actuator/startup"
...
See gh-24717
2021-01-11 09:12:53 +01:00
bono007
4b8d6efc12
Add support for GET requests for /actuator/startup
...
See gh-24717
2021-01-11 08:49:06 +01:00
Phillip Webb
45ca4a5a56
Merge branch '2.4.x'
...
Closes gh-24673
2021-01-06 12:34:13 -08:00
Phillip Webb
ac4243d615
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24672
2021-01-06 12:33:53 -08:00
Phillip Webb
52e47c4275
Fix test for JSR-350 @Nonnull
...
Closes gh-24647
2021-01-06 12:33:25 -08:00
Phillip Webb
2dfb9b0911
Merge branch '2.4.x'
...
Closes gh-24671
2021-01-06 12:24:05 -08:00
Phillip Webb
2b497b6aff
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24670
2021-01-06 12:23:45 -08:00
Phillip Webb
848ed65f5b
Add test for JSR-350 @Nonnull
...
Closes gh-24647
2021-01-06 12:04:58 -08:00
Phillip Webb
bd3dd0a526
Merge branch '2.4.x'
...
Closes gh-24655
2021-01-05 14:08:57 -08:00
Phillip Webb
ab8080353e
Merge branch '2.3.x' into 2.4.x
...
Closes gh-24654
2021-01-05 14:08:41 -08:00
Phillip Webb
2ad9a47d08
Support JSR-305 annotations on endpoint methods
...
Update `OperationMethodParameter` to additionally support JSR-305 based
`@Nullable` annotations.
Closes gh-24647
2021-01-05 14:07:22 -08:00
Stephane Nicoll
5da27ea57a
Polish "Reduce the overhead of char[] creation"
...
See gh-24204
2020-12-21 10:24:46 +01:00
Marten Deinum
5121ca5d17
Reduce the overhead of char[] creation
...
See gh-24204
2020-12-21 10:21:49 +01:00
Phillip Webb
72d36e0c07
Update copyright year of changed files
2020-12-10 10:46:04 -08:00
Stephane Nicoll
105cf591bf
Merge branch '2.3.x'
...
See gh-24418
2020-12-10 13:52:49 +01:00
Stephane Nicoll
ab99de4349
Polish
...
See gh-24418
2020-12-10 13:52:11 +01:00
Stephane Nicoll
0d472d6f74
Start building against Spring Data 2020.0.2 snapshots
...
See gh-24284
2020-12-09 14:16:47 +01:00
Phillip Webb
30c27274e2
Merge branch '2.3.x'
...
Closes gh-24339
2020-12-04 18:31:55 -08:00
Phillip Webb
5f351a6983
Merge branch '2.2.x' into 2.3.x
...
Closes gh-24338
2020-12-04 18:21:57 -08:00
Phillip Webb
d8a05090b3
Fix checkstyle BDD Mockito violations
...
See gh-24337
2020-12-04 18:06:54 -08:00