root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Ensure the default MetricWriter in Java 7 is not used in exporter

This commit is contained in:
Dave Syer 2015-04-27 09:33:04 +01:00 committed by Andy Wilkinson
parent 0bd845d183
commit 2aaf556a1c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java
View File

@ -16,9 +16,11 @@
package org.springframework.boot.actuate.autoconfigure; package org.springframework.boot.actuate.autoconfigure;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.actuate.metrics.CounterService; import org.springframework.boot.actuate.metrics.CounterService;
import org.springframework.boot.actuate.metrics.GaugeService; import org.springframework.boot.actuate.metrics.GaugeService;
import org.springframework.boot.actuate.metrics.buffer.BufferCounterService; import org.springframework.boot.actuate.metrics.buffer.BufferCounterService;
@ -170,11 +172,20 @@ public class MetricRepositoryAutoConfiguration {
@Autowired(required = false) @Autowired(required = false)
private List<MetricWriter> writers; private List<MetricWriter> writers;
@Autowired(required = false)
@Qualifier("actuatorMetricRepository")
private MetricWriter actuatorMetricRepository;
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnBean(MetricWriter.class) @ConditionalOnBean(MetricWriter.class)
public MetricCopyExporter messageChannelMetricExporter(MetricReader reader) { public MetricCopyExporter messageChannelMetricExporter(MetricReader reader) {
return new MetricCopyExporter(reader, new CompositeMetricWriter(this.writers)) { List<MetricWriter> writers = new ArrayList<MetricWriter>(this.writers);
if (this.actuatorMetricRepository != null
&& writers.contains(this.actuatorMetricRepository)) {
writers.remove(this.actuatorMetricRepository);
}
return new MetricCopyExporter(reader, new CompositeMetricWriter(writers)) {
@Scheduled(fixedDelayString = "${spring.metrics.export.delayMillis:5000}") @Scheduled(fixedDelayString = "${spring.metrics.export.delayMillis:5000}")
@Override @Override
public void export() { public void export() {