Skip to content

Commit b43827d

Browse files
wilkinsonawilkinsona
committed
Configure ping (formerly application) health indicator by default
This commit renames ApplicationHealthIndicator to PingHealthIndicator and changes the auto-configuration so that it is now always configured by default. Closes gh-17926
1 parent 05e0896 commit b43827d

File tree

51 files changed

+141
-181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+141
-181
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/amqp/RabbitHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222
import org.springframework.boot.actuate.amqp.RabbitHealthIndicator;
2323
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2625
import org.springframework.boot.actuate.health.HealthContributor;
2726
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
28-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2927
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3028
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
3129
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -44,7 +42,6 @@
4442
@ConditionalOnClass(RabbitTemplate.class)
4543
@ConditionalOnBean(RabbitTemplate.class)
4644
@ConditionalOnEnabledHealthIndicator("rabbit")
47-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
4845
@AutoConfigureAfter(RabbitAutoConfiguration.class)
4946
public class RabbitHealthContributorAutoConfiguration
5047
extends CompositeHealthContributorConfiguration<RabbitHealthIndicator, RabbitTemplate> {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222

2323
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2625
import org.springframework.boot.actuate.cassandra.CassandraHealthIndicator;
2726
import org.springframework.boot.actuate.health.HealthContributor;
2827
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3028
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3129
import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
3230
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -49,7 +47,6 @@
4947
@ConditionalOnClass({ Cluster.class, CassandraOperations.class })
5048
@ConditionalOnBean(CassandraOperations.class)
5149
@ConditionalOnEnabledHealthIndicator("cassandra")
52-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5350
@AutoConfigureAfter({ CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class })
5451
public class CassandraHealthContributorAutoConfiguration
5552
extends CompositeHealthContributorConfiguration<CassandraHealthIndicator, CassandraOperations> {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222

2323
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2625
import org.springframework.boot.actuate.cassandra.CassandraReactiveHealthIndicator;
2726
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
2827
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3028
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3129
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3230
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -48,7 +46,6 @@
4846
@ConditionalOnClass({ Cluster.class, ReactiveCassandraOperations.class, Flux.class })
4947
@ConditionalOnBean(ReactiveCassandraOperations.class)
5048
@ConditionalOnEnabledHealthIndicator("cassandra")
51-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5249
@AutoConfigureAfter(CassandraReactiveDataAutoConfiguration.class)
5350
public class CassandraReactiveHealthContributorAutoConfiguration extends
5451
CompositeReactiveHealthContributorConfiguration<CassandraReactiveHealthIndicator, ReactiveCassandraOperations> {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121

2222
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2323
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
24-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2524
import org.springframework.boot.actuate.couchbase.CouchbaseHealthIndicator;
2625
import org.springframework.boot.actuate.health.HealthContributor;
2726
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
28-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
2927
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3028
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3129
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -47,7 +45,6 @@
4745
@ConditionalOnClass(Cluster.class)
4846
@ConditionalOnBean(Cluster.class)
4947
@ConditionalOnEnabledHealthIndicator("couchbase")
50-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5148
@AutoConfigureAfter({ CouchbaseAutoConfiguration.class })
5249
public class CouchbaseHealthContributorAutoConfiguration
5350
extends CompositeHealthContributorConfiguration<CouchbaseHealthIndicator, Cluster> {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseReactiveHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222

2323
import org.springframework.boot.actuate.autoconfigure.health.CompositeReactiveHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2625
import org.springframework.boot.actuate.couchbase.CouchbaseReactiveHealthIndicator;
2726
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
2827
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3028
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3129
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3230
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -47,7 +45,6 @@
4745
@ConditionalOnClass({ Cluster.class, Flux.class })
4846
@ConditionalOnBean(Cluster.class)
4947
@ConditionalOnEnabledHealthIndicator("couchbase")
50-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5148
@AutoConfigureAfter(CouchbaseAutoConfiguration.class)
5249
public class CouchbaseReactiveHealthContributorAutoConfiguration
5350
extends CompositeReactiveHealthContributorConfiguration<CouchbaseReactiveHealthIndicator, Cluster> {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchClientHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323

2424
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2525
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
26-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2726
import org.springframework.boot.actuate.elasticsearch.ElasticsearchHealthIndicator;
2827
import org.springframework.boot.actuate.health.HealthContributor;
2928
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
30-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3129
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3230
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3331
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -50,7 +48,6 @@
5048
@ConditionalOnClass(Client.class)
5149
@ConditionalOnBean(Client.class)
5250
@ConditionalOnEnabledHealthIndicator("elasticsearch")
53-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5451
@AutoConfigureAfter(ElasticsearchAutoConfiguration.class)
5552
@EnableConfigurationProperties(ElasticsearchHealthIndicatorProperties.class)
5653
@Deprecated

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchJestHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@
2222

2323
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2625
import org.springframework.boot.actuate.elasticsearch.ElasticsearchHealthIndicator;
2726
import org.springframework.boot.actuate.elasticsearch.ElasticsearchJestHealthIndicator;
2827
import org.springframework.boot.actuate.health.HealthContributor;
2928
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
30-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3129
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3230
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3331
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -47,7 +45,6 @@
4745
@ConditionalOnClass(JestClient.class)
4846
@ConditionalOnBean(JestClient.class)
4947
@ConditionalOnEnabledHealthIndicator("elasticsearch")
50-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5148
@AutoConfigureAfter({ JestAutoConfiguration.class, ElasticSearchClientHealthContributorAutoConfiguration.class })
5249
@Deprecated
5350
public class ElasticSearchJestHealthContributorAutoConfiguration

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/elasticsearch/ElasticSearchRestHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222

2323
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2625
import org.springframework.boot.actuate.elasticsearch.ElasticsearchRestHealthIndicator;
2726
import org.springframework.boot.actuate.health.HealthContributor;
2827
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3028
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3129
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3230
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -46,7 +44,6 @@
4644
@ConditionalOnClass(RestClient.class)
4745
@ConditionalOnBean(RestClient.class)
4846
@ConditionalOnEnabledHealthIndicator("elasticsearch")
49-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5047
@AutoConfigureAfter({ RestClientAutoConfiguration.class, ElasticSearchClientHealthContributorAutoConfiguration.class })
5148
@SuppressWarnings("deprecation")
5249
public class ElasticSearchRestHealthContributorAutoConfiguration

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/hazelcast/HazelcastHealthContributorAutoConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@
2222

2323
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
25-
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2625
import org.springframework.boot.actuate.hazelcast.HazelcastHealthIndicator;
2726
import org.springframework.boot.actuate.health.HealthContributor;
2827
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
29-
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
3028
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3129
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3230
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -46,7 +44,6 @@
4644
@ConditionalOnClass(HazelcastInstance.class)
4745
@ConditionalOnBean(HazelcastInstance.class)
4846
@ConditionalOnEnabledHealthIndicator("hazelcast")
49-
@AutoConfigureBefore(HealthContributorAutoConfiguration.class)
5047
@AutoConfigureAfter(HazelcastAutoConfiguration.class)
5148
public class HazelcastHealthContributorAutoConfiguration
5249
extends CompositeHealthContributorConfiguration<HazelcastHealthIndicator, HazelcastInstance> {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/health/HealthContributorAutoConfiguration.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,15 @@
1616

1717
package org.springframework.boot.actuate.autoconfigure.health;
1818

19-
import org.springframework.boot.actuate.health.ApplicationHealthIndicator;
2019
import org.springframework.boot.actuate.health.HealthContributor;
21-
import org.springframework.boot.actuate.health.ReactiveHealthContributor;
20+
import org.springframework.boot.actuate.health.PingHealthIndicator;
2221
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
23-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2422
import org.springframework.context.annotation.Bean;
2523
import org.springframework.context.annotation.Configuration;
2624

2725
/**
2826
* {@link EnableAutoConfiguration Auto-configuration} for {@link HealthContributor health
29-
* contributors}. Technology specific auto-configurations should be ordered before this
30-
* auto-configuration.
27+
* contributors}.
3128
*
3229
* @author Phillip Webb
3330
* @since 2.2.0
@@ -36,9 +33,9 @@
3633
public class HealthContributorAutoConfiguration {
3734

3835
@Bean
39-
@ConditionalOnMissingBean({ HealthContributor.class, ReactiveHealthContributor.class })
40-
public ApplicationHealthIndicator applicationHealthContributor() {
41-
return new ApplicationHealthIndicator();
36+
@ConditionalOnEnabledHealthIndicator("ping")
37+
public PingHealthIndicator pingHealthContributor() {
38+
return new PingHealthIndicator();
4239
}
4340

4441
}

0 commit comments

Comments
 (0)