Commit Graph

1595 Commits

Author SHA1 Message Date
Phillip Webb 8e583f6f73 Apply exclusion rules to child contributors
Update `IncludeExcludeGroupMemberPredicate` so that exclusion rules are
also applied to child contributors. The restores the behavior of Spring
Boot 2.5.x where `management.endpoint.health.group.mygroup.exclude=db`
would exclude 'db/one', 'db/two' etc.

Fixes gh-29251
2022-01-04 12:12:03 -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
Stephane Nicoll b94fcd1ad7 Merge branch '2.7.x' 2021-12-30 07:33:36 +01:00
Stephane Nicoll de947e0800 Merge branch '2.6.x' into 2.7.x
Closes gh-29190
2021-12-30 07:33:26 +01:00
izeye d234681348 Fix default value for management.info.env.enabled in metadata
See gh-29187
2021-12-30 07:32:58 +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 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 8e29eac887 Auto-configure GraphQL metrics
This commit auto-configures the metrics infrastructure for Spring
GraphQL.

See gh-29140
2021-12-21 08:34:32 +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
Phillip Webb 003fb229fd Merge branch '2.7.x' 2021-12-16 13:07:22 -08:00
Phillip Webb f3bcbca841 Update copyright year of changed files 2021-12-16 13:05:17 -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
Stefano Cordio a5c56043b9 Simplify AssertJ usage
See gh-28862
2021-12-09 15:39:02 +01:00
Stephane Nicoll fcea05a4b8 Merge branch '2.7.x' 2021-12-09 15:09:53 +01:00
izeye 0364353204 Add public accessor for StackdriverProperties.useSemanticMetricTypes
See gh-28944
2021-12-09 15:09:13 +01:00
Scott Frederick 33953823fc Replace usage of deprecated Spring Framework methods
See gh-28642
2021-12-06 16:12:34 -06: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 85f9949513 Remove support for Jolokia
Closes gh-28704
2021-11-30 15:55:47 +00:00
Andy Wilkinson 79b53e3562 Drop support for auto-configuring Hibernate metrics
Closes gh-28703
2021-11-30 15:55:20 +00:00
Madhura Bhave c8fd5f0080 Remove support for Artemis
Closes gh-28593
2021-11-30 15:39:56 +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 63492507b4 Remove support for Apache ActiveMQ
Closes gh-28591
2021-11-30 15:38:46 +00:00
Andy Wilkinson 64bf33038d Remove support for EhCache 2
Closes gh-28588
2021-11-30 15:38:23 +00:00
Andy Wilkinson 814c86c5e8 Raise the minimum supported version of Gradle to 7.3
Closes gh-28100
2021-11-30 15:36:54 +00:00
izeye c7921468fc Polish
See gh-28836
2021-11-29 09:38:07 +01:00
Phillip Webb beb68671bb Update copyright year of changed files 2021-11-24 10:23:32 -08:00
Yanming Zhou da2dfbe0aa LettuceMetricsAutoConfiguration should not build ClientResources
See gh-28767
2021-11-22 09:49:07 +01:00
Andy Wilkinson 0074d621d0 Merge branch '2.5.x'
Closes gh-28754
2021-11-19 15:37:32 +00:00
Andy Wilkinson 015cf920da Name custom task inputs
Closes gh-28753
2021-11-19 15:35:39 +00:00
Andy Wilkinson 258222781a Merge branch '2.5.x'
Closes gh-28752
2021-11-19 14:52:03 +00:00
Andy Wilkinson 96d98a0f6f Declare dir task inputs with relative path sensitivity
Closes gh-28751
2021-11-19 14:29:29 +00:00
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
2021-11-17 08:56:08 +01:00
Stephane Nicoll 52ecc1e0dd Polish "Create EndpointWebExtension only if necessary"
See gh-28475
2021-11-16 08:22:35 +01:00
davidh44 b658013a97 Create EndpointWebExtension only if necessary
This commit updates Actuator's EndpointWebExtensions to be created only
if the related endpoint is exposed over HTTP.

See gh-28475
2021-11-16 08:15:19 +01:00
Scott Frederick 8903c69b19 Avoid exposing time-related task metrics
Fixes gh-28535
2021-11-15 12:24:50 -06:00
Scott Frederick d7f8931dd4 Make TaskExecution and TaskScheduling metrics unique
Fixes gh-28536
2021-11-15 12:23:25 -06: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 5f1103f381 Add missing @Deprecated annotation
Closes gh-28602
2021-11-11 12:03:33 +00:00
Phillip Webb c7e61e448e Polish "Remove 'etc' in reference documentation"
See gh-28497
2021-11-08 13:27:24 -08:00
izeye 3e1bc01839 Fix whenThereIsNoMeterRegistryThenClientResourcesCustomizationBacksOff()
See gh-28492
2021-11-01 09:00:19 +01:00
Andy Wilkinson 875479abeb Merge branch '2.5.x'
Closes gh-28490
2021-10-29 15:52:18 +01:00
Andy Wilkinson 33249e9414 Merge branch '2.4.x' into 2.5.x
Closes gh-28489
2021-10-29 15:52:08 +01:00
Andy Wilkinson 12d8f942be Stop logging to the file used in the generated documentation
Closes gh-28488
2021-10-29 15:51:32 +01:00
Stephane Nicoll 837e2ac277 Fix bean type visibility
Closes gh-28437
2021-10-23 07:31:27 +02:00
Stephane Nicoll 475e9c9969 Polish "Fix classpath condition for Lettuce metrics auto-configuration"
See gh-28436
2021-10-22 14:49:33 +02:00
sokomishalov 1f86fe3d48 Fix classpath condition for Lettuce metrics auto-configuration
See gh-28436
2021-10-22 14:47:56 +02:00
Andy Wilkinson 47da70632f Merge branch '2.5.x'
Closes gh-28430
Closes gh-28431
2021-10-22 10:12:53 +01:00
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
2021-10-22 10:10:50 +01:00
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages"
See 2f6651c3cb.

Closes gh-28408
2021-10-22 10:08:27 +01:00
Phillip Webb e25f216eab Merge branch '2.5.x'
Closes gh-28425
2021-10-21 11:28:33 -07:00
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
2021-10-21 11:27:29 -07:00
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages
Closes gh-28408
2021-10-21 11:24:54 -07:00
Andy Wilkinson 284725f5be Polish "Expose Stackdriver's useSemanticMetricTypes property"
See gh-28403
2021-10-21 17:57:23 +01:00
Jonatan Ivanov 9397121a98 Expose Stackdriver's useSemanticMetricTypes property
See gh-28403
2021-10-21 17:57:07 +01:00
Andy Wilkinson 8bf3780c15 Polish "Expose Elastic's apiKeyCredentials property"
See gh-28400
2021-10-21 17:35:32 +01:00
Jonatan Ivanov dd475a2445 Expose Elastic's apiKeyCredentials property
See gh-28400
2021-10-21 17:17:01 +01:00
Andy Wilkinson 56b8494f15 Disable the env info contributor by default
Closes gh-28311
2021-10-20 12:42:17 +01:00
Andy Wilkinson f98c1e7231 Disable the java info contributor by default
Closes gh-28310

Co-authored-by Phillip Webb <pwebb@vmware.com>
2021-10-20 12:18:54 +01:00
Madhura Bhave 40a3824279 Reinstate ConditionalOnBean
See gh-28131
2021-10-19 21:23:48 -07:00
Madhura Bhave b7521e2fda Auto-configure health web components only if endpoint is exposed over HTTP
Fixes gh-28131

Co-authored-by: Phillip Webb <pwebb@vmware.com>
2021-10-19 20:26:44 -07:00
Andy Wilkinson 42ef97b9ec Merge branch '2.5.x'
Closes gh-28372
2021-10-18 15:07:16 +01:00
Andy Wilkinson 5f4c001316 Merge branch '2.4.x' into 2.5.x
Closes gh-28371
2021-10-18 15:06:58 +01:00
Andy Wilkinson a93cf64834 Make JMX endpoints available when lazy init is enabled
Closes gh-28335
2021-10-18 13:37:45 +01:00
Phillip Webb 8c748cd01f Merge branch '2.5.x'
Closes gh-28352
2021-10-14 12:16:48 -07:00
Phillip Webb aeadb0ceb6 Merge branch '2.4.x' into 2.5.x
Closes gh-28351
2021-10-14 12:16:38 -07:00
Andy Wilkinson 540468b2f0 Fix parsing of day duration meter values
Switch `MeterValue` parsing logic so that we try `Duration` before
`double`. Prior to this commit, the value `1d` would result in `1.0`
rather than "1 day".

Fixes gh-28302
2021-10-14 12:13:39 -07: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
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
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 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
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 225599a52b Adapt to changes in Micrometer milestone 2021-09-16 06:54:36 +02:00
Stephane Nicoll e1b1a25021 Polish "Auto-configure Micrometer's Lettuce latency metrics"
See gh-27865
2021-09-14 09:33:48 +02:00
Antonin ARQUEY 190fea6faa Auto-configure Micrometer's Lettuce latency metrics
Add auto-configuration support to export Lettuce latency metrics.

See gh-27865
2021-09-14 09:19:42 +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
Stephane Nicoll 39a1c854d8 Polish "Auto-configure JVM heap pressure metrics"
See gh-27868
2021-09-05 17:36:27 +02:00
Vladimir Konkov ba21c90355 Auto-configure JVM heap pressure metrics
See gh-27868
2021-09-05 17:31:15 +02:00
izeye 6e3874d48e Polish test method names in PropertiesMeterFilterTests
See gh-27832
2021-09-05 17:13:46 +02:00
Madhura Bhave 253f98c3e7 Add pluggable abstraction for applying custom sanitization rules
Closes gh-27840
2021-08-30 21:31:15 -07:00
Andy Wilkinson c5272a4122 Merge branch '2.5.x'
Closes gh-27800
2021-08-23 14:28:53 +01:00
Andy Wilkinson 24c88ab80b Polish "Avoid NPE when routing DataSource has target with null key"
See gh-27698
2021-08-23 13:53:34 +01:00