Skip to content

Commit 02c5ad5

Browse files
mustafashabibmustafashabib
committed
Updates to newer dependencies and makes this library work for Dropwizard 3
1 parent bb9f580 commit 02c5ad5

File tree

10 files changed

+158
-39
lines changed

10 files changed

+158
-39
lines changed

‎dropwizard-metrics-datadog/dependency-reduced-pom.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<parent>
4+
<artifactId>metrics-datadog-parent</artifactId>
5+
<groupId>org.coursera</groupId>
6+
<version>3.0.0</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
<artifactId>dropwizard-metrics-datadog</artifactId>
10+
<name>Dropwizard Datadog Reporter</name>
11+
<dependencies>
12+
<dependency>
13+
<groupId>junit</groupId>
14+
<artifactId>junit</artifactId>
15+
<version>4.13.2</version>
16+
<scope>test</scope>
17+
<exclusions>
18+
<exclusion>
19+
<artifactId>hamcrest-core</artifactId>
20+
<groupId>org.hamcrest</groupId>
21+
</exclusion>
22+
</exclusions>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.easytesting</groupId>
26+
<artifactId>fest-assert-core</artifactId>
27+
<version>2.0M10</version>
28+
<scope>test</scope>
29+
<exclusions>
30+
<exclusion>
31+
<artifactId>fest-util</artifactId>
32+
<groupId>org.easytesting</groupId>
33+
</exclusion>
34+
</exclusions>
35+
</dependency>
36+
</dependencies>
37+
</project>

‎dropwizard-metrics-datadog/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>metrics-datadog-parent</artifactId>
55
<groupId>org.coursera</groupId>
6-
<version>2.0.0-RC1</version>
6+
<version>3.0.0</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎dropwizard-metrics-datadog/src/main/java/io/dropwizard/metrics/DatadogReporterFactory.java‎ renamed to ‎dropwizard-metrics-datadog/src/main/java/io/dropwizard/metrics/common/DatadogReporterFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.dropwizard.metrics;
1+
package io.dropwizard.metrics.common;
22

33
import com.codahale.metrics.MetricRegistry;
44
import com.codahale.metrics.ScheduledReporter;

‎dropwizard-metrics-datadog/src/main/resources/META-INF/services/io.dropwizard.metrics.ReporterFactory‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dropwizard-metrics-datadog/src/main/resources/META-INF/services/io.dropwizard.metrics.common.ReporterFactory‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.dropwizard.metrics.common.DatadogReporterFactory

‎dropwizard-metrics-datadog/src/test/java/io/dropwizard/metrics/DatadogReporterFactoryTest.java‎ renamed to ‎dropwizard-metrics-datadog/src/test/java/io/dropwizard/metrics/common/DatadogReporterFactoryTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.dropwizard.metrics;
1+
package io.dropwizard.metrics.common;
22

33
import io.dropwizard.jackson.DiscoverableSubtypeResolver;
44
import org.fest.assertions.api.Assertions;

‎metrics-datadog/dependency-reduced-pom.xml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3+
<parent>
4+
<artifactId>metrics-datadog-parent</artifactId>
5+
<groupId>org.coursera</groupId>
6+
<version>3.0.0</version>
7+
</parent>
8+
<modelVersion>4.0.0</modelVersion>
9+
<artifactId>metrics-datadog</artifactId>
10+
<name>Datadog Metrics Reporter</name>
11+
<description>A Datadog reporter backend for Coda Hale's Metrics</description>
12+
<profiles>
13+
<profile>
14+
<id>add-java-open-options-for-jdk16+</id>
15+
<properties>
16+
<argLine>--add-opens java.base/java.net=ALL-UNNAMED
17+
--add-opens java.base/sun.net=ALL-UNNAMED</argLine>
18+
</properties>
19+
</profile>
20+
</profiles>
21+
<dependencies>
22+
<dependency>
23+
<groupId>junit</groupId>
24+
<artifactId>junit</artifactId>
25+
<version>4.13.2</version>
26+
<scope>test</scope>
27+
<exclusions>
28+
<exclusion>
29+
<artifactId>hamcrest-core</artifactId>
30+
<groupId>org.hamcrest</groupId>
31+
</exclusion>
32+
</exclusions>
33+
</dependency>
34+
<dependency>
35+
<groupId>org.mockito</groupId>
36+
<artifactId>mockito-core</artifactId>
37+
<version>5.3.1</version>
38+
<scope>test</scope>
39+
<exclusions>
40+
<exclusion>
41+
<artifactId>byte-buddy</artifactId>
42+
<groupId>net.bytebuddy</groupId>
43+
</exclusion>
44+
<exclusion>
45+
<artifactId>byte-buddy-agent</artifactId>
46+
<groupId>net.bytebuddy</groupId>
47+
</exclusion>
48+
<exclusion>
49+
<artifactId>objenesis</artifactId>
50+
<groupId>org.objenesis</groupId>
51+
</exclusion>
52+
</exclusions>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.slf4j</groupId>
56+
<artifactId>slf4j-simple</artifactId>
57+
<version>2.0.7</version>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.alibaba</groupId>
62+
<artifactId>dns-cache-manipulator</artifactId>
63+
<version>1.8.1</version>
64+
<scope>test</scope>
65+
</dependency>
66+
</dependencies>
67+
</project>

‎metrics-datadog/pom.xml‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.coursera</groupId>
66
<artifactId>metrics-datadog-parent</artifactId>
7-
<version>2.0.0-RC1</version>
7+
<version>3.0.0</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
3838
</dependency>
3939
<dependency>
4040
<groupId>org.mockito</groupId>
41-
<artifactId>mockito-all</artifactId>
41+
<artifactId>mockito-core</artifactId>
4242
<scope>test</scope>
4343
</dependency>
4444
<dependency>
@@ -49,9 +49,22 @@
4949
<dependency>
5050
<groupId>com.alibaba</groupId>
5151
<artifactId>dns-cache-manipulator</artifactId>
52-
<version>1.5.1</version>
52+
<version>1.8.1</version>
5353
<scope>test</scope>
5454
</dependency>
5555
</dependencies>
56-
56+
<profiles>
57+
<profile>
58+
<id>add-java-open-options-for-jdk16+</id>
59+
<activation>
60+
<jdk>[16,)</jdk>
61+
</activation>
62+
<properties>
63+
<argLine>
64+
--add-opens java.base/java.net=ALL-UNNAMED
65+
--add-opens java.base/sun.net=ALL-UNNAMED
66+
</argLine>
67+
</properties>
68+
</profile>
69+
</profiles>
5770
</project>

‎metrics-datadog/src/main/java/org/coursera/metrics/datadog/transport/UdpTransport.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.coursera.metrics.datadog.transport;
22

33
import com.timgroup.statsd.NonBlockingStatsDClient;
4+
import com.timgroup.statsd.NonBlockingStatsDClientBuilder;
45
import com.timgroup.statsd.StatsDClient;
56
import com.timgroup.statsd.StatsDClientErrorHandler;
67
import org.coursera.metrics.datadog.model.DatadogCounter;
@@ -38,17 +39,12 @@ private UdpTransport(String prefix, String statsdHost, int port, boolean isRetry
3839
socketAddressCallable = staticAddressResolver(statsdHost, port);
3940
}
4041

41-
statsd = new NonBlockingStatsDClient(
42-
prefix,
43-
Integer.MAX_VALUE,
44-
globalTags,
45-
new StatsDClientErrorHandler() {
46-
public void handle(Exception e) {
47-
LOG.error(e.getMessage(), e);
48-
}
49-
},
50-
socketAddressCallable
51-
);
42+
statsd = new NonBlockingStatsDClientBuilder().prefix(prefix).queueSize(Integer.MAX_VALUE).constantTags(globalTags)
43+
.errorHandler(new StatsDClientErrorHandler() {
44+
public void handle(Exception e) {
45+
LOG.error(e.getMessage(), e);
46+
}
47+
}).addressLookup(socketAddressCallable).build();
5248
}
5349

5450
public void close() throws IOException {
@@ -156,7 +152,7 @@ public void send() {
156152
// Visible for testing.
157153
static Callable<SocketAddress> staticAddressResolver(final String host, final int port) {
158154
try {
159-
return NonBlockingStatsDClient.staticAddressResolution(host, port);
155+
return NonBlockingStatsDClientBuilder.staticAddressResolution(host, port);
160156
} catch(final Exception e) {
161157
LOG.error("Error during constructing statsd address resolver.", e);
162158
throw new RuntimeException(e);
@@ -165,6 +161,6 @@ static Callable<SocketAddress> staticAddressResolver(final String host, final in
165161

166162
// Visible for testing.
167163
static Callable<SocketAddress> volatileAddressResolver(final String host, final int port) {
168-
return NonBlockingStatsDClient.volatileAddressResolution(host, port);
164+
return NonBlockingStatsDClientBuilder.volatileAddressResolution(host, port);
169165
}
170166
}

‎pom.xml‎

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<parent>
45
<groupId>org.sonatype.oss</groupId>
56
<artifactId>oss-parent</artifactId>
6-
<version>7</version>
7+
<version>9</version>
78
</parent>
89

910
<modelVersion>4.0.0</modelVersion>
1011
<groupId>org.coursera</groupId>
1112
<artifactId>metrics-datadog-parent</artifactId>
12-
<version>2.0.0-RC1</version>
13+
<version>3.0.0</version>
1314
<packaging>pom</packaging>
1415
<name>Datadog Metrics Parent</name>
1516
<url>https://github.com/coursera/metrics-datadog</url>
@@ -39,6 +40,10 @@
3940
</developer>
4041
</developers>
4142
<contributors>
43+
<contributor>
44+
<name>Mustafa Shabib</name>
45+
<email>mshabib (at) seasonhealth.com</email>
46+
</contributor>
4247
<contributor>
4348
<name>Ankur Chauhan</name>
4449
<email>ankur (at) malloc64.com</email>
@@ -55,16 +60,16 @@
5560
</contributor>
5661
</contributors>
5762
<properties>
58-
<metrics.version>4.0.2</metrics.version>
59-
<jackson.version>2.9.6</jackson.version>
60-
<dropwizard.version>1.3.4</dropwizard.version>
63+
<metrics.version>4.2.18</metrics.version>
64+
<jackson.version>2.15.1</jackson.version>
65+
<dropwizard.version>3.0.0</dropwizard.version>
6166
</properties>
6267
<build>
6368
<plugins>
6469
<plugin>
6570
<groupId>org.apache.maven.plugins</groupId>
6671
<artifactId>maven-compiler-plugin</artifactId>
67-
<version>3.7.0</version>
72+
<version>3.11.0</version>
6873
<configuration>
6974
<source>1.8</source>
7075
<target>1.8</target>
@@ -73,12 +78,12 @@
7378
<plugin>
7479
<groupId>org.apache.maven.plugins</groupId>
7580
<artifactId>maven-deploy-plugin</artifactId>
76-
<version>2.8.2</version>
81+
<version>3.1.1</version>
7782
</plugin>
7883
<plugin>
7984
<groupId>org.apache.maven.plugins</groupId>
8085
<artifactId>maven-source-plugin</artifactId>
81-
<version>3.0.1</version>
86+
<version>3.3.0</version>
8287
<executions>
8388
<execution>
8489
<id>attach-sources</id>
@@ -91,14 +96,16 @@
9196
<plugin>
9297
<groupId>org.apache.maven.plugins</groupId>
9398
<artifactId>maven-javadoc-plugin</artifactId>
94-
<version>2.10.4</version>
99+
<version>3.5.0</version>
95100
<executions>
96101
<execution>
97102
<id>attach-javadocs</id>
98103
<goals>
99104
<goal>jar</goal>
100105
</goals>
101106
<configuration>
107+
<additionalOptions>-Xdoclint:none</additionalOptions>
108+
<additionalJOption>-Xdoclint:none</additionalJOption>
102109
<additionalparam>-Xdoclint:none</additionalparam>
103110
</configuration>
104111
</execution>
@@ -131,7 +138,6 @@
131138
</plugin>
132139
</plugins>
133140
</build>
134-
135141
<dependencyManagement>
136142
<dependencies>
137143
<dependency>
@@ -149,22 +155,22 @@
149155
<dependency>
150156
<groupId>org.apache.httpcomponents</groupId>
151157
<artifactId>fluent-hc</artifactId>
152-
<version>4.5.5</version>
158+
<version>4.5.14</version>
153159
</dependency>
154160
<dependency>
155161
<groupId>com.fasterxml.jackson.core</groupId>
156162
<artifactId>jackson-databind</artifactId>
157163
<version>${jackson.version}</version>
158-
</dependency>
164+
</dependency>
159165
<dependency>
160166
<groupId>com.datadoghq</groupId>
161167
<artifactId>java-dogstatsd-client</artifactId>
162-
<version>2.6.1</version>
168+
<version>4.2.0</version>
163169
</dependency>
164170
<dependency>
165171
<groupId>junit</groupId>
166172
<artifactId>junit</artifactId>
167-
<version>4.12</version>
173+
<version>4.13.2</version>
168174
<scope>test</scope>
169175
</dependency>
170176
<dependency>
@@ -175,14 +181,14 @@
175181
</dependency>
176182
<dependency>
177183
<groupId>org.mockito</groupId>
178-
<artifactId>mockito-all</artifactId>
179-
<version>1.10.19</version>
184+
<artifactId>mockito-core</artifactId>
185+
<version>5.3.1</version>
180186
<scope>test</scope>
181187
</dependency>
182188
<dependency>
183189
<groupId>org.slf4j</groupId>
184190
<artifactId>slf4j-simple</artifactId>
185-
<version>1.7.25</version>
191+
<version>2.0.7</version>
186192
<scope>test</scope>
187193
</dependency>
188194
</dependencies>

0 commit comments

Comments
 (0)