Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tweak conditions on metric export to make it easier to override

Browse Source
This commit is contained in:
Dave Syer
2015-05-29 14:25:12 +01:00
parent 88c640ee3c
commit a49901f0dc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
View File

@@ -90,7 +90,7 @@ public class MetricRepositoryAutoConfiguration {
static class LegacyMetricServicesConfiguration {
@Autowired
@ActuatorMetricReader
@ActuatorMetricWriter
private MetricWriter writer;
@Bean
@@ -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();
}