Merge pull request open-telemetry#1379 from DataDog/mar-kolya/upgrade…

…-statsd Use newer version of statsd client
bogdandrutu · Apr 17, 2020 · 5aeca66 · 5aeca66
2 parents 185ad18 + 9581048
commit 5aeca66
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/dd-trace-ot/dd-trace-ot.gradle b/dd-trace-ot/dd-trace-ot.gradle
@@ -39,13 +39,13 @@ dependencies {
   compile deps.opentracing
   compile group: 'io.opentracing.contrib', name: 'opentracing-tracerresolver', version: '0.1.0'
 
-  compile group: 'com.datadoghq', name: 'java-dogstatsd-client', version: '2.1.1'
+  compile group: 'com.datadoghq', name: 'java-dogstatsd-client', version: "${versions.dogstatsd}"
 
   compile deps.slf4j
   compile deps.okhttp
   compile group: 'org.msgpack', name: 'msgpack-core', version: '0.8.20'
   compile group: 'com.squareup.moshi', name: 'moshi', version: '1.9.2'
-  compile group: 'com.github.jnr', name: 'jnr-unixsocket', version: '0.23'
+  compile group: 'com.github.jnr', name: 'jnr-unixsocket', version: "${versions.jnr_unixsocket}"
   compile group: 'com.lmax', name: 'disruptor', version: '3.4.2'
 
   // We have autoservices defined in test subtree, looks like we need this to be able to properly rebuild this

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -3,21 +3,23 @@ def spockGroovyVer = groovyVer.replaceAll(/\.\d+$/, '')
 
 ext {
   versions = [
-    opentracing: '0.32.0',
+    opentracing   : '0.32.0',
 
-    slf4j      : "1.7.30",
-    guava      : "20.0", // Last version to support Java 7
-    okhttp     : "3.12.10", // 3.12.x is last version to support Java7)
+    slf4j         : "1.7.30",
+    guava         : "20.0", // Last version to support Java 7
+    okhttp        : "3.12.10", // 3.12.x is last version to support Java7)
 
-    spock      : "1.3-groovy-$spockGroovyVer",
-    groovy     : groovyVer,
-    junit5     : "5.6.2",
-    logback    : "1.2.3",
-    lombok     : "1.18.10",
-    bytebuddy  : "1.10.6",
-    scala      : "2.11.12",  // Last version to support Java 7 (2.12+ require Java 8+)
-    kotlin     : "1.3.72",
-    coroutines : "1.3.0"
+    spock         : "1.3-groovy-$spockGroovyVer",
+    groovy        : groovyVer,
+    junit5        : "5.6.2",
+    logback       : "1.2.3",
+    lombok        : "1.18.10",
+    bytebuddy     : "1.10.6",
+    scala         : "2.11.12",  // Last version to support Java 7 (2.12+ require Java 8+)
+    kotlin        : "1.3.72",
+    coroutines    : "1.3.0",
+    dogstatsd     : "2.9.0",
+    jnr_unixsocket: "0.28"
   ]
 
   deps = [
@@ -67,9 +69,8 @@ ext {
 
     // Shared between agent tooling and instrumentation and JMXFetch
     shared         : [
-      dependencies.create(group: 'com.datadoghq', name: 'java-dogstatsd-client', version: '2.8'),
-      // "Explicit override jnr version because .22 caused issues" - mar-kolya
-      dependencies.create(group: 'com.github.jnr', name: 'jnr-unixsocket', version: '0.23'),
+      dependencies.create(group: 'com.datadoghq', name: 'java-dogstatsd-client', version: "${versions.dogstatsd}"),
+      dependencies.create(group: 'com.github.jnr', name: 'jnr-unixsocket', version: "${versions.jnr_unixsocket}"),
       dependencies.create(group: 'com.google.guava', name: 'guava', version: "${versions.guava}")
     ],