diff --git a/dropwizard-metrics-influxdb/src/test/java/com/izettle/metrics/dw/InfluxDbReporterFactoryTest.java b/dropwizard-metrics-influxdb/src/test/java/com/izettle/metrics/dw/InfluxDbReporterFactoryTest.java index 32094b3..5640bca 100644 --- a/dropwizard-metrics-influxdb/src/test/java/com/izettle/metrics/dw/InfluxDbReporterFactoryTest.java +++ b/dropwizard-metrics-influxdb/src/test/java/com/izettle/metrics/dw/InfluxDbReporterFactoryTest.java @@ -198,4 +198,11 @@ protected InfluxDbReporter.Builder builder(MetricRegistry registry) { assertThat(getField(influxDb, InfluxDbUdpSender.class, "socketTimeout")).isEqualTo(3000); } + + @Test + public void shouldSetProtocolAndDefaultToHttp() { + assertThat(factory.getProtocol()).isEqualTo("http"); + factory.setProtocol("tcp"); + assertThat(factory.getProtocol()).isEqualTo("tcp"); + } } diff --git a/dropwizard-metrics-influxdb/src/test/java/com/izettle/metrics/dw/NoopTransformerTest.java b/dropwizard-metrics-influxdb/src/test/java/com/izettle/metrics/dw/NoopTransformerTest.java new file mode 100644 index 0000000..bd3fb4b --- /dev/null +++ b/dropwizard-metrics-influxdb/src/test/java/com/izettle/metrics/dw/NoopTransformerTest.java @@ -0,0 +1,14 @@ +package com.izettle.metrics.dw; + +import com.izettle.metrics.dw.tags.NoopTransformer; +import org.assertj.core.api.Assertions; +import org.junit.Test; + +public class NoopTransformerTest { + + @Test + public void shouldDoNoTransform() { + Assertions.assertThat(new NoopTransformer().getTags("com.izettle.metrics.influxdb.tags.NoopTransformer.count")) + .containsEntry("metricName", "com.izettle.metrics.influxdb.tags.NoopTransformer.count"); + } +} diff --git a/metrics-influxdb/pom.xml b/metrics-influxdb/pom.xml index 432bd90..3034065 100644 --- a/metrics-influxdb/pom.xml +++ b/metrics-influxdb/pom.xml @@ -20,7 +20,7 @@ org.apache.kafka kafka-clients - 0.11.0.0 + 1.1.0 io.dropwizard.metrics @@ -44,7 +44,7 @@ commons-codec commons-codec - 1.9 + 1.11 diff --git a/metrics-influxdb/src/main/java/com/izettle/metrics/influxdb/InfluxDbBaseSender.java b/metrics-influxdb/src/main/java/com/izettle/metrics/influxdb/InfluxDbBaseSender.java index 4bfc1a8..4de49c9 100644 --- a/metrics-influxdb/src/main/java/com/izettle/metrics/influxdb/InfluxDbBaseSender.java +++ b/metrics-influxdb/src/main/java/com/izettle/metrics/influxdb/InfluxDbBaseSender.java @@ -24,7 +24,7 @@ abstract class InfluxDbBaseSender implements InfluxDbSender { @Override public void flush() { - influxDbWriteObject.setPoints(new HashSet()); + influxDbWriteObject.setPoints(new HashSet<>()); } @Override diff --git a/metrics-influxdb/src/main/java/com/izettle/metrics/influxdb/tags/NoopTransformer.java b/metrics-influxdb/src/main/java/com/izettle/metrics/influxdb/tags/NoopTransformer.java index 98fbc78..4ec0dcf 100644 --- a/metrics-influxdb/src/main/java/com/izettle/metrics/influxdb/tags/NoopTransformer.java +++ b/metrics-influxdb/src/main/java/com/izettle/metrics/influxdb/tags/NoopTransformer.java @@ -6,7 +6,7 @@ public class NoopTransformer implements Transformer { @Override public Map getTags(String metricName) { - Map tags = new HashMap(); + Map tags = new HashMap<>(); tags.put("metricName", metricName); return tags; } diff --git a/metrics-influxdb/src/test/java/com/izettle/metrics/influxdb/InfluxDbReporterTest.java b/metrics-influxdb/src/test/java/com/izettle/metrics/influxdb/InfluxDbReporterTest.java index 2aca940..1d68937 100644 --- a/metrics-influxdb/src/test/java/com/izettle/metrics/influxdb/InfluxDbReporterTest.java +++ b/metrics-influxdb/src/test/java/com/izettle/metrics/influxdb/InfluxDbReporterTest.java @@ -46,7 +46,7 @@ public class InfluxDbReporterTest { @Before public void init() { - globalTags = new HashMap(); + globalTags = new HashMap<>(); globalTags.put("global", "tag001"); MockitoAnnotations.initMocks(this); reporter = InfluxDbReporter @@ -267,11 +267,11 @@ public void shouldMapMeasurementToDefinedMeasurementNameAndRegex() { .build(influxDb); reporter.report( - this.map(), - this.map(), - this.map(), + this.map(), + this.map(), + this.map(), this.map("com.example.resources.RandomResource", mock(Meter.class)), - this.map() + this.map() ); final ArgumentCaptor influxDbPointCaptor = ArgumentCaptor.forClass(InfluxDbPoint.class); @@ -293,11 +293,11 @@ public void shouldNotMapMeasurementToDefinedMeasurementNameAndRegex() { .build(influxDb); reporter.report( - this.map(), - this.map(), - this.map(), + this.map(), + this.map(), + this.map(), this.map("com.example.resources.RandomResource", mock(Meter.class)), - this.map() + this.map() ); final ArgumentCaptor influxDbPointCaptor = ArgumentCaptor.forClass(InfluxDbPoint.class); @@ -519,12 +519,12 @@ public void shouldSkipIdleMetrics() throws Exception { @Test public void shouldCatchExceptions() throws Exception { - doThrow(ConnectException.class).when(influxDb).flush(); - reporter - .report(map("gauge", gauge((byte) 1)), this.map(), this.map(), this.map(), this.map()); - doThrow(IOException.class).when(influxDb).flush(); - reporter - .report(map("gauge", gauge((byte) 1)), this.map(), this.map(), this.map(), this.map()); + doThrow(ConnectException.class).when(influxDb).writeData(); + reporter.report(map("gauge", gauge((byte) 1)), this.map(), this.map(), this.map(), this.map()); + doThrow(IOException.class).when(influxDb).writeData(); + reporter.report(map("gauge", gauge((byte) 1)), this.map(), this.map(), this.map(), this.map()); + doThrow(RuntimeException.class).when(influxDb).flush(); + reporter.report(map("gauge", gauge((byte) 1)), this.map(), this.map(), this.map(), this.map()); } diff --git a/pom.xml b/pom.xml index 462d8ad..128ac08 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.izettle izettle-oss - 1.14 + 1.18 metrics-parent @@ -37,14 +37,13 @@ - 1.0.0 + 1.3.1 maven-enforcer-plugin - 1.4.1 enforce @@ -98,12 +97,12 @@ org.eluder.coveralls coveralls-maven-plugin - 4.0.0 + 4.3.0 org.codehaus.mojo findbugs-maven-plugin - 3.0.3 + ${findbugs-maven-plugin.version} Max Low @@ -115,7 +114,7 @@ com.h3xstream.findsecbugs findsecbugs-plugin - 1.4.5 + 1.7.1