Filip Hrisafov
eb3bf40bdb
Bring back Elasticsearch RestClient auto-configuration
...
Prior to this commit, Spring Boot would only auto-configure the
`RestHighLevelClient` and `RestClientBuilder` if the
`RestHighLevelClient` was present. This was done in 1d73d4ed
.
This commit brings back the exposing of the `RestClient` bean in when
exposing the `RestHighLevelClient` or when the `RestHighLevelClient`
is not present. It allows for using the auto-configuration and its
customizers of the `RestClientBuilder` in a similar way as it is done
for the `RestTemplateBuilder` and the `WebClient.Builder`.
The presence of the `elasticsearch-rest-high-level-client` module is
now optional. This opens the door for potentially adding support for
the new Elasticsearch Java Client[1] that is based on the same
`RestClient`.
The health contributor and its configuration has also been updated to
only depend on the low-level RestClient.
See gh-28496
[1] https://github.com/elastic/elasticsearch-java
3 years ago
Andy Wilkinson
6580f6c742
Align with latest changes in Micrometer 1.9 snapshots
...
See gh-30605
3 years ago
Andy Wilkinson
48f8021d88
Migrate @Local*Port annotations to spring-boot-test
...
Closes gh-29589
3 years ago
Andy Wilkinson
b8b903527a
Update tag keys to comply with Micrometer recommendations
...
Closes gh-30536
3 years ago
Andy Wilkinson
f209d77cb2
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30617
3 years ago
Andy Wilkinson
d6731805b6
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30616
3 years ago
Andy Wilkinson
70fa7e5e93
Make properties field final
...
Closes gh-30615
3 years ago
Stephane Nicoll
245e602ae0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30573
3 years ago
luozhenyu
09daad0a16
Add metadata for management.endpoint.health.probes.add-additional-paths
...
See gh-30562
3 years ago
Jonatan Ivanov
d0bc31a5e9
Add support for Prometheus Exemplars
...
See gh-30472
3 years ago
Moritz Halbritter
018281f3d0
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30441
3 years ago
Moritz Halbritter
cee51783fd
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30440
3 years ago
Moritz Halbritter
24e748d5cd
Remove unnecessary entries in additional config metadata
...
Add the 'enabled' fields directly to the classes instead.
Closes gh-30439
3 years ago
Moritz Halbritter
45f393b76b
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30437
3 years ago
Moritz Halbritter
c003d5b533
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30436
3 years ago
Moritz Halbritter
0ff8119a1b
Sort entries in additional-spring-configuration metadata alphabetically
...
Closes gh-30434
3 years ago
Jens Wilke
774f61fcb5
Add support for cache2k in memory caching
...
See gh-28498
3 years ago
Scott Frederick
a14f3ed200
Use a ConfigurationProperties class for JMX properties
...
Closes gh-30327
3 years ago
Andy Wilkinson
dfd4097436
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30101
3 years ago
Andy Wilkinson
5b2cc74f71
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30100
3 years ago
Andy Wilkinson
708e57eafb
Register metrics for wrapped R2DBC ConnectionPools
...
Closes gh-30090
3 years ago
Andy Wilkinson
ff7321cc5a
Polish "Support overriding the default SanitizingFunction"
...
See gh-30006
3 years ago
Guirong Hu
fb9112c891
Support overriding the default SanitizingFunction
...
See gh-30006
3 years ago
Moritz Halbritter
0072cc807c
Suppress deprecation warnings caused by micrometer backwards compatability
3 years ago
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
3 years ago
Phillip Webb
9f00c3acf5
Polish
3 years ago
Moritz Halbritter
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
3 years ago
Moritz Halbritter
1325153ee9
Move ManagementContextConfiguration from spring.factories
...
The import selector will now, in addition to spring.factories, look for
ManagementContextConfiguration classes in a file called
META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports
The existing ManagementContextConfigurations have been moved from
spring.factories to the new file.
Closes gh-29730
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
42328771ad
Suppress deprecation warnings for WebSecurityConfigurerAdapter
...
Fixes gh-29897
3 years ago
Moritz Halbritter
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
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
Moritz Halbritter
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
3 years ago
Henning Poettker
e3d0f1feee
Adjust IDENTITY in DDLs for H2 2.x compatibility
...
See gh-29200
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
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
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
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
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
Stephane Nicoll
a780e87e9c
Upgrade to Hazelcast 5.0.2
...
See gh-29265
3 years ago
Phillip Webb
f09bde2b60
Merge branch '2.6.x' into 2.7.x
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
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
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
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
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
f3bcbca841
Update copyright year of changed files
3 years ago
Stefano Cordio
a5c56043b9
Simplify AssertJ usage
...
See gh-28862
3 years ago
izeye
0364353204
Add public accessor for StackdriverProperties.useSemanticMetricTypes
...
See gh-28944
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
Andy Wilkinson
341e129a59
Use SingletonSupplier in MetricsRepositoryFactoryCustomizer
...
Closes gh-27634
3 years ago
Andy Wilkinson
fbeb5f19b7
Merge branch '2.5.x'
...
Closes gh-27636
3 years ago
Andy Wilkinson
35ea3b234d
Prevent repository metrics from causing a circular reference
...
Fixes gh-27591
3 years ago
Madhura Bhave
49c86e6e1b
Allow health groups to be configured at an additional path
...
Closes gh-25471
Co-authored-by: Phillip Webb <pwebb@vmware.com>
3 years ago
Andy Wilkinson
64c0eceec7
Add support for dumping the heap on OpenJ9
...
Closes gh-26466
3 years ago
Andy Wilkinson
e265825653
Merge branch '2.5.x'
...
Closes gh-27506
3 years ago
Andy Wilkinson
08e26c97aa
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27505
3 years ago
Andy Wilkinson
031a036c9f
Customize security filter registration in separate management context
...
Fixes gh-27372
3 years ago
Andy Wilkinson
355226c21e
Merge branch '2.5.x'
...
Closes gh-27474
3 years ago
Andy Wilkinson
eaca9c7a83
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27473
3 years ago
Andy Wilkinson
ee07d6c3ca
Increase response timeout for server-bound WebTestClients
...
Closes gh-27472
3 years ago
Phillip Webb
7e9ac39f0d
Update copyright year of changed files
3 years ago
Andy Wilkinson
37f690323f
Polish
...
Closes gh-27432
3 years ago
izeye
14d8c33125
Polish
...
See gh-27405
3 years ago