Merge branch 'master' into brian/AMLII-1676-send-both-cid-entity-id

Author: gh123man

CHANGELOG.md

@@ -1,6 +1,17 @@
 # CHANGELOG
 
-## 4.X.Y / 2024.XX.XX
+## 4.4.2 / 2024.06.03
+
+* [BUGFIX] Fix sampling and visibility issues with new direct client. See #[249][]
+
+## 4.4.1 / 2024.05.29
+
+* [BUGFIX] Restore public constructor for `NoOpStatsDClient`. See #[247][]
+
+## 4.4.0 / 2024.05.24
+
+* [FEATURE] Added new API to send multiple samples at once. See [#235][]
+* [BUGFIX] When using `SOCK_STREAM` Unix sockets we now correctly close the socket. See [#243][]
 
 ## 4.3.0 / 2024.01.24
 
@@ -238,7 +249,12 @@ Fork from [indeedeng/java-dogstatsd-client] (https://github.com/indeedeng/java-d
 [#203]: https://github.com/DataDog/java-dogstatsd-client/issues/203
 [#211]: https://github.com/DataDog/java-dogstatsd-client/issues/211
 [#217]: https://github.com/DataDog/java-dogstatsd-client/issues/217
-[#228]: https://github.com/DataDog/java-dogstatsd-client/pull/228
+[#228]: https://github.com/DataDog/java-dogstatsd-client/issues/228
+[#235]: https://github.com/DataDog/java-dogstatsd-client/issues/235
+[#243]: https://github.com/DataDog/java-dogstatsd-client/issues/243
+[#247]: https://github.com/DataDog/java-dogstatsd-client/issues/247
+[#249]: https://github.com/DataDog/java-dogstatsd-client/issues/249
+
 
 [@PatrickAuld]: https://github.com/PatrickAuld
 [@blevz]: https://github.com/blevz

README.md

@@ -17,7 +17,7 @@ The client jar is distributed via Maven central, and can be downloaded [from Mav
 <dependency>
     <groupId>com.datadoghq</groupId>
     <artifactId>java-dogstatsd-client</artifactId>
-    <version>4.2.1</version>
+    <version>4.4.2</version>
 </dependency>
 ```
 

pom.xml

@@ -7,7 +7,7 @@
     <artifactId>java-dogstatsd-client</artifactId>
     <packaging>jar</packaging>
     <name>java-dogstatsd-client</name>
-    <version>4.3.0</version>
+    <version>4.4.2</version>
     <description>A tiny library allowing Java applications to communicate with DataDog statsd instances easily.</description>
     <url>https://github.com/DataDog/java-dogstatsd-client</url>
 

src/main/java/com/timgroup/statsd/NoOpDirectStatsDClient.java

@@ -4,7 +4,7 @@
  * A No-Op {@link NonBlockingDirectStatsDClient}, which can be substituted in when metrics are not
  * required.
  */
-public final class NoOpDirectStatsDClient extends NoOpStatsDClient implements DirectStatsDClient {
+public class NoOpDirectStatsDClient extends NoOpStatsDClient implements DirectStatsDClient {
     @Override public void recordDistributionValues(String aspect, double[] values, double sampleRate, String... tags) { }
 
     @Override public void recordDistributionValues(String aspect, long[] values, double sampleRate, String... tags) { }

src/main/java/com/timgroup/statsd/NoOpStatsDClient.java

@@ -9,8 +9,6 @@
  */
 public class NoOpStatsDClient implements StatsDClient {
 
-    NoOpStatsDClient() {}
-
     @Override public void stop() { }
 
     @Override public void close() { }

src/main/java/com/timgroup/statsd/NonBlockingDirectStatsDClient.java

@@ -1,32 +1,22 @@
 package com.timgroup.statsd;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-final class NonBlockingDirectStatsDClient extends NonBlockingStatsDClient implements DirectStatsDClient {
+class NonBlockingDirectStatsDClient extends NonBlockingStatsDClient implements DirectStatsDClient {
 
     public NonBlockingDirectStatsDClient(final NonBlockingStatsDClientBuilder builder) throws StatsDClientException {
         super(builder);
     }
 
     @Override
     public void recordDistributionValues(String aspect, double[] values, double sampleRate, String... tags) {
-        if ((Double.isNaN(sampleRate) || !isInvalidSample(sampleRate)) && values != null && values.length > 0) {
-            if (values.length == 1) {
-                recordDistributionValue(aspect, values[0], sampleRate, tags);
-            } else {
-                sendMetric(new DoublesStatsDMessage(aspect, Message.Type.DISTRIBUTION, values, sampleRate, 0, tags));
-            }
+        if (values != null && values.length > 0) {
+            sendMetric(new DoublesStatsDMessage(aspect, Message.Type.DISTRIBUTION, values, sampleRate, 0, tags));
         }
     }
 
     @Override
     public void recordDistributionValues(String aspect, long[] values, double sampleRate, String... tags) {
-        if ((Double.isNaN(sampleRate) || !isInvalidSample(sampleRate)) && values != null && values.length > 0) {
-            if (values.length == 1) {
-                recordDistributionValue(aspect, values[0], sampleRate, tags);
-            } else {
-                sendMetric(new LongsStatsDMessage(aspect, Message.Type.DISTRIBUTION, values, sampleRate, 0, tags));
-            }
+        if (values != null && values.length > 0) {
+            sendMetric(new LongsStatsDMessage(aspect, Message.Type.DISTRIBUTION, values, sampleRate, 0, tags));
         }
     }
 

src/main/java/com/timgroup/statsd/UnixStreamClientChannel.java

@@ -134,26 +134,33 @@ private void connect() throws IOException {
             // We'd have better timeout support if we used Java 16's native Unix domain socket support (JEP 380)
             delegate.setOption(UnixSocketOptions.SO_SNDTIMEO, connectionTimeout);
         }
-        if (!delegate.connect(address)) {
-            if (connectionTimeout > 0 && System.nanoTime() > deadline) {
-                throw new IOException("Connection timed out");
+        try {
+            if (!delegate.connect(address)) {
+                if (connectionTimeout > 0 && System.nanoTime() > deadline) {
+                    throw new IOException("Connection timed out");
+                }
+                if (!delegate.finishConnect()) {
+                    throw new IOException("Connection failed");
+                }
             }
-            if (!delegate.finishConnect()) {
-                throw new IOException("Connection failed");
+
+            delegate.setOption(UnixSocketOptions.SO_SNDTIMEO, Math.max(timeout, 0));
+            if (bufferSize > 0) {
+                delegate.setOption(UnixSocketOptions.SO_SNDBUF, bufferSize);
             }
+        } catch (Exception e) {
+            try {
+                delegate.close();
+            } catch (IOException __) {
+                // ignore
+            }
+            throw e;
         }
 
-        if (timeout > 0) {
-            delegate.setOption(UnixSocketOptions.SO_SNDTIMEO, timeout);
-        } else {
-            delegate.setOption(UnixSocketOptions.SO_SNDTIMEO, 0);
-        }
-        if (bufferSize > 0) {
-            delegate.setOption(UnixSocketOptions.SO_SNDBUF, bufferSize);
-        }
+
         this.delegate = delegate;
     }
-
+    
     @Override
     public void close() throws IOException {
         disconnect();

src/test/java/com/timgroup/statsd/NonBlockingDirectStatsDClientTest.java

@@ -86,6 +86,14 @@ public void sends_multivalued_distribution_to_statsd_with_sampling_rate() {
         assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:423:234|d|@1.000000")));
     }
 
+    @Test(timeout = 5000L)
+    public void sends_multivalued_distribution_to_statsd_with_non_1_sampling_rate() {
+        client.recordDistributionValues("mydistribution", new long[] { 423L, 234L }, 0.1);
+        server.waitForMessage("my.prefix");
+
+        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:423:234|d|@0.100000")));
+    }
+
     @Test(timeout = 5000L)
     public void sends_multivalued_distribution_to_statsd_with_tags_and_sampling_rate() {
         client.recordDistributionValues("mydistribution", new long[] { 423L, 234L }, 1, "foo:bar", "baz");
@@ -97,19 +105,19 @@ public void sends_multivalued_distribution_to_statsd_with_tags_and_sampling_rate
     @Test(timeout = 5000L)
     public void sends_too_long_multivalued_distribution_to_statsd() {
         long[] values = {423L, 234L, 456L, 512L, 345L, 898L, 959876543123L, 667L};
-        client.recordDistributionValues("mydistribution", values, 1, "foo:bar", "baz");
+        client.recordDistributionValues("mydistribution", values, 0.4, "foo:bar", "baz");
 
         server.waitForMessage("my.prefix");
-        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:423:234:456|d|@1.000000|#baz,foo:bar")));
+        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:423:234:456|d|@0.400000|#baz,foo:bar")));
 
         server.waitForMessage("my.prefix");
-        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:512:345:898|d|@1.000000|#baz,foo:bar")));
+        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:512:345:898|d|@0.400000|#baz,foo:bar")));
 
         server.waitForMessage("my.prefix");
-        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:959876543123|d|@1.000000|#baz,foo:bar")));
+        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:959876543123|d|@0.400000|#baz,foo:bar")));
 
         server.waitForMessage("my.prefix");
-        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:667|d|@1.000000|#baz,foo:bar")));
+        assertThat(server.messagesReceived(), hasItem(comparesEqualTo("my.prefix.mydistribution:667|d|@0.400000|#baz,foo:bar")));
     }
 
 }