Moritz Halbritter
24e748d5cd
Remove unnecessary entries in additional config metadata
...
Add the 'enabled' fields directly to the classes instead.
Closes gh-30439
2022-03-25 16:22:47 +01: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
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
Scott Frederick
cabfb98a89
Merge branch '2.7.x'
2022-03-18 16:52:47 -05:00
Scott Frederick
a14f3ed200
Use a ConfigurationProperties class for JMX properties
...
Closes gh-30327
2022-03-18 16:32:13 -05:00
Andy Wilkinson
997f7cbfce
Merge branch '2.7.x'
2022-03-08 14:09:59 +00:00
Andy Wilkinson
dfd4097436
Merge branch '2.6.x' into 2.7.x
...
Closes gh-30101
2022-03-08 14:09:47 +00:00
Andy Wilkinson
5b2cc74f71
Merge branch '2.5.x' into 2.6.x
...
Closes gh-30100
2022-03-08 14:09:35 +00:00
Andy Wilkinson
708e57eafb
Register metrics for wrapped R2DBC ConnectionPools
...
Closes gh-30090
2022-03-08 13:55:34 +00: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
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
0072cc807c
Suppress deprecation warnings caused by micrometer backwards compatability
2022-03-01 14:00:27 +01: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
5454e2e26a
Merge branch '2.7.x'
2022-02-23 23:02:59 -08:00
Phillip Webb
9f00c3acf5
Polish
2022-02-23 21:44:43 -08:00
Moritz Halbritter
54f1058d63
Merge branch '2.7.x'
2022-02-23 16:10:49 +01:00
Moritz Halbritter
9149ae50da
Use @AutoConfiguration for relative ordering on auto-configurations
2022-02-23 15:39:46 +01:00
Moritz Halbritter
03e5dcdb3a
Merge branch '2.7.x'
2022-02-21 13:34:11 +01:00
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
2022-02-21 13:16:12 +01:00
Moritz Halbritter
d42f675959
Merge branch '2.7.x'
2022-02-21 10:36:05 +01:00
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
2022-02-21 10:34:38 +01:00
Scott Frederick
cb69d01e04
Merge branch '2.7.x' into main
2022-02-17 19:07:24 -06:00
Scott Frederick
42328771ad
Suppress deprecation warnings for WebSecurityConfigurerAdapter
...
Fixes gh-29897
2022-02-17 19:06:13 -06:00
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
2022-02-17 10:56:23 +01:00
Moritz Halbritter
7c96294641
Move our auto-configurations from spring.factories to new file
...
Closes gh-29873
2022-02-17 10:18:46 +01:00
Moritz Halbritter
303979fb65
Merge branch '2.7.x'
2022-02-17 09:17:35 +01:00
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
2022-02-17 09:17:23 +01:00
Phillip Webb
ff4b92a3ba
Update copyright year of changed files
2022-02-16 20:44:54 -08:00
Moritz Halbritter
fdb1010cbc
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 15:48:27 +01:00
Moritz Halbritter
8e99788fc8
Migrate auto-configurations to @AutoConfiguration
...
Closes gh-29871
2022-02-16 13:55:16 +01: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
Phillip Webb
ce08b519b1
Merge branch '2.6.x' into 2.7.x
2022-02-02 10:37:55 -08:00
Phillip Webb
50e0e28155
Merge branch '2.5.x' into 2.6.x
2022-02-02 10:37:32 -08: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
Stephane Nicoll
68bd6f91cf
Merge branch '2.7.x'
2022-01-29 15:34:16 +01:00
Stephane Nicoll
a94b176c39
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29595
2022-01-29 15:34:08 +01:00
izeye
118eb5f74a
Polish AbstractHealthEndpointAdditionalPathIntegrationTests
...
See gh-29593
2022-01-29 15:33:25 +01:00
Madhura Bhave
8125b46ed5
Merge branch '2.7.x' into main
2022-01-27 12:09:51 -08:00
Madhura Bhave
81bbd295e9
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29584
2022-01-27 12:04:26 -08:00
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
2022-01-27 11:44:54 -08: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
90b8d2190f
Adapt to latest change in Spring Data Elasticsearch
2022-01-12 10:04:44 +01:00
Stephane Nicoll
8ec8268a77
Merge branch '2.7.x'
2022-01-10 12:07:19 +01:00
Stephane Nicoll
c02faea9c9
Allow WebMvcFilter to be overridden by user configuration
...
Closes gh-28428
2022-01-10 12:02:08 +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
Andy Wilkinson
894f83fb13
Upgrade to Artemis 2.20.0 and switch to Jakarta EE 9 JMS API
...
Closes gh-29203
2022-01-07 15:26:39 +00:00
Andy Wilkinson
89e79e826e
Reinstate support for Apache Artemis
...
See gh-29203
2022-01-07 15:26:29 +00:00
Andy Wilkinson
9a05eb63c4
Use built-in basic auth support as it no longer requires JAX-B
...
Closes gh-28829
2022-01-06 18:12:14 +00:00
Stephane Nicoll
025fe4fd43
Merge branch '2.7.x'
2022-01-06 17:50:15 +01:00
Stephane Nicoll
a780e87e9c
Upgrade to Hazelcast 5.0.2
...
See gh-29265
2022-01-06 17:38:06 +01:00
Phillip Webb
760dcffd8b
Merge branch '2.7.x'
2022-01-04 12:22:54 -08:00
Phillip Webb
f09bde2b60
Merge branch '2.6.x' into 2.7.x
2022-01-04 12:20:31 -08:00
Phillip Webb
dc054943bf
Merge branch '2.7.x'
...
Closes gh-29262
2022-01-04 12:14:18 -08:00
Phillip Webb
c839ebbce4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29261
2022-01-04 12:13:55 -08:00
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
Safeer A
efdc19647c
Avoid NPE when routing DataSource has target with null key
...
See gh-27698
2021-08-23 13:40:33 +01: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
Stephane Nicoll
b65cc4d62f
Relocate DiskSpace metrics to SystemMetricsAutoConfiguration
...
Closes gh-27688
2021-08-16 14:54:05 +02:00
Stephane Nicoll
1475309b4d
Polish "Add expiry and bufferLength configuration properties"
...
See gh-27584
2021-08-16 10:05:47 +02:00
Leo Li
888acb94fc
Add expiry and bufferLength configuration properties
...
See gh-27584
2021-08-16 09:32:38 +02:00
Andy Wilkinson
52db64daa4
Merge branch '2.5.x'
...
Closes gh-27637
2021-08-12 12:32:14 +01:00
Andy Wilkinson
341e129a59
Use SingletonSupplier in MetricsRepositoryFactoryCustomizer
...
Closes gh-27634
2021-08-12 11:35:11 +01:00
Andy Wilkinson
fbeb5f19b7
Merge branch '2.5.x'
...
Closes gh-27636
2021-08-12 10:36:18 +01: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
Andy Wilkinson
64c0eceec7
Add support for dumping the heap on OpenJ9
...
Closes gh-26466
2021-07-30 15:35:59 +01:00
Andy Wilkinson
e265825653
Merge branch '2.5.x'
...
Closes gh-27506
2021-07-27 11:03:00 +01:00
Andy Wilkinson
08e26c97aa
Merge branch '2.4.x' into 2.5.x
...
Closes gh-27505
2021-07-27 11:02:20 +01:00
Andy Wilkinson
031a036c9f
Customize security filter registration in separate management context
...
Fixes gh-27372
2021-07-27 10:57:38 +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
izeye
14d8c33125
Polish
...
See gh-27405
2021-07-19 14:45:47 +01:00
Andy Wilkinson
84455f86fd
Polish "Add properties for Dynatrace metrics API v2 ingest with Micrometer"
2021-07-15 13:07:37 +01:00
Georg Pirklbauer
3161164912
Add properties for Dynatrace metrics API v2 ingest with Micrometer
2021-07-15 11:57:58 +01:00
Stephane Nicoll
36beca2c7d
Add ERROR-level metadata for removed properties
...
See gh-27303
2021-07-14 14:58:52 +02:00
Stephane Nicoll
dc5acb0019
Remove deprecated code flagged for removal
...
Closes gh-27303
2021-07-14 11:50:01 +02:00
Andy Wilkinson
75fdd89be4
Polish "Add resource labels to Stackdriver metrics configuration properties"
...
See gh-26961
2021-07-13 15:02:42 +01:00
Mikolaj Stefaniak
4e3958e5aa
Add resource labels to Stackdriver metrics configuration properties
...
Using resource labels is mandatory for most Stackdriver resources other
than 'Global', i.e. k8s_pod. Configuring valid resource type along with
related labels makes it possible to use given metric in a wider set of
GCP solutions, i.e. custom metric based GKE pod horizontal autoscaler.
See gh-26961
2021-07-13 15:02:22 +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
Andy Wilkinson
5c9f2668a5
Merge branch '2.5.x'
...
See gh-27168
2021-07-13 13:13:58 +01:00
Andy Wilkinson
6ed7e692a9
Merge branch '2.4.x' into 2.5.x
...
See gh-27163
2021-07-13 13:13:36 +01:00
Andy Wilkinson
1341ca99db
Align with Framework's deprecation of getLastModified
...
See gh-27160
2021-07-13 13:12:45 +01:00
Stephane Nicoll
5bb6188f6d
Merge branch '2.5.x'
...
Closes gh-27218
2021-07-09 10:44:40 +02:00
Stephane Nicoll
25fe6a107a
Fix visibility of a type exposed as a bean
...
Closes gh-27189
2021-07-09 10:40:00 +02:00
Stephane Nicoll
786d7cdb6e
Merge branch '2.5.x'
...
Closes gh-27118
2021-06-29 09:09:14 +02:00
dreis2211
c852961011
Avoid reflection in tests
...
See gh-27085
2021-06-29 08:25:45 +02:00
Andy Wilkinson
0ec598c99d
Merge branch '2.5.x'
2021-06-14 13:36:37 +01:00
Andy Wilkinson
9e2339b5d0
Merge branch '2.4.x' into 2.5.x
2021-06-14 13:36:29 +01:00
Andy Wilkinson
bc715c64b1
Merge branch '2.5.x'
...
Closes gh-26892
2021-06-14 13:33:19 +01:00
Andy Wilkinson
5f26fd9ccb
Merge branch '2.4.x' into 2.5.x
...
Closes gh-26891
2021-06-14 13:28:54 +01:00
Andy Wilkinson
f6b7730dac
Use Asciidoctor's revision line to provide document's version
...
Using the revision line means that the revision number is automatically
set. The revision number is then included by the HTML and PDF backends
in the standard location. In the HTML backend that's alongside the
list of authors. In the PDF backend that's on the title page.
Closes gh-26851
2021-06-14 13:24:01 +01:00
Stephane Nicoll
f8555b9071
Add metrics for task execution and scheduling
...
Closes gh-23818
2021-06-14 09:07:40 +02:00
Stephane Nicoll
a90c7181b7
Polish "Add auto-configuration for DiskSpaceMetrics"
...
See gh-26001
2021-06-11 17:01:36 +02:00
bono007
e3f03dd50a
Add auto-configuration for DiskSpaceMetrics
...
See gh-26001
2021-06-11 17:01:36 +02:00
Andy Wilkinson
de410b7621
Merge branch '2.4.x'
...
Closes gh-26828
2021-06-09 18:01:32 +01:00
Andy Wilkinson
a1c5fcca58
Move common Asciidoctor configuration into our conventions
...
Closes gh-26620
2021-06-09 18:00:45 +01:00
Phillip Webb
4d62e47c5d
Merge branch '2.3.x' into 2.4.x
2021-06-08 18:05:12 -07:00
Phillip Webb
9e1c78da99
Update copyright year of changed files
2021-06-08 18:03:46 -07:00
Stephane Nicoll
b8b0430139
Merge branch '2.4.x'
...
Closes gh-26697
2021-05-28 13:29:42 +02:00
Stephane Nicoll
7f5adb7e9d
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26696
2021-05-28 13:29:29 +02:00
Stephane Nicoll
67fe60ba8a
Add missing static on JerseyInfrastructureConfiguration
...
Closes gh-26695
2021-05-28 13:26:37 +02:00
Andy Wilkinson
7a7050879c
Avoid eager initialization when configuring Data repository metrics
...
Fixes gh-26630
2021-05-21 13:54:35 +01:00
Phillip Webb
ab958d2394
Include io.spring.asciidoctor.backends group
...
Update `repositories` declaration to include the
'io.spring.asciidoctor.backends' group.
See gh-26293
2021-05-19 22:58:31 -07:00
Phillip Webb
f692b0e937
Rework title anchors for actuator docs
...
Closes gh-26615
2021-05-19 21:19:24 -07:00
Phillip Webb
2dbf39c738
Polish asciidoc formatting
2021-05-19 21:19:24 -07:00
Madhura Bhave
a28072bab4
Merge branch '2.4.x' into main
...
Closes gh-26614
2021-05-19 16:17:34 -07:00
Madhura Bhave
27fee5fa95
Configure filter to process preflight requests for webflux actuator endpoints
...
Fixes gh-24541
2021-05-19 16:16:16 -07:00
Madhura Bhave
99ed291184
Merge branch '2.4.x' into main
2021-05-19 15:27:48 -07:00
Madhura Bhave
29d1e22b91
Fix rawtypes
2021-05-19 15:26:53 -07:00
Madhura Bhave
3ef9b7e634
Merge branch '2.4.x' into main
...
Closes gh-26612
2021-05-19 15:01:45 -07:00
Madhura Bhave
743ac4c394
Merge branch '2.3.x' into 2.4.x
...
Closes gh-26611
2021-05-19 14:55:53 -07:00
Madhura Bhave
b26e842050
Configure CORS in default security configuration for MVC
...
Fixes gh-11987
2021-05-19 14:40:57 -07:00
Phillip Webb
8a3f835ffe
Set Asciidoctor attribute-missing to warn
...
Closes gh-26590
2021-05-19 11:53:46 -07:00
Phillip Webb
0c8d819150
Merge branch '2.4.x'
...
Closes gh-26584
2021-05-17 17:10:10 -07:00
Phillip Webb
0699fdcc8a
Polish 'Allow remote devtools access with Spring Security'
...
See gh-25868
2021-05-17 16:54:27 -07:00
Hatef Palizgar
9b2e13aace
Allow remote devtools access with Spring Security
...
Update `ManagementWebSecurityAutoConfiguration` so that the
`managementSecurityFilterChain` bean has an explicit order.
Prior to this commit, the `managementSecurityFilterChain` would override
the `securityFilterChain` in `RemoteDevtoolsSecurityConfiguration` which
would prevent the remote devtools endpoint from being accessed.
See gh-25868
2021-05-17 16:51:18 -07: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
Phillip Webb
83668f96af
Merge branch '2.4.x'
...
Closes gh-26458
2021-05-13 23:38:41 -07:00
Phillip Webb
73131e99da
Make BufferingApplicationStartup thread safe
...
Update `BufferingApplicationStartup` to use thread safe data structures.
Prior to this commit, it was possible for calls from different threads
(for example due to request scope beans) to cause a
NoSuchElementException to be thrown.
Closes gh-25792
2021-05-13 23:35:36 -07:00
Phillip Webb
87d8aedd3c
Use spring-pdf backend for PDF generation
...
Update `asciidoctorPdf` tasks to use the `spring-pdf` backend so that
chomped elements and @fold:on/@fold:off comments are hidden.
Closes gh-26373
2021-05-10 18:04:05 -07:00
izeye
996472b42d
Polish
...
See gh-26145
2021-04-19 09:34:55 +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
fb5a1270e8
Add RepositoryMetricsAutoConfiguration to spring.factories
...
See gh-26134
2021-04-15 16:27:49 +02:00
Andy Wilkinson
0a8da4fd7d
Polish "Provide health for an AbstractRoutingDataSource's resolved targets"
...
See gh-25708
2021-04-10 11:12:10 +01:00
bono007
13600c3367
Provide health for an AbstractRoutingDataSource's resolved targets
...
See gh-25708
2021-04-10 11:12:01 +01: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
izeye
98b0b6c4c5
Fix MongoMetricsAutoConfigurationTests
...
See gh-25952
2021-04-09 14:20:41 +02:00
Stephane Nicoll
d50e581403
Start building against Micrometer 1.7.0-RC1 snapshots
...
See gh-25934
2021-04-09 13:44:32 +02:00
Brian Clozel
b4d2207902
Merge branch '2.4.x'
...
Closes gh-25936
2021-04-08 17:45:42 +02:00
Brian Clozel
a0ee0601ef
Fix SSL configuration with Reactor Netty
...
Prior to this commit, the SslServerCustomizer would use a Reactor Netty
API that lets users customize the SSL configuration, but later override
some of the choices with defaults.
This commits moves from the new deprecated Reactor Netty API and instead
uses a new variant that builds the defaults and lets developers override
them if they want to.
Fixes gh-25913
2021-04-08 17:09:31 +02:00