Skip to content

Commit 69a02ef

Browse files
committed
fix: align actuator config @ConditionalOnProperty prefixes with firefly.actuator namespace
1 parent 34f6309 commit 69a02ef

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/main/java/org/fireflyframework/core/actuator/config/ApplicationMetricsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
*/
5555
@Configuration
5656
@ConditionalOnClass(MeterRegistry.class)
57-
@ConditionalOnProperty(prefix = "management.metrics.application", name = "enabled", havingValue = "true", matchIfMissing = true)
57+
@ConditionalOnProperty(prefix = "firefly.actuator.metrics.application", name = "enabled", havingValue = "true", matchIfMissing = true)
5858
@AutoConfigureAfter(MetricsAutoConfiguration.class)
5959
public class ApplicationMetricsConfig {
6060

src/main/java/org/fireflyframework/core/actuator/config/CacheHealthConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
*/
4747
@Configuration
4848
@ConditionalOnClass(CacheManager.class)
49-
@ConditionalOnProperty(prefix = "management.health.cache", name = "enabled", havingValue = "true", matchIfMissing = true)
49+
@ConditionalOnProperty(prefix = "firefly.actuator.health.cache", name = "enabled", havingValue = "true", matchIfMissing = true)
5050
@AutoConfigureAfter(HealthContributorAutoConfiguration.class)
5151
public class CacheHealthConfig {
5252

src/main/java/org/fireflyframework/core/actuator/config/DatabaseHealthConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
@Configuration
4343
@ConditionalOnClass(DataSource.class)
44-
@ConditionalOnProperty(prefix = "management.health.database", name = "enabled", havingValue = "true", matchIfMissing = true)
44+
@ConditionalOnProperty(prefix = "firefly.actuator.health.database", name = "enabled", havingValue = "true", matchIfMissing = true)
4545
@AutoConfigureAfter({DataSourceAutoConfiguration.class, HealthContributorAutoConfiguration.class})
4646
public class DatabaseHealthConfig {
4747

src/main/java/org/fireflyframework/core/actuator/config/HttpClientMetricsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
*/
5151
@Configuration
5252
@ConditionalOnClass(RestTemplate.class)
53-
@ConditionalOnProperty(prefix = "management.metrics.http.client", name = "enabled", havingValue = "true", matchIfMissing = true)
53+
@ConditionalOnProperty(prefix = "firefly.actuator.metrics.http.client", name = "enabled", havingValue = "true", matchIfMissing = true)
5454
@AutoConfigureAfter(MetricsAutoConfiguration.class)
5555
public class HttpClientMetricsConfig {
5656

src/main/java/org/fireflyframework/core/actuator/config/JvmMetricsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
@Configuration
4848
@ConditionalOnClass(MeterRegistry.class)
4949
@ConditionalOnBean(MeterRegistry.class)
50-
@ConditionalOnProperty(prefix = "management.metrics.jvm", name = "enabled", havingValue = "true", matchIfMissing = true)
50+
@ConditionalOnProperty(prefix = "firefly.actuator.metrics.jvm", name = "enabled", havingValue = "true", matchIfMissing = true)
5151
@AutoConfigureAfter(MetricsAutoConfiguration.class)
5252
public class JvmMetricsConfig {
5353

src/main/java/org/fireflyframework/core/actuator/config/ThreadPoolMetricsConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
*/
5151
@Configuration
5252
@ConditionalOnClass(MeterRegistry.class)
53-
@ConditionalOnProperty(prefix = "management.metrics.threadpool", name = "enabled", havingValue = "true", matchIfMissing = true)
53+
@ConditionalOnProperty(prefix = "firefly.actuator.metrics.threadpool", name = "enabled", havingValue = "true", matchIfMissing = true)
5454
@AutoConfigureAfter(MetricsAutoConfiguration.class)
5555
public class ThreadPoolMetricsConfig {
5656

0 commit comments

Comments
 (0)