Skip to content

Commit 9466113

Browse files
kr-igorkr-igor
committed
Updated multiple tests
1 parent ddebf44 commit 9466113

File tree

21 files changed

+229
-177
lines changed

21 files changed

+229
-177
lines changed

‎dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import datadog.trace.api.datastreams.DataStreamsTags
2+
13
import static datadog.trace.api.config.TraceInstrumentationConfig.GRPC_SERVER_ERROR_STATUSES
24

35
import com.google.common.util.concurrent.ListenableFuture
@@ -254,14 +256,12 @@ abstract class ArmeriaGrpcTest extends VersionedNamingTestBase {
254256
if (isDataStreamsEnabled()) {
255257
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
256258
verifyAll(first) {
257-
edgeTags.containsAll(["direction:out", "type:grpc"])
258-
edgeTags.size() == 2
259+
tags == DataStreamsTags.fromTags("direction:in", "topic:somequeue", "type:sqs")
259260
}
260261

261262
StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash }
262263
verifyAll(second) {
263-
edgeTags.containsAll(["direction:in", "type:grpc"])
264-
edgeTags.size() == 2
264+
tags == DataStreamsTags.fromTags("direction:in", "type:grpc")
265265
}
266266
}
267267

‎dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1KinesisClientTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import datadog.trace.agent.test.naming.VersionedNamingTestBase
1111
import datadog.trace.api.Config
1212
import datadog.trace.api.DDSpanTypes
1313
import datadog.trace.api.DDTags
14+
import datadog.trace.api.datastreams.DataStreamsTags
1415
import datadog.trace.bootstrap.instrumentation.api.Tags
1516
import datadog.trace.core.datastreams.StatsGroup
1617
import spock.lang.AutoCleanup
@@ -115,8 +116,7 @@ abstract class AWS1KinesisClientTest extends VersionedNamingTestBase {
115116
pathwayLatencyCount += group.pathwayLatency.count
116117
edgeLatencyCount += group.edgeLatency.count
117118
verifyAll(group) {
118-
edgeTags.containsAll(["direction:" + dsmDirection, "topic:" + streamArn, "type:kinesis"])
119-
edgeTags.size() == 3
119+
tags == DataStreamsTags.fromTags("direction:" + dsmDirection, "topic:" + streamArn, "type:kinesis")
120120
}
121121
}
122122
verifyAll {

‎dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/dsmTest/groovy/AWS1SnsClientTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import datadog.trace.agent.test.naming.VersionedNamingTestBase
1010
import datadog.trace.api.Config
1111
import datadog.trace.api.DDSpanTypes
1212
import datadog.trace.api.DDTags
13+
import datadog.trace.api.datastreams.DataStreamsTags
1314
import datadog.trace.bootstrap.instrumentation.api.Tags
1415
import datadog.trace.core.datastreams.StatsGroup
1516
import spock.lang.AutoCleanup
@@ -96,8 +97,7 @@ abstract class AWS1SnsClientTest extends VersionedNamingTestBase {
9697
pathwayLatencyCount += group.pathwayLatency.count
9798
edgeLatencyCount += group.edgeLatency.count
9899
verifyAll(group) {
99-
edgeTags.containsAll(["direction:" + dsmDirection, "topic:" + topicName, "type:sns"])
100-
edgeTags.size() == 3
100+
tags == DataStreamsTags.fromTags("direction:" + dsmDirection, "topic:" + topicName, "type:sns")
101101
}
102102
}
103103
verifyAll {

‎dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2KinesisDataStreamsTest.groovy‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import datadog.trace.agent.test.naming.VersionedNamingTestBase
22
import datadog.trace.api.Config
33
import datadog.trace.api.DDSpanTypes
44
import datadog.trace.api.DDTags
5+
import datadog.trace.api.datastreams.DataStreamsTags
56
import datadog.trace.bootstrap.instrumentation.api.Tags
67
import datadog.trace.core.datastreams.StatsGroup
78
import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory
@@ -156,8 +157,7 @@ abstract class Aws2KinesisDataStreamsTest extends VersionedNamingTestBase {
156157
pathwayLatencyCount += group.pathwayLatency.count
157158
edgeLatencyCount += group.edgeLatency.count
158159
verifyAll(group) {
159-
edgeTags.containsAll(["direction:" + dsmDirection, "topic:arnprefix:stream/somestream", "type:kinesis"])
160-
edgeTags.size() == 3
160+
tags == DataStreamsTags.fromTags("direction:" + dsmDirection, "topic:arnprefix:stream/somestream", "type:kinesis")
161161
}
162162
}
163163
verifyAll {
@@ -278,8 +278,7 @@ abstract class Aws2KinesisDataStreamsTest extends VersionedNamingTestBase {
278278
pathwayLatencyCount += group.pathwayLatency.count
279279
edgeLatencyCount += group.edgeLatency.count
280280
verifyAll(group) {
281-
edgeTags.containsAll(["direction:" + dsmDirection, "topic:arnprefix:stream/somestream", "type:kinesis"])
282-
edgeTags.size() == 3
281+
tags == DataStreamsTags.fromTags("direction:" + dsmDirection, "topic:arnprefix:stream/somestream", "type:kinesis")
283282
}
284283
}
285284
verifyAll {

‎dd-java-agent/instrumentation/aws-java-sdk-2.2/src/dsmTest/groovy/Aws2SnsDataStreamsTest.groovy‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import datadog.trace.agent.test.naming.VersionedNamingTestBase
22
import datadog.trace.api.Config
33
import datadog.trace.api.DDSpanTypes
44
import datadog.trace.api.DDTags
5+
import datadog.trace.api.datastreams.DataStreamsTags
56
import datadog.trace.bootstrap.instrumentation.api.Tags
67
import datadog.trace.core.datastreams.StatsGroup
78
import datadog.trace.instrumentation.aws.ExpectedQueryParams
@@ -144,8 +145,7 @@ abstract class Aws2SnsDataStreamsTest extends VersionedNamingTestBase {
144145
pathwayLatencyCount += group.pathwayLatency.count
145146
edgeLatencyCount += group.edgeLatency.count
146147
verifyAll(group) {
147-
edgeTags.containsAll(["direction:" + dsmDirection, "topic:mytopic", "type:sns"])
148-
edgeTags.size() == 3
148+
tags == DataStreamsTags.fromTags("direction:" + dsmDirection, "topic:mytopic", "type:sns")
149149
}
150150
}
151151
verifyAll {
@@ -243,8 +243,7 @@ abstract class Aws2SnsDataStreamsTest extends VersionedNamingTestBase {
243243
pathwayLatencyCount += group.pathwayLatency.count
244244
edgeLatencyCount += group.edgeLatency.count
245245
verifyAll(group) {
246-
edgeTags.containsAll(["direction:" + dsmDirection, "topic:mytopic", "type:sns"])
247-
edgeTags.size() == 3
246+
tags == DataStreamsTags.fromTags("direction:" + dsmDirection, "topic:mytopic", "type:sns")
248247
}
249248
}
250249
verifyAll {

‎dd-java-agent/instrumentation/aws-java-sns-1.0/src/test/groovy/SnsClientTest.groovy‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import datadog.trace.agent.test.utils.TraceUtils
1010
import datadog.trace.api.DDSpanTypes
1111
import datadog.trace.api.DDTags
1212
import datadog.trace.api.config.GeneralConfig
13+
import datadog.trace.api.datastreams.DataStreamsTags
1314
import datadog.trace.bootstrap.instrumentation.api.Tags
1415
import datadog.trace.core.datastreams.StatsGroup
1516
import groovy.json.JsonSlurper
@@ -194,10 +195,7 @@ abstract class SnsClientTest extends VersionedNamingTestBase {
194195
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
195196

196197
verifyAll(first) {
197-
edgeTags.contains("direction:out")
198-
edgeTags.contains("topic:testtopic")
199-
edgeTags.contains("type:sns")
200-
edgeTags.size() == 3
198+
tags == DataStreamsTags.fromTags("direction:out", "topic:testtopic", "type:sns")
201199
}
202200
}
203201

‎dd-java-agent/instrumentation/aws-java-sns-2.0/src/test/groovy/SnsClientTest.groovy‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import datadog.trace.agent.test.utils.TraceUtils
33
import datadog.trace.api.DDSpanTypes
44
import datadog.trace.api.DDTags
55
import datadog.trace.api.config.GeneralConfig
6+
import datadog.trace.api.datastreams.DataStreamsTags
67
import datadog.trace.bootstrap.instrumentation.api.Tags
78
import datadog.trace.core.datastreams.StatsGroup
89
import datadog.trace.instrumentation.aws.ExpectedQueryParams
@@ -164,10 +165,7 @@ abstract class SnsClientTest extends VersionedNamingTestBase {
164165
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
165166

166167
verifyAll(first) {
167-
edgeTags.contains("direction:out")
168-
edgeTags.contains("topic:testtopic")
169-
edgeTags.contains("type:sns")
170-
edgeTags.size() == 3
168+
tags == DataStreamsTags.fromTags("direction:out", "topic:testtopic", "type:sns")
171169
}
172170
}
173171

‎dd-java-agent/instrumentation/aws-java-sqs-1.0/src/test/groovy/SqsClientTest.groovy‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import datadog.trace.api.DDSpanId
1717
import datadog.trace.api.DDSpanTypes
1818
import datadog.trace.api.DDTags
1919
import datadog.trace.api.config.GeneralConfig
20+
import datadog.trace.api.datastreams.DataStreamsTags
2021
import datadog.trace.api.naming.SpanNaming
2122
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
2223
import datadog.trace.bootstrap.instrumentation.api.Tags
@@ -172,14 +173,12 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
172173
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
173174

174175
verifyAll(first) {
175-
edgeTags == ["direction:out", "topic:somequeue", "type:sqs"]
176-
edgeTags.size() == 3
176+
tags == DataStreamsTags.fromTags("direction:out", "topic:somequeue", "type:sqs")
177177
}
178178

179179
StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash }
180180
verifyAll(second) {
181-
edgeTags == ["direction:in", "topic:somequeue", "type:sqs"]
182-
edgeTags.size() == 3
181+
tags == DataStreamsTags.fromTags("direction:in", "topic:somequeue", "type:sqs")
183182
}
184183
}
185184

@@ -629,8 +628,7 @@ class SqsClientV1DataStreamsForkedTest extends SqsClientTest {
629628
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == -2734507826469073289 }
630629

631630
verifyAll(first) {
632-
edgeTags == ["direction:in", "topic:somequeue", "type:sqs"]
633-
edgeTags.size() == 3
631+
tags == DataStreamsTags.fromTags("direction:in", "topic:somequeue", "type:sqs")
634632
}
635633

636634
cleanup:
@@ -659,8 +657,7 @@ class SqsClientV1DataStreamsForkedTest extends SqsClientTest {
659657
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
660658

661659
verifyAll(first) {
662-
edgeTags == ["direction:in", "topic:somequeue", "type:sqs"]
663-
edgeTags.size() == 3
660+
tags == DataStreamsTags.fromTags("direction:in", "topic:somequeue", "type:sqs")
664661
}
665662

666663
cleanup:
@@ -690,8 +687,10 @@ class SqsClientV1DataStreamsForkedTest extends SqsClientTest {
690687
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
691688

692689
verifyAll(first) {
693-
edgeTags == ["direction:in", "topic:somequeue", "type:sqs"]
694-
edgeTags.size() == 3
690+
tags.direction == DataStreamsTags.DIRECTION_TAG + ":in"
691+
tags.topic == DataStreamsTags.TOPIC_TAG + ":somequeue"
692+
tags.type == DataStreamsTags.TYPE_TAG + ":sqs"
693+
tags.nonNullSize() == 3
695694
}
696695

697696
cleanup:

‎dd-java-agent/instrumentation/aws-java-sqs-2.0/src/test/groovy/SqsClientTest.groovy‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import datadog.trace.api.DDSpanId
77
import datadog.trace.api.DDSpanTypes
88
import datadog.trace.api.DDTags
99
import datadog.trace.api.config.GeneralConfig
10+
import datadog.trace.api.datastreams.DataStreamsTags
1011
import datadog.trace.api.naming.SpanNaming
1112
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags
1213
import datadog.trace.bootstrap.instrumentation.api.Tags
@@ -173,14 +174,12 @@ abstract class SqsClientTest extends VersionedNamingTestBase {
173174
StatsGroup first = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0 }
174175

175176
verifyAll(first) {
176-
edgeTags == ["direction:out", "topic:somequeue", "type:sqs"]
177-
edgeTags.size() == 3
177+
tags == DataStreamsTags.fromTags("direction:out", "topic:somequeue", "type:sqs")
178178
}
179179

180180
StatsGroup second = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == first.hash }
181181
verifyAll(second) {
182-
edgeTags == ["direction:in", "topic:somequeue", "type:sqs"]
183-
edgeTags.size() == 3
182+
tags == DataStreamsTags.fromTags("direction:in", "topic:somequeue", "type:sqs")
184183
}
185184
}
186185

‎dd-java-agent/instrumentation/google-pubsub/src/test/groovy/PubSubTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import datadog.trace.api.datastreams.DataStreamsTags
2+
13
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
24

35
import com.google.api.gax.core.NoCredentialsProvider
@@ -236,13 +238,11 @@ abstract class PubSubTest extends VersionedNamingTestBase {
236238

237239
StatsGroup sendStat = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == 0}
238240
verifyAll (sendStat) {
239-
edgeTags.containsAll(["direction:out" , "topic:test-topic", "type:google-pubsub"])
240-
edgeTags.size() == 3
241+
tags == DataStreamsTags.fromTags("direction:out" , "topic:test-topic", "type:google-pubsub")
241242
}
242243
StatsGroup receiveStat = TEST_DATA_STREAMS_WRITER.groups.find { it.parentHash == sendStat.hash}
243244
verifyAll(receiveStat) {
244-
edgeTags.containsAll(["direction:in" , "subscription:my-subscription", "type:google-pubsub"])
245-
edgeTags.size() == 3
245+
tags == DataStreamsTags.fromTags("direction:in" , "subscription:my-subscription", "type:google-pubsub")
246246
pathwayLatency.count == 1
247247
pathwayLatency.minValue > 0.0
248248
edgeLatency.count == 1

0 commit comments

Comments
 (0)