Skip to content

Commit feab335

Browse files
sezen-datadogsezen-datadog
committed
build issue
Signed-off-by: sezen.leblay <sezen.leblay@datadoghq.com>
1 parent e6b468d commit feab335

File tree

3 files changed

+58
-20
lines changed

3 files changed

+58
-20
lines changed

‎dd-trace-core/src/test/groovy/datadog/trace/common/metrics/AggregateMetricTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class AggregateMetricTest extends DDSpecification {
5252
given:
5353
AggregateMetric aggregate = new AggregateMetric().recordDurations(3, new AtomicLongArray(0L, 0L, 0L | ERROR_TAG | TOP_LEVEL_TAG))
5454

55-
Batch batch = new Batch().reset(new MetricKey("foo", "bar", "qux", "type", 0, false, true, "corge", [UTF8BytesString.create("grault:quux")]))
55+
Batch batch = new Batch().reset(new MetricKey("foo", "bar", "qux", "type", 0, false, true, "corge", [UTF8BytesString.create("grault:quux")], "GET", "/api/endpoint"))
5656
batch.add(0L, 10)
5757
batch.add(0L, 10)
5858
batch.add(0L, 10)
@@ -127,7 +127,7 @@ class AggregateMetricTest extends DDSpecification {
127127
def "consistent under concurrent attempts to read and write"() {
128128
given:
129129
AggregateMetric aggregate = new AggregateMetric()
130-
MetricKey key = new MetricKey("foo", "bar", "qux", "type", 0, false, true, "corge", [UTF8BytesString.create("grault:quux")])
130+
MetricKey key = new MetricKey("foo", "bar", "qux", "type", 0, false, true, "corge", [UTF8BytesString.create("grault:quux")], "GET", "/api/endpoint")
131131
BlockingDeque<Batch> queue = new LinkedBlockingDeque<>(1000)
132132
ExecutorService reader = Executors.newSingleThreadExecutor()
133133
int writerCount = 10

‎dd-trace-core/src/test/groovy/datadog/trace/common/metrics/ConflatingMetricAggregatorTest.groovy‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
128128
false,
129129
false,
130130
"baz",
131-
[]
131+
[],
132+
null,
133+
null
132134
), _) >> { MetricKey key, AggregateMetric value ->
133135
value.getHitCount() == 1 && value.getTopLevelCount() == 1 && value.getDuration() == 100
134136
}
@@ -170,7 +172,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
170172
false,
171173
false,
172174
kind,
173-
[]
175+
[],
176+
null,
177+
null
174178
), { AggregateMetric aggregateMetric ->
175179
aggregateMetric.getHitCount() == 1 && aggregateMetric.getTopLevelCount() == 0 && aggregateMetric.getDuration() == 100
176180
})
@@ -224,7 +228,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
224228
false,
225229
false,
226230
"client",
227-
[UTF8BytesString.create("country:france")]
231+
[UTF8BytesString.create("country:france")],
232+
null,
233+
null
228234
), { AggregateMetric aggregateMetric ->
229235
aggregateMetric.getHitCount() == 1 && aggregateMetric.getTopLevelCount() == 0 && aggregateMetric.getDuration() == 100
230236
})
@@ -238,7 +244,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
238244
false,
239245
false,
240246
"client",
241-
[UTF8BytesString.create("country:france"), UTF8BytesString.create("georegion:europe")]
247+
[UTF8BytesString.create("country:france"), UTF8BytesString.create("georegion:europe")],
248+
null,
249+
null
242250
), { AggregateMetric aggregateMetric ->
243251
aggregateMetric.getHitCount() == 1 && aggregateMetric.getTopLevelCount() == 0 && aggregateMetric.getDuration() == 100
244252
})
@@ -281,7 +289,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
281289
false,
282290
false,
283291
kind,
284-
expectedPeerTags
292+
expectedPeerTags,
293+
null,
294+
null
285295
), { AggregateMetric aggregateMetric ->
286296
aggregateMetric.getHitCount() == 1 && aggregateMetric.getTopLevelCount() == 0 && aggregateMetric.getDuration() == 100
287297
})
@@ -329,7 +339,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
329339
false,
330340
false,
331341
"baz",
332-
[]
342+
[],
343+
null,
344+
null
333345
), { AggregateMetric value ->
334346
value.getHitCount() == 1 && value.getTopLevelCount() == topLevelCount && value.getDuration() == 100
335347
})
@@ -384,7 +396,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
384396
false,
385397
false,
386398
"baz",
387-
[]
399+
[],
400+
null,
401+
null
388402
), { AggregateMetric value ->
389403
value.getHitCount() == count && value.getDuration() == count * duration
390404
})
@@ -397,7 +411,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
397411
false,
398412
false,
399413
"baz",
400-
[]
414+
[],
415+
null,
416+
null
401417
), { AggregateMetric value ->
402418
value.getHitCount() == count && value.getDuration() == count * duration * 2
403419
})
@@ -446,7 +462,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
446462
false,
447463
false,
448464
"baz",
449-
[]
465+
[],
466+
null,
467+
null
450468
), _) >> { MetricKey key, AggregateMetric value ->
451469
value.getHitCount() == 1 && value.getDuration() == duration
452470
}
@@ -460,7 +478,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
460478
false,
461479
false,
462480
"baz",
463-
[]
481+
[],
482+
null,
483+
null
464484
), _)
465485
1 * writer.finishBucket() >> { latch.countDown() }
466486

@@ -505,7 +525,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
505525
false,
506526
false,
507527
"baz",
508-
[]
528+
[],
529+
null,
530+
null
509531
), { AggregateMetric value ->
510532
value.getHitCount() == 1 && value.getDuration() == duration
511533
})
@@ -536,7 +558,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
536558
false,
537559
false,
538560
"baz",
539-
[]
561+
[],
562+
null,
563+
null
540564
), { AggregateMetric value ->
541565
value.getHitCount() == 1 && value.getDuration() == duration
542566
})
@@ -550,7 +574,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
550574
false,
551575
false,
552576
"baz",
553-
[]
577+
[],
578+
null,
579+
null
554580
), _)
555581
1 * writer.finishBucket() >> { latch.countDown() }
556582

@@ -595,7 +621,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
595621
false,
596622
false,
597623
"quux",
598-
[]
624+
[],
625+
null,
626+
null
599627
), { AggregateMetric value ->
600628
value.getHitCount() == 1 && value.getDuration() == duration
601629
})
@@ -650,7 +678,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
650678
false,
651679
true,
652680
"garply",
653-
[]
681+
[],
682+
null,
683+
null
654684
), { AggregateMetric value ->
655685
value.getHitCount() == 1 && value.getDuration() == duration
656686
})
@@ -852,7 +882,9 @@ class ConflatingMetricAggregatorTest extends DDSpecification {
852882
false,
853883
true,
854884
"",
855-
[]
885+
[],
886+
null,
887+
null
856888
), { AggregateMetric aggregateMetric ->
857889
aggregateMetric.getHitCount() == 1 && aggregateMetric.getTopLevelCount() == 1 && aggregateMetric.getDuration() == 100
858890
})

‎dd-trace-core/src/test/groovy/datadog/trace/common/metrics/SerializingMetricWriterTest.groovy‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ class SerializingMetricWriterTest extends DDSpecification {
5757
UTF8BytesString.create("country:canada"),
5858
UTF8BytesString.create("georegion:amer"),
5959
UTF8BytesString.create("peer.service:remote-service")
60-
]
60+
],
61+
null,
62+
null
6163
),
6264
new AggregateMetric().recordDurations(10, new AtomicLongArray(1L))
6365
),
@@ -76,6 +78,8 @@ class SerializingMetricWriterTest extends DDSpecification {
7678
UTF8BytesString.create("georegion:amer"),
7779
UTF8BytesString.create("peer.service:remote-service")
7880
],
81+
null,
82+
null
7983
),
8084
new AggregateMetric().recordDurations(9, new AtomicLongArray(1L))
8185
)
@@ -91,7 +95,9 @@ class SerializingMetricWriterTest extends DDSpecification {
9195
false,
9296
false,
9397
"producer",
94-
[UTF8BytesString.create("messaging.destination:dest" + i)]
98+
[UTF8BytesString.create("messaging.destination:dest" + i)],
99+
null,
100+
null
95101
),
96102
new AggregateMetric().recordDurations(10, new AtomicLongArray(1L))
97103
)

0 commit comments

Comments
 (0)