Browse Source

Tweak conditions on metric export to make it easier to override

pull/3068/head
Dave Syer 11 years ago
parent
commit
a49901f0dc
  1. 2
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java
  2. 5
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java

@ -64,7 +64,7 @@ public class MetricExportAutoConfiguration { @@ -64,7 +64,7 @@ public class MetricExportAutoConfiguration {
private MetricsEndpointMetricReader endpointReader;
@Bean
@ConditionalOnMissingBean
@ConditionalOnMissingBean(name = "metricWritersMetricExporter")
public SchedulingConfigurer metricWritersMetricExporter() {
Map<String, MetricWriter> writers = new HashMap<String, MetricWriter>();

5
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java

@ -90,7 +90,7 @@ public class MetricRepositoryAutoConfiguration { @@ -90,7 +90,7 @@ public class MetricRepositoryAutoConfiguration {
static class LegacyMetricServicesConfiguration {
@Autowired
@ActuatorMetricReader
@ActuatorMetricWriter
private MetricWriter writer;
@Bean
@ -147,11 +147,12 @@ public class MetricRepositoryAutoConfiguration { @@ -147,11 +147,12 @@ public class MetricRepositoryAutoConfiguration {
@Configuration
@ConditionalOnJava(value = JavaVersion.EIGHT, range = Range.OLDER_THAN)
@ConditionalOnMissingBean(MetricRepository.class)
@ConditionalOnMissingBean(name = "actuatorMetricRepository")
static class LegacyMetricRepositoryConfiguration {
@Bean
@ActuatorMetricReader
@ActuatorMetricWriter
public InMemoryMetricRepository actuatorMetricRepository() {
return new InMemoryMetricRepository();
}

Loading…
Cancel
Save