From 96fcd49e2efcfabe9f74d5235225da2182286938 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 31 Oct 2015 16:10:49 +0000 Subject: [PATCH] OpenTsdbMetricWriter -> OpenTsdbGaugeWriter --- ...OpenTsdbMetricWriter.java => OpenTsdbGaugeWriter.java} | 7 +++---- ...tricWriterTests.java => OpenTsdbGaugeWriterTests.java} | 8 ++++---- .../metrics/opentsdb/SampleOpenTsdbExportApplication.java | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) rename spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/{OpenTsdbMetricWriter.java => OpenTsdbGaugeWriter.java} (93%) rename spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/{OpenTsdbMetricWriterTests.java => OpenTsdbGaugeWriterTests.java} (93%) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java similarity index 93% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java rename to spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java index 212129ffe0d..ba3453f806e 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java @@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.boot.actuate.metrics.Metric; import org.springframework.boot.actuate.metrics.writer.GaugeWriter; -import org.springframework.boot.actuate.metrics.writer.MetricWriter; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -37,7 +36,7 @@ import org.springframework.web.client.RestOperations; import org.springframework.web.client.RestTemplate; /** - * A {@link MetricWriter} for the Open TSDB database (version 2.0), writing metrics to the + * A {@link GaugeWriter} for the Open TSDB database (version 2.0), writing metrics to the * HTTP endpoint provided by the server. Data are buffered according to the * {@link #setBufferSize(int) bufferSize} property, and only flushed automatically when * the buffer size is reached. Users should either manually {@link #flush()} after writing @@ -48,9 +47,9 @@ import org.springframework.web.client.RestTemplate; * @author Thomas Badie * @since 1.3.0 */ -public class OpenTsdbMetricWriter implements GaugeWriter { +public class OpenTsdbGaugeWriter implements GaugeWriter { - private static final Log logger = LogFactory.getLog(OpenTsdbMetricWriter.class); + private static final Log logger = LogFactory.getLog(OpenTsdbGaugeWriter.class); private RestOperations restTemplate = new RestTemplate(); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java similarity index 93% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriterTests.java rename to spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java index 77c1204e7df..4e0bbcfa339 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbMetricWriterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java @@ -34,19 +34,19 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; /** - * Tests for {@link OpenTsdbMetricWriter}. + * Tests for {@link OpenTsdbGaugeWriter}. * * @author Dave Syer */ -public class OpenTsdbMetricWriterTests { +public class OpenTsdbGaugeWriterTests { - private OpenTsdbMetricWriter writer; + private OpenTsdbGaugeWriter writer; private RestOperations restTemplate = Mockito.mock(RestOperations.class); @Before public void init() { - this.writer = new OpenTsdbMetricWriter(); + this.writer = new OpenTsdbGaugeWriter(); this.writer.setRestTemplate(this.restTemplate); } diff --git a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplication.java b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplication.java index 2f3d2eeb122..a985bf65598 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplication.java +++ b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplication.java @@ -19,7 +19,7 @@ package sample.metrics.opentsdb; import org.springframework.boot.SpringApplication; import org.springframework.boot.actuate.autoconfigure.ExportMetricWriter; import org.springframework.boot.actuate.metrics.opentsdb.DefaultOpenTsdbNamingStrategy; -import org.springframework.boot.actuate.metrics.opentsdb.OpenTsdbMetricWriter; +import org.springframework.boot.actuate.metrics.opentsdb.OpenTsdbGaugeWriter; import org.springframework.boot.actuate.metrics.opentsdb.OpenTsdbNamingStrategy; import org.springframework.boot.actuate.metrics.writer.GaugeWriter; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -33,7 +33,7 @@ public class SampleOpenTsdbExportApplication { @ConfigurationProperties("metrics.export") @ExportMetricWriter public GaugeWriter openTsdbMetricWriter() { - OpenTsdbMetricWriter writer = new OpenTsdbMetricWriter(); + OpenTsdbGaugeWriter writer = new OpenTsdbGaugeWriter(); writer.setNamingStrategy(namingStrategy()); return writer; }