From 18a96a9276b8e4057bd7f2b6ffdcd667d490287c Mon Sep 17 00:00:00 2001 From: Richard Startin Date: Wed, 26 Oct 2022 14:55:41 +0100 Subject: [PATCH 1/2] upgrade to dogstatsd v4.1.0 --- gradle/dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 1a4b484b067..89d4202e297 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -23,7 +23,7 @@ final class CachedData { truth : "1.1.3", kotlin : "1.3.72", coroutines : "1.3.0", - dogstatsd : "4.0.0", + dogstatsd : "4.1.0", jnr_unixsocket: "0.28", jnr_ffi : '2.1.12', // dependency of jnr_unixsocket: update in tandem commons : "3.2", From 50879bea2422fa9b663415c14446abab8bb19a11 Mon Sep 17 00:00:00 2001 From: Richard Startin Date: Wed, 26 Oct 2022 16:35:09 +0100 Subject: [PATCH 2/2] relax test constraint to be ambivalent to container id --- .../monitor/DDAgentStatsDClientTest.groovy | 66 +++++++++---------- .../datadog/trace/agent/JMXFetchTest.groovy | 3 +- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/communication/src/test/groovy/datadog/communication/monitor/DDAgentStatsDClientTest.groovy b/communication/src/test/groovy/datadog/communication/monitor/DDAgentStatsDClientTest.groovy index 4b804729677..aa632273bcd 100644 --- a/communication/src/test/groovy/datadog/communication/monitor/DDAgentStatsDClientTest.groovy +++ b/communication/src/test/groovy/datadog/communication/monitor/DDAgentStatsDClientTest.groovy @@ -23,70 +23,70 @@ class DDAgentStatsDClientTest extends DDSpecification { expect: client.incrementCounter(metricName, tags) - server.waitForMessage() == "$expectedMetricName:1|c|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:1|c|#$expectedTags") client.count(metricName, Integer.MIN_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:-2147483648|c|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:-2147483648|c|#$expectedTags") client.count(metricName, Integer.MAX_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:2147483647|c|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:2147483647|c|#$expectedTags") client.count(metricName, Long.MIN_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:-9223372036854775808|c|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:-9223372036854775808|c|#$expectedTags") client.count(metricName, Long.MAX_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:9223372036854775807|c|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:9223372036854775807|c|#$expectedTags") client.gauge(metricName, Integer.MIN_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:-2147483648|g|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:-2147483648|g|#$expectedTags") client.gauge(metricName, Integer.MAX_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:2147483647|g|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:2147483647|g|#$expectedTags") client.gauge(metricName, Long.MIN_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:-9223372036854775808|g|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:-9223372036854775808|g|#$expectedTags") client.gauge(metricName, Long.MAX_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:9223372036854775807|g|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:9223372036854775807|g|#$expectedTags") client.gauge(metricName, -Math.E, tags) - server.waitForMessage() == "$expectedMetricName:-2.718282|g|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:-2.718282|g|#$expectedTags") client.gauge(metricName, Math.PI, tags) - server.waitForMessage() == "$expectedMetricName:3.141593|g|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:3.141593|g|#$expectedTags") client.histogram(metricName, Integer.MIN_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:-2147483648|h|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:-2147483648|h|#$expectedTags") client.histogram(metricName, Integer.MAX_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:2147483647|h|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:2147483647|h|#$expectedTags") client.histogram(metricName, Long.MIN_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:-9223372036854775808|h|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:-9223372036854775808|h|#$expectedTags") client.histogram(metricName, Long.MAX_VALUE, tags) - server.waitForMessage() == "$expectedMetricName:9223372036854775807|h|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:9223372036854775807|h|#$expectedTags") client.histogram(metricName, -Math.E, tags) - server.waitForMessage() == "$expectedMetricName:-2.718282|h|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:-2.718282|h|#$expectedTags") client.histogram(metricName, Math.PI, tags) - server.waitForMessage() == "$expectedMetricName:3.141593|h|#$expectedTags" + server.waitForMessage().startsWith("$expectedMetricName:3.141593|h|#$expectedTags") client.serviceCheck(checkName, "OK", null, tags) - server.waitForMessage() == "_sc|$expectedCheckName|0|#$expectedTags" + server.waitForMessage().startsWith("_sc|$expectedCheckName|0|#$expectedTags") client.serviceCheck(checkName, "WARN", null, tags) - server.waitForMessage() == "_sc|$expectedCheckName|1|#$expectedTags" + server.waitForMessage().startsWith("_sc|$expectedCheckName|1|#$expectedTags") client.serviceCheck(checkName, "WARNING", null, tags) - server.waitForMessage() == "_sc|$expectedCheckName|1|#$expectedTags" + server.waitForMessage().startsWith("_sc|$expectedCheckName|1|#$expectedTags") client.serviceCheck(checkName, "CRITICAL", null, tags) - server.waitForMessage() == "_sc|$expectedCheckName|2|#$expectedTags" + server.waitForMessage().startsWith("_sc|$expectedCheckName|2|#$expectedTags") client.serviceCheck(checkName, "ERROR", null, tags) - server.waitForMessage() == "_sc|$expectedCheckName|2|#$expectedTags" + server.waitForMessage().startsWith("_sc|$expectedCheckName|2|#$expectedTags") client.serviceCheck(checkName, "_UNKNOWN_", null, tags) - server.waitForMessage() == "_sc|$expectedCheckName|3|#$expectedTags" + server.waitForMessage().startsWith("_sc|$expectedCheckName|3|#$expectedTags") client.serviceCheck(checkName, "OK", "testing", tags) - server.waitForMessage() == "_sc|$expectedCheckName|0|#$expectedTags|m:testing" + server.waitForMessage().startsWith("_sc|$expectedCheckName|0|#$expectedTags|m:testing") client.serviceCheck(checkName, "WARN", "testing", tags) - server.waitForMessage() == "_sc|$expectedCheckName|1|#$expectedTags|m:testing" + server.waitForMessage().startsWith("_sc|$expectedCheckName|1|#$expectedTags|m:testing") client.serviceCheck(checkName, "WARNING", "testing", tags) - server.waitForMessage() == "_sc|$expectedCheckName|1|#$expectedTags|m:testing" + server.waitForMessage().startsWith("_sc|$expectedCheckName|1|#$expectedTags|m:testing") client.serviceCheck(checkName, "CRITICAL", "testing", tags) - server.waitForMessage() == "_sc|$expectedCheckName|2|#$expectedTags|m:testing" + server.waitForMessage().startsWith("_sc|$expectedCheckName|2|#$expectedTags|m:testing") client.serviceCheck(checkName, "ERROR", "testing", tags) - server.waitForMessage() == "_sc|$expectedCheckName|2|#$expectedTags|m:testing" + server.waitForMessage().startsWith("_sc|$expectedCheckName|2|#$expectedTags|m:testing") client.serviceCheck(checkName, "_UNKNOWN_", "testing", tags) - server.waitForMessage() == "_sc|$expectedCheckName|3|#$expectedTags|m:testing" + server.waitForMessage().startsWith("_sc|$expectedCheckName|3|#$expectedTags|m:testing") cleanup: client.close() @@ -118,19 +118,19 @@ class DDAgentStatsDClientTest extends DDSpecification { expect: client1.incrementCounter(metricName, metricTags) - server.waitForMessage() == "test.metric:1|c|#jmx_domain:java.nio,type:BufferPool" + server.waitForMessage().startsWith("test.metric:1|c|#jmx_domain:java.nio,type:BufferPool") client1.close() client2.incrementCounter(metricName, metricTags) - server.waitForMessage() == "example.test.metric:1|c|#jmx_domain:java.nio,type:BufferPool" + server.waitForMessage().startsWith("example.test.metric:1|c|#jmx_domain:java.nio,type:BufferPool") client2.close() client3.incrementCounter(metricName, metricTags) - server.waitForMessage() == "test.metric:1|c|#jmx_domain:java.nio,type:BufferPool,lang:java,lang_version:1.8.0" + server.waitForMessage().startsWith("test.metric:1|c|#jmx_domain:java.nio,type:BufferPool,lang:java,lang_version:1.8.0") client3.close() client4.incrementCounter(metricName, metricTags) - server.waitForMessage() == "example.test.metric:1|c|#jmx_domain:java.nio,type:BufferPool,lang:java,lang_version:1.8.0" + server.waitForMessage().startsWith("example.test.metric:1|c|#jmx_domain:java.nio,type:BufferPool,lang:java,lang_version:1.8.0") client4.close() cleanup: diff --git a/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy b/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy index 5691d1db141..e436fcf8762 100644 --- a/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy +++ b/dd-java-agent/src/test/groovy/datadog/trace/agent/JMXFetchTest.groovy @@ -45,10 +45,9 @@ class JMXFetchTest extends Specification { DatagramPacket packet = new DatagramPacket(buf, buf.length) jmxStatsSocket.receive(packet) String received = new String(packet.getData(), 0, packet.getLength()) - def tags = (received =~ /\|#(.*)/)[0][1].tokenize(',') then: - tags.contains("service:${JmxStartedChecker.getName()}" as String) + received.contains("service:${JmxStartedChecker.getName()}" as String) cleanup: if (process != null) {