Skip to content

Commit eeb544b

Browse files
trasktrask
committed
Convert 3-arg waitAndAssertMetrics to 2-arg form where applicable
Mechanical conversion: wherever the body was metrics -> metrics.anySatisfy(metric -> assertThat(metric).X) it becomes metric -> metric.hasName(NAME).X Skips call sites that use isEmpty, hasSize, satisfiesExactly, etc. on the metrics list.
1 parent b13eb10 commit eeb544b

50 files changed

Lines changed: 3274 additions & 3807 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java‎

Lines changed: 126 additions & 146 deletions
Large diffs are not rendered by default.

‎instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java‎

Lines changed: 160 additions & 183 deletions
Large diffs are not rendered by default.

‎instrumentation/avaje-jex-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/avaje/jex/v3_0/JexTest.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,12 @@ void testHttpRouteMetricWithPathParamResponseSuccessful() {
121121
assertThat(response.status().code()).isEqualTo(200);
122122
testing.waitAndAssertMetrics(
123123
instrumentation,
124-
"http.server.request.duration",
125-
metrics ->
126-
metrics.anySatisfy(
127-
metric ->
128-
assertThat(metric)
129-
.hasHistogramSatisfying(
130-
histogram ->
131-
histogram.hasPointsSatisfying(
132-
point -> point.hasAttribute(HTTP_ROUTE, "/test/param/{id}")))));
124+
metric ->
125+
metric
126+
.hasName("http.server.request.duration")
127+
.hasHistogramSatisfying(
128+
histogram ->
129+
histogram.hasPointsSatisfying(
130+
point -> point.hasAttribute(HTTP_ROUTE, "/test/param/{id}"))));
133131
}
134132
}

‎instrumentation/dropwizard/dropwizard-metrics-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/dropwizardmetrics/v4_0/DropwizardMetricsTest.java‎

Lines changed: 28 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.javaagent.instrumentation.dropwizardmetrics.v4_0;
77

8-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
98
import static java.util.concurrent.TimeUnit.MILLISECONDS;
109
import static java.util.concurrent.TimeUnit.NANOSECONDS;
1110
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -42,13 +41,10 @@ void gauge() throws InterruptedException {
4241
// then
4342
testing.waitAndAssertMetrics(
4443
INSTRUMENTATION_NAME,
45-
"testgauge",
46-
metrics ->
47-
metrics.anySatisfy(
48-
metric ->
49-
assertThat(metric)
50-
.hasDoubleGaugeSatisfying(
51-
g -> g.hasPointsSatisfying(point -> point.hasValue(42)))));
44+
metric ->
45+
metric
46+
.hasName("testgauge")
47+
.hasDoubleGaugeSatisfying(g -> g.hasPointsSatisfying(point -> point.hasValue(42))));
5248

5349
// when
5450
metricRegistry.remove("test'gauge");
@@ -75,15 +71,11 @@ void counter() throws InterruptedException {
7571
// then
7672
testing.waitAndAssertMetrics(
7773
INSTRUMENTATION_NAME,
78-
"testcounter",
79-
metrics ->
80-
metrics.anySatisfy(
81-
metric ->
82-
assertThat(metric)
83-
.hasLongSumSatisfying(
84-
sum ->
85-
sum.isNotMonotonic()
86-
.hasPointsSatisfying(point -> point.hasValue(7)))));
74+
metric ->
75+
metric
76+
.hasName("testcounter")
77+
.hasLongSumSatisfying(
78+
sum -> sum.isNotMonotonic().hasPointsSatisfying(point -> point.hasValue(7))));
8779
testing.clearData();
8880

8981
// when
@@ -109,15 +101,13 @@ void histogram() throws InterruptedException {
109101
// then
110102
testing.waitAndAssertMetrics(
111103
INSTRUMENTATION_NAME,
112-
"testhistogram",
113-
metrics ->
114-
metrics.anySatisfy(
115-
metric ->
116-
assertThat(metric)
117-
.hasHistogramSatisfying(
118-
histogramMetric ->
119-
histogramMetric.hasPointsSatisfying(
120-
point -> point.hasSum(42).hasCount(2)))));
104+
metric ->
105+
metric
106+
.hasName("testhistogram")
107+
.hasHistogramSatisfying(
108+
histogramMetric ->
109+
histogramMetric.hasPointsSatisfying(
110+
point -> point.hasSum(42).hasCount(2))));
121111
testing.clearData();
122112

123113
// when
@@ -143,15 +133,11 @@ void meter() throws InterruptedException {
143133
// then
144134
testing.waitAndAssertMetrics(
145135
INSTRUMENTATION_NAME,
146-
"testmeter",
147-
metrics ->
148-
metrics.anySatisfy(
149-
metric ->
150-
assertThat(metric)
151-
.hasLongSumSatisfying(
152-
sum ->
153-
sum.isMonotonic()
154-
.hasPointsSatisfying(point -> point.hasValue(12)))));
136+
metric ->
137+
metric
138+
.hasName("testmeter")
139+
.hasLongSumSatisfying(
140+
sum -> sum.isMonotonic().hasPointsSatisfying(point -> point.hasValue(12))));
155141
testing.clearData();
156142

157143
// when
@@ -178,16 +164,13 @@ void timer() throws InterruptedException {
178164
// then
179165
testing.waitAndAssertMetrics(
180166
INSTRUMENTATION_NAME,
181-
"testtimer",
182-
metrics ->
183-
metrics.anySatisfy(
184-
metric ->
185-
assertThat(metric)
186-
.hasUnit("ms")
187-
.hasHistogramSatisfying(
188-
histogram ->
189-
histogram.hasPointsSatisfying(
190-
point -> point.hasSum(1.234).hasCount(2)))));
167+
metric ->
168+
metric
169+
.hasName("testtimer")
170+
.hasUnit("ms")
171+
.hasHistogramSatisfying(
172+
histogram ->
173+
histogram.hasPointsSatisfying(point -> point.hasSum(1.234).hasCount(2))));
191174
testing.clearData();
192175

193176
// when

‎instrumentation/grpc-1.6/testing/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/AbstractGrpcStreamingTest.java‎

Lines changed: 65 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -296,98 +296,86 @@ RPC_SERVICE, emitOldRpcSemconv() ? "example.Greeter" : null),
296296
testing()
297297
.waitAndAssertMetrics(
298298
"io.opentelemetry.grpc-1.6",
299-
"rpc.server.duration",
300-
metrics ->
301-
metrics.anySatisfy(
302-
metric ->
303-
assertThat(metric)
304-
.hasUnit("ms")
305-
.hasHistogramSatisfying(
306-
histogram ->
307-
histogram.hasPointsSatisfying(
308-
point ->
309-
point.hasAttributesSatisfying(
310-
equalTo(SERVER_ADDRESS, "localhost"),
311-
equalTo(SERVER_PORT, server.getPort()),
312-
equalTo(RPC_METHOD, "Conversation"),
313-
equalTo(RPC_SERVICE, "example.Greeter"),
314-
equalTo(RPC_SYSTEM, "grpc"),
315-
equalTo(NETWORK_TYPE, "ipv4"),
316-
equalTo(
317-
RPC_GRPC_STATUS_CODE,
318-
(long) Status.Code.OK.value()))))));
299+
metric ->
300+
metric
301+
.hasName("rpc.server.duration")
302+
.hasUnit("ms")
303+
.hasHistogramSatisfying(
304+
histogram ->
305+
histogram.hasPointsSatisfying(
306+
point ->
307+
point.hasAttributesSatisfying(
308+
equalTo(SERVER_ADDRESS, "localhost"),
309+
equalTo(SERVER_PORT, server.getPort()),
310+
equalTo(RPC_METHOD, "Conversation"),
311+
equalTo(RPC_SERVICE, "example.Greeter"),
312+
equalTo(RPC_SYSTEM, "grpc"),
313+
equalTo(NETWORK_TYPE, "ipv4"),
314+
equalTo(
315+
RPC_GRPC_STATUS_CODE,
316+
(long) Status.Code.OK.value())))));
319317
}
320318
if (emitStableRpcSemconv()) {
321319
testing()
322320
.waitAndAssertMetrics(
323321
"io.opentelemetry.grpc-1.6",
324-
"rpc.server.call.duration",
325-
metrics ->
326-
metrics.anySatisfy(
327-
metric ->
328-
assertThat(metric)
329-
.hasUnit("s")
330-
.hasHistogramSatisfying(
331-
histogram ->
332-
histogram.hasPointsSatisfying(
333-
point ->
334-
point.hasAttributesSatisfyingExactly(
335-
equalTo(RPC_SYSTEM_NAME, "grpc"),
336-
equalTo(SERVER_ADDRESS, "localhost"),
337-
equalTo(SERVER_PORT, server.getPort()),
338-
equalTo(
339-
RPC_METHOD, "example.Greeter/Conversation"),
340-
equalTo(
341-
RPC_RESPONSE_STATUS_CODE,
342-
Status.Code.OK.name()))))));
322+
metric ->
323+
metric
324+
.hasName("rpc.server.call.duration")
325+
.hasUnit("s")
326+
.hasHistogramSatisfying(
327+
histogram ->
328+
histogram.hasPointsSatisfying(
329+
point ->
330+
point.hasAttributesSatisfyingExactly(
331+
equalTo(RPC_SYSTEM_NAME, "grpc"),
332+
equalTo(SERVER_ADDRESS, "localhost"),
333+
equalTo(SERVER_PORT, server.getPort()),
334+
equalTo(RPC_METHOD, "example.Greeter/Conversation"),
335+
equalTo(
336+
RPC_RESPONSE_STATUS_CODE, Status.Code.OK.name())))));
343337
}
344338
if (emitOldRpcSemconv()) {
345339
testing()
346340
.waitAndAssertMetrics(
347341
"io.opentelemetry.grpc-1.6",
348-
"rpc.client.duration",
349-
metrics ->
350-
metrics.anySatisfy(
351-
metric ->
352-
assertThat(metric)
353-
.hasUnit("ms")
354-
.hasHistogramSatisfying(
355-
histogram ->
356-
histogram.hasPointsSatisfying(
357-
point ->
358-
point.hasAttributesSatisfying(
359-
equalTo(SERVER_ADDRESS, "localhost"),
360-
equalTo(SERVER_PORT, server.getPort()),
361-
equalTo(RPC_METHOD, "Conversation"),
362-
equalTo(RPC_SERVICE, "example.Greeter"),
363-
equalTo(RPC_SYSTEM, "grpc"),
364-
equalTo(
365-
RPC_GRPC_STATUS_CODE,
366-
(long) Status.Code.OK.value()))))));
342+
metric ->
343+
metric
344+
.hasName("rpc.client.duration")
345+
.hasUnit("ms")
346+
.hasHistogramSatisfying(
347+
histogram ->
348+
histogram.hasPointsSatisfying(
349+
point ->
350+
point.hasAttributesSatisfying(
351+
equalTo(SERVER_ADDRESS, "localhost"),
352+
equalTo(SERVER_PORT, server.getPort()),
353+
equalTo(RPC_METHOD, "Conversation"),
354+
equalTo(RPC_SERVICE, "example.Greeter"),
355+
equalTo(RPC_SYSTEM, "grpc"),
356+
equalTo(
357+
RPC_GRPC_STATUS_CODE,
358+
(long) Status.Code.OK.value())))));
367359
}
368360
if (emitStableRpcSemconv()) {
369361
testing()
370362
.waitAndAssertMetrics(
371363
"io.opentelemetry.grpc-1.6",
372-
"rpc.client.call.duration",
373-
metrics ->
374-
metrics.anySatisfy(
375-
metric ->
376-
assertThat(metric)
377-
.hasUnit("s")
378-
.hasHistogramSatisfying(
379-
histogram ->
380-
histogram.hasPointsSatisfying(
381-
point ->
382-
point.hasAttributesSatisfying(
383-
equalTo(RPC_SYSTEM_NAME, "grpc"),
384-
equalTo(SERVER_ADDRESS, "localhost"),
385-
equalTo(SERVER_PORT, server.getPort()),
386-
equalTo(
387-
RPC_METHOD, "example.Greeter/Conversation"),
388-
equalTo(
389-
RPC_RESPONSE_STATUS_CODE,
390-
Status.Code.OK.name()))))));
364+
metric ->
365+
metric
366+
.hasName("rpc.client.call.duration")
367+
.hasUnit("s")
368+
.hasHistogramSatisfying(
369+
histogram ->
370+
histogram.hasPointsSatisfying(
371+
point ->
372+
point.hasAttributesSatisfying(
373+
equalTo(RPC_SYSTEM_NAME, "grpc"),
374+
equalTo(SERVER_ADDRESS, "localhost"),
375+
equalTo(SERVER_PORT, server.getPort()),
376+
equalTo(RPC_METHOD, "example.Greeter/Conversation"),
377+
equalTo(
378+
RPC_RESPONSE_STATUS_CODE, Status.Code.OK.name())))));
391379
}
392380
}
393381

0 commit comments

Comments
 (0)