Improved test coverage

kr-igor · kr-igor · commit b559bdfcf3ab · 2025-07-17T08:45:02.000-05:00
diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
@@ -1,5 +1,3 @@
-import datadog.trace.api.datastreams.DataStreamsTags
-
 import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_SERVER_ERROR_STATUSES
 
 import com.google.common.util.concurrent.ListenableFuture
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1KinesisClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1KinesisClientTest.groovy
@@ -11,7 +11,6 @@ import datadog.trace.agent.test.naming.VersionedNamingTestBase
 import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
 import spock.lang.AutoCleanup
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1SnsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1SnsClientTest.groovy
@@ -10,7 +10,6 @@ import datadog.trace.agent.test.naming.VersionedNamingTestBase
 import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
 import spock.lang.AutoCleanup
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2KinesisDataStreamsTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2KinesisDataStreamsTest.groovy
@@ -2,7 +2,6 @@ import datadog.trace.agent.test.naming.VersionedNamingTestBase
 import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
 import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory
diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2SnsDataStreamsTest.groovy b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2SnsDataStreamsTest.groovy
@@ -2,7 +2,6 @@ import datadog.trace.agent.test.naming.VersionedNamingTestBase
 import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
 import datadog.trace.instrumentation.aws.ExpectedQueryParams
diff --git a/dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy
@@ -10,7 +10,6 @@ import datadog.trace.agent.test.utils.TraceUtils
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
 import groovy.json.JsonSlurper
diff --git a/dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy
@@ -3,7 +3,6 @@ import datadog.trace.agent.test.utils.TraceUtils
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
 import datadog.trace.instrumentation.aws.ExpectedQueryParams
diff --git a/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy b/dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy
@@ -7,7 +7,6 @@ import datadog.trace.api.DDSpanId
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
 import datadog.trace.api.config.GeneralConfig
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.api.naming.SpanNaming
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
diff --git a/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy b/dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy
@@ -1,4 +1,3 @@
-import datadog.trace.api.datastreams.DataStreamsTags
 
 import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy b/dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcTest.groovy
@@ -1,4 +1,3 @@
-import datadog.trace.api.datastreams.DataStreamsTags
 
 import static datadog.trace.agent.test.asserts.TagsAssert.codeOriginTags
 import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_SERVER_ERROR_STATUSES
diff --git a/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka-clients-0.11/src/test/groovy/KafkaClientTestBase.groovy
@@ -1,5 +1,3 @@
-import datadog.trace.api.datastreams.DataStreamsTags
-
 import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
 import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan
diff --git a/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy b/dd-java-agent/instrumentation/kafka-clients-3.8/src/test/groovy/KafkaClientTestBase.groovy
@@ -2,7 +2,6 @@ import datadog.trace.agent.test.asserts.TraceAssert
 import datadog.trace.agent.test.naming.VersionedNamingTestBase
 import datadog.trace.api.Config
 import datadog.trace.api.DDTags
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.common.writer.ListWriter
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/latestDepTest/groovy/KafkaStreamsTest.groovy b/dd-java-agent/instrumentation/kafka-streams-0.11/src/latestDepTest/groovy/KafkaStreamsTest.groovy
@@ -1,6 +1,5 @@
 import datadog.trace.agent.test.AgentTestRunner
 import datadog.trace.api.DDTags
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
diff --git a/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTestBase.groovy b/dd-java-agent/instrumentation/kafka-streams-0.11/src/test/groovy/KafkaStreamsTestBase.groovy
@@ -1,6 +1,5 @@
 import datadog.trace.agent.test.naming.VersionedNamingTestBase
 import datadog.trace.api.DDTags
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.datastreams.StatsGroup
diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/test/groovy/RabbitMQTest.groovy
@@ -12,7 +12,6 @@ import datadog.trace.agent.test.utils.PortUtils
 import datadog.trace.api.Config
 import datadog.trace.api.DDSpanTypes
 import datadog.trace.api.DDTags
-import datadog.trace.api.datastreams.DataStreamsTags
 import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
 import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.core.DDSpan
diff --git a/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTags.java b/internal-api/src/main/java/datadog/trace/api/datastreams/DataStreamsTags.java
@@ -56,14 +56,14 @@ public enum Direction {
 
   public static byte[] longToBytes(long val) {
     return new byte[] {
-      (byte) val,
-      (byte) (val >> 8),
-      (byte) (val >> 16),
-      (byte) (val >> 24),
-      (byte) (val >> 32),
-      (byte) (val >> 40),
-      (byte) (val >> 48),
-      (byte) (val >> 56)
+        (byte) (val >> 56),
+        (byte) (val >> 48),
+        (byte) (val >> 40),
+        (byte) (val >> 32),
+        (byte) (val >> 24),
+        (byte) (val >> 16),
+        (byte) (val >> 8),
+        (byte) val
     };
   }
 
@@ -178,6 +178,7 @@ public Boolean hasAllTags(String[] tags) {
           if (!Objects.equals(this.isManual, tag)) {
             return false;
           }
+          break;
         case GROUP_TAG:
           if (!Objects.equals(this.group, tag)) {
             return false;
diff --git a/internal-api/src/test/groovy/datadog/trace/api/datastreams/DataStreamsTagsTest.groovy b/internal-api/src/test/groovy/datadog/trace/api/datastreams/DataStreamsTagsTest.groovy
@@ -1,6 +1,7 @@
 package datadog.trace.api.datastreams
 
 import spock.lang.Specification
+import java.nio.ByteBuffer
 
 
 class DataStreamsTagsTest extends Specification {
@@ -32,7 +33,42 @@ class DataStreamsTagsTest extends Specification {
     tg.getPartition() == DataStreamsTags.PARTITION_TAG + ":partition0"
     tg.getDirectionValue() == DataStreamsTags.Direction.Outbound
     tg.toString() != null
-    tg.hasAllTags("123") == false
+  }
+
+  def 'test has all tags'() {
+    setup:
+    def tags = new DataStreamsTags("bus", DataStreamsTags.Direction.Outbound,
+      "exchange", "topic", "type", "subscription", "dataset_name", "dataset_namespace", true,
+      "group", "consumer_group", true, "kafka_cluster_id", "partition")
+    expect:
+    tags.hasAllTags(
+      "bus:bus",
+      "direction:out",
+      "exchange:exchange",
+      "topic:topic",
+      "type:type",
+      "subscription:subscription",
+      "ds.name:dataset_name",
+      "ds.namespace:dataset_namespace",
+      "manual_checkpoint:true",
+      "group:group",
+      "consumer_group:consumer_group",
+      "has_routing_key:true",
+      "kafka_cluster_id:kafka_cluster_id",
+      "partition:partition"
+    )
+    !tags.hasAllTags("garbage")
+  }
+
+  def 'test long to bytes'() {
+    setup:
+    def value = 123444L
+    def bts = DataStreamsTags.longToBytes(value)
+    ByteBuffer buffer = ByteBuffer.allocate(Long.BYTES);
+    buffer.putLong(value)
+    def ctrl = buffer.array()
+    expect:
+    bts == ctrl
   }
 
   def 'test service name override and global hash'() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-import datadog.trace.api.datastreams.DataStreamsTags`
`2`		`-`
`3`	`1`	`import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_SERVER_ERROR_STATUSES`
`4`	`2`
`5`	`3`	`import com.google.common.util.concurrent.ListenableFuture`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import datadog.trace.api.datastreams.DataStreamsTags`
`2`	`1`
`3`	`2`	`import static datadog.trace.agent.test.utils.TraceUtils.basicSpan`
`4`	`3`