Commit Graph

1689 Commits (2419b14a4567867ff2871de501df38330f31aae0)

Author SHA1 Message Date
Moritz Halbritter d42f675959 Merge branch '2.7.x' 3 years ago
Moritz Halbritter d7b229d3c7 Rename AutoConfigurationLoader to ImportCandidates
Move the class to a more suitable package, and load the files from
META-INF/spring/<fqn>.imports

See gh-29872
3 years ago
Scott Frederick cb69d01e04 Merge branch '2.7.x' into main 3 years ago
Scott Frederick 42328771ad Suppress deprecation warnings for WebSecurityConfigurerAdapter
Fixes gh-29897
3 years ago
Moritz Halbritter 42808ff13c Merge branch '2.7.x'
# Conflicts:
#	spring-boot-project/spring-boot-actuator-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
#	spring-boot-project/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
3 years ago
Moritz Halbritter 7c96294641 Move our auto-configurations from spring.factories to new file
Closes gh-29873
3 years ago
Moritz Halbritter 303979fb65 Merge branch '2.7.x' 3 years ago
Moritz Halbritter 7d68b58c8f Load auto-configurations from META-INF/spring-boot
Implements a new AutoConfigurationLoader, which loads
auto-configurations from a file in META-INF/spring-boot.

Adapts the AutoConfigurationImportSelector to use the new loader.

Adapts the ImportAutoConfigurationImportSelector to use the new loader.

Adapts the metadata plugin in the build to additionally load the
auto-configurations from the new file.

Updates the documentation for auto-configurations and test slices.

Closes gh-29872
3 years ago
Phillip Webb ff4b92a3ba Update copyright year of changed files 3 years ago
Moritz Halbritter fdb1010cbc Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Moritz Halbritter 8e99788fc8 Migrate auto-configurations to @AutoConfiguration
Closes gh-29871
3 years ago
Stephane Nicoll b22e3d51dc Merge branch '2.7.x' 3 years ago
Henning Poettker e3d0f1feee Adjust IDENTITY in DDLs for H2 2.x compatibility
See gh-29200
3 years ago
Phillip Webb a282f912e6 Organize imports
Organize imports according to updated checkstyle rules.
3 years ago
Phillip Webb 501d174db0 Merge branch '2.7.x' 3 years ago
Phillip Webb ce08b519b1 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb 50e0e28155 Merge branch '2.5.x' into 2.6.x 3 years ago
Stephane Nicoll 41fb9cf562 Merge branch '2.7.x' 3 years ago
Stephane Nicoll f812b33cbd Merge branch '2.6.x' into 2.7.x
Closes gh-29613
3 years ago
Stephane Nicoll 136b5959c3 Merge branch '2.5.x' into 2.6.x
Closes gh-29612
3 years ago
Stephane Nicoll 7f17f819a6 Polish "Enforce use of BDDMockito"
See gh-29178
3 years ago
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
3 years ago
Stephane Nicoll 68bd6f91cf Merge branch '2.7.x' 3 years ago
Stephane Nicoll a94b176c39 Merge branch '2.6.x' into 2.7.x
Closes gh-29595
3 years ago
izeye 118eb5f74a Polish AbstractHealthEndpointAdditionalPathIntegrationTests
See gh-29593
3 years ago
Madhura Bhave 8125b46ed5 Merge branch '2.7.x' into main 3 years ago
Madhura Bhave 81bbd295e9 Merge branch '2.6.x' into 2.7.x
Closes gh-29584
3 years ago
Madhura Bhave 0597c6831e Configure health on additional path only when health exposed
Prior to this commit, limiting the exposure to a specific
technology in `ConditionalOnAvailableEndpoint` would not have
any effect because all endpoints would be considered to be available
if the app was running on Cloud Foundry. This caused issues in cases
where beans were meant to be exposed only if the endpoint was actually
exposed.

This commit adds CLOUD_FOUNDRY to the `EndpointExposure`
enum. This allows `ConditionalOnAvailableEndpoint` to limit
by exposure even when the Cloud Foundry platform is active.

Fixes gh-29532
3 years ago
Andy Wilkinson de3b9a4910 Remove code deprecated for removal in 2.x
Closes gh-29482
3 years ago
Stephane Nicoll 4d03f89a55 Harmonize dependency upgrades with Spring Boot 2.7.0-M1
Closes gh-29476
3 years ago
Stephane Nicoll 90b8d2190f Adapt to latest change in Spring Data Elasticsearch 3 years ago
Stephane Nicoll 8ec8268a77 Merge branch '2.7.x' 3 years ago
Stephane Nicoll c02faea9c9 Allow WebMvcFilter to be overridden by user configuration
Closes gh-28428
3 years ago
Stephane Nicoll 5f67546534 Adapt to latest API change in SD Elasticsearch
See gh-29292
3 years ago
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
3 years ago
Andy Wilkinson 894f83fb13 Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API
Closes gh-29203
3 years ago
Andy Wilkinson 89e79e826e Reinstate support for Apache Artemis
See gh-29203
3 years ago
Andy Wilkinson 9a05eb63c4 Use built-in basic auth support as it no longer requires JAX-B
Closes gh-28829
3 years ago
Stephane Nicoll 025fe4fd43 Merge branch '2.7.x' 3 years ago
Stephane Nicoll a780e87e9c Upgrade to Hazelcast 5.0.2
See gh-29265
3 years ago
Phillip Webb 760dcffd8b Merge branch '2.7.x' 3 years ago
Phillip Webb f09bde2b60 Merge branch '2.6.x' into 2.7.x 3 years ago
Phillip Webb dc054943bf Merge branch '2.7.x'
Closes gh-29262
3 years ago
Phillip Webb c839ebbce4 Merge branch '2.6.x' into 2.7.x
Closes gh-29261
3 years ago
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
3 years ago
Andy Wilkinson 1dbfcf8b57 Reinstate support for Spring Data Couchbase
Closes gh-28976
3 years ago
Stephane Nicoll abb622023d Merge branch '2.7.x' 3 years ago
Stephane Nicoll d24720d958 Polish "Expose OS information as an InfoContributor"
See gh-28907
3 years ago
Jonatan Ivanov c700f686c6 Expose OS information as an InfoContributor
See gh-28907
3 years ago
Stephane Nicoll b94fcd1ad7 Merge branch '2.7.x' 3 years ago
Stephane Nicoll de947e0800 Merge branch '2.6.x' into 2.7.x
Closes gh-29190
3 years ago
izeye d234681348 Fix default value for management.info.env.enabled in metadata
See gh-29187
3 years ago
Stephane Nicoll 09486b8fc7 Merge branch '2.7.x' 3 years ago
Stephane Nicoll 2b140950e3 Merge branch '2.6.x' into 2.7.x
Closes gh-29176
3 years ago
izeye 7fbb5749d1 Polish
See gh-29157
3 years ago
Brian Clozel f61c87c3a7 Revert "Merge branch '2.7.x'"
This reverts commit f0677a119c, reversing
changes made to 938d58f32c.
3 years ago
Brian Clozel f0677a119c Merge branch '2.7.x' 3 years ago
Brian Clozel 8e29eac887 Auto-configure GraphQL metrics
This commit auto-configures the metrics infrastructure for Spring
GraphQL.

See gh-29140
3 years ago
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
3 years ago
Phillip Webb 003fb229fd Merge branch '2.7.x' 3 years ago
Phillip Webb f3bcbca841 Update copyright year of changed files 3 years ago
Andy Wilkinson 3c8d4d33e1 Upgrade to Spring Data Elasticsearch 7.16.0
Closes gh-28987
3 years ago
Stephane Nicoll c83ab9bbc5 Merge branch '2.7.x' 3 years ago
Stefano Cordio a5c56043b9 Simplify AssertJ usage
See gh-28862
3 years ago
Stephane Nicoll fcea05a4b8 Merge branch '2.7.x' 3 years ago
izeye 0364353204 Add public accessor for StackdriverProperties.useSemanticMetricTypes
See gh-28944
3 years ago
Scott Frederick 33953823fc Replace usage of deprecated Spring Framework methods
See gh-28642
3 years ago
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
3 years ago
Andy Wilkinson 85f9949513 Remove support for Jolokia
Closes gh-28704
3 years ago
Andy Wilkinson 79b53e3562 Drop support for auto-configuring Hibernate metrics
Closes gh-28703
3 years ago
Madhura Bhave c8fd5f0080 Remove support for Artemis
Closes gh-28593
3 years ago
Andy Wilkinson 8bf2ffd93c Drop support for Jersey until jersey-spring6 is available
Closes gh-28808
3 years ago
Scott Frederick 29a21d4621 Remove support for Spring Data Couchbase and Couchbase caching
Fixes gh-28613
3 years ago
Andy Wilkinson 63492507b4 Remove support for Apache ActiveMQ
Closes gh-28591
3 years ago
Andy Wilkinson 64bf33038d Remove support for EhCache 2
Closes gh-28588
3 years ago
Andy Wilkinson 814c86c5e8 Raise the minimum supported version of Gradle to 7.3
Closes gh-28100
3 years ago
izeye c7921468fc Polish
See gh-28836
3 years ago
Phillip Webb beb68671bb Update copyright year of changed files 3 years ago
Yanming Zhou da2dfbe0aa LettuceMetricsAutoConfiguration should not build ClientResources
See gh-28767
3 years ago
Andy Wilkinson 0074d621d0 Merge branch '2.5.x'
Closes gh-28754
3 years ago
Andy Wilkinson 015cf920da Name custom task inputs
Closes gh-28753
3 years ago
Andy Wilkinson 258222781a Merge branch '2.5.x'
Closes gh-28752
3 years ago
Andy Wilkinson 96d98a0f6f Declare dir task inputs with relative path sensitivity
Closes gh-28751
3 years ago
Stephane Nicoll d88658d47a Remove dependencies on micrometer-jersey2
Closes gh-28706
3 years ago
Stephane Nicoll 52ecc1e0dd Polish "Create EndpointWebExtension only if necessary"
See gh-28475
3 years ago
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
3 years ago
Scott Frederick 8903c69b19 Avoid exposing time-related task metrics
Fixes gh-28535
3 years ago
Scott Frederick d7f8931dd4 Make TaskExecution and TaskScheduling metrics unique
Fixes gh-28536
3 years ago
Andy Wilkinson 2a342ef416 Merge branch '2.5.x'
Closes gh-28662
3 years ago
Andy Wilkinson 5e4a502b2d Merge branch '2.4.x' into 2.5.x
Closes gh-28661
3 years ago
Andy Wilkinson 2cec3971d7 Prohibit unwanted dependencies in all modules not just starters
Closes gh-28658
3 years ago
Andy Wilkinson 5f1103f381 Add missing @Deprecated annotation
Closes gh-28602
3 years ago
Phillip Webb c7e61e448e Polish "Remove 'etc' in reference documentation"
See gh-28497
3 years ago
izeye 3e1bc01839 Fix whenThereIsNoMeterRegistryThenClientResourcesCustomizationBacksOff()
See gh-28492
3 years ago
Andy Wilkinson 875479abeb Merge branch '2.5.x'
Closes gh-28490
3 years ago
Andy Wilkinson 33249e9414 Merge branch '2.4.x' into 2.5.x
Closes gh-28489
3 years ago
Andy Wilkinson 12d8f942be Stop logging to the file used in the generated documentation
Closes gh-28488
3 years ago
Stephane Nicoll 837e2ac277 Fix bean type visibility
Closes gh-28437
3 years ago
Stephane Nicoll 475e9c9969 Polish "Fix classpath condition for Lettuce metrics auto-configuration"
See gh-28436
3 years ago
sokomishalov 1f86fe3d48 Fix classpath condition for Lettuce metrics auto-configuration
See gh-28436
3 years ago
Andy Wilkinson 47da70632f Merge branch '2.5.x'
Closes gh-28430
Closes gh-28431
3 years ago
Andy Wilkinson 585b8880c7 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
3 years ago
Andy Wilkinson 7f976dab9e Polish "Don't use markdown syntax in javadoc or error messages"
See 2f6651c3cb.

Closes gh-28408
3 years ago
Phillip Webb e25f216eab Merge branch '2.5.x'
Closes gh-28425
3 years ago
Phillip Webb daf36dff55 Merge branch '2.4.x' into 2.5.x
Closes gh-28424
3 years ago
Phillip Webb 2f6651c3cb Don't use markdown syntax in javadoc or error messages
Closes gh-28408
3 years ago
Andy Wilkinson 284725f5be Polish "Expose Stackdriver's useSemanticMetricTypes property"
See gh-28403
3 years ago
Jonatan Ivanov 9397121a98 Expose Stackdriver's useSemanticMetricTypes property
See gh-28403
3 years ago
Andy Wilkinson 8bf3780c15 Polish "Expose Elastic's apiKeyCredentials property"
See gh-28400
3 years ago
Jonatan Ivanov dd475a2445 Expose Elastic's apiKeyCredentials property
See gh-28400
3 years ago
Andy Wilkinson 56b8494f15 Disable the env info contributor by default
Closes gh-28311
3 years ago
Andy Wilkinson f98c1e7231 Disable the java info contributor by default
Closes gh-28310

Co-authored-by Phillip Webb <pwebb@vmware.com>
3 years ago
Madhura Bhave 40a3824279 Reinstate ConditionalOnBean
See gh-28131
3 years ago
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>
3 years ago
Andy Wilkinson 42ef97b9ec Merge branch '2.5.x'
Closes gh-28372
3 years ago
Andy Wilkinson 5f4c001316 Merge branch '2.4.x' into 2.5.x
Closes gh-28371
3 years ago
Andy Wilkinson a93cf64834 Make JMX endpoints available when lazy init is enabled
Closes gh-28335
3 years ago
Phillip Webb 8c748cd01f Merge branch '2.5.x'
Closes gh-28352
3 years ago
Phillip Webb aeadb0ceb6 Merge branch '2.4.x' into 2.5.x
Closes gh-28351
3 years ago
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
3 years ago
Andy Wilkinson 1a505964ee Merge branch '2.5.x'
Closes gh-28207
3 years ago
Andy Wilkinson 1931104d13 Merge branch '2.4.x' into 2.5.x
Closes gh-28206
3 years ago
Andy Wilkinson 9c9fbf400e Upgrade to Spring Java Format 0.0.29
Closes gh-28205
3 years ago
Stephane Nicoll 5d17257a52 Polish "Add Java InfoContributor"
See gh-28136
3 years ago
Jonatan Ivanov fc87da7ef3 Add Java InfoContributor
See gh-28136
3 years ago
Phillip Webb 98a0e07dd5 Polish "Add startup time metrics"
See gh-27878
3 years ago
Phillip Webb 55a1ec72cc Update copyright year of changed files 3 years ago
Phillip Webb 5ba69634c9 Merge branch '2.4.x' into 2.5.x 3 years ago
Phillip Webb dfd36673f7 Update copyright year of changed files 3 years ago
Stephane Nicoll c62a6819fe Polish "Add startup time metrics"
See gh-27878
3 years ago
bono007 2e67963bfe Add startup time metrics
See gh-27878
3 years ago
Stephane Nicoll b626adf1ee Polish "Add support for configuring the path of disk space metrics"
See gh-27660
3 years ago
bono007 08251b26d0 Add support for configuring the path of disk space metrics
See gh-27660
3 years ago
Stephane Nicoll 225599a52b Adapt to changes in Micrometer milestone 3 years ago
Stephane Nicoll e1b1a25021 Polish "Auto-configure Micrometer's Lettuce latency metrics"
See gh-27865
3 years ago
Antonin ARQUEY 190fea6faa Auto-configure Micrometer's Lettuce latency metrics
Add auto-configuration support to export Lettuce latency metrics.

See gh-27865
3 years ago
Stephane Nicoll 726a2591fb Start building against Micrometer 1.8.0-M3 snapshots
See gh-27931
3 years ago
Madhura Bhave 393081f2e6 Enable PathPattern based matching for MVC actuators
Closes gh-24645
3 years ago
Stephane Nicoll 39a1c854d8 Polish "Auto-configure JVM heap pressure metrics"
See gh-27868
3 years ago
Vladimir Konkov ba21c90355 Auto-configure JVM heap pressure metrics
See gh-27868
3 years ago
izeye 6e3874d48e Polish test method names in PropertiesMeterFilterTests
See gh-27832
3 years ago
Madhura Bhave 253f98c3e7 Add pluggable abstraction for applying custom sanitization rules
Closes gh-27840
3 years ago
Andy Wilkinson c5272a4122 Merge branch '2.5.x'
Closes gh-27800
3 years ago
Andy Wilkinson 24c88ab80b Polish "Avoid NPE when routing DataSource has target with null key"
See gh-27698
3 years ago
Safeer A efdc19647c Avoid NPE when routing DataSource has target with null key
See gh-27698
3 years ago
Madhura Bhave 8fd9eb72d4 Allow part of a composite contributor in a health group
Closes gh-23027

Co-authored-by: Phillip Webb <pwebb@vmware.com>
3 years ago
Stephane Nicoll b65cc4d62f Relocate DiskSpace metrics to SystemMetricsAutoConfiguration
Closes gh-27688
3 years ago
Stephane Nicoll 1475309b4d Polish "Add expiry and bufferLength configuration properties"
See gh-27584
3 years ago
Leo Li 888acb94fc Add expiry and bufferLength configuration properties
See gh-27584
3 years ago
Andy Wilkinson 52db64daa4 Merge branch '2.5.x'
Closes gh-27637
3 years ago