Skip to content

Commit d327900

Browse files
trasktrask
committed
Simplify test
1 parent 48fd7ef commit d327900

File tree

2 files changed

+25
-78
lines changed

2 files changed

+25
-78
lines changed

‎instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonAsyncClientTest.java‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import io.opentelemetry.api.trace.Span;
1616
import io.opentelemetry.api.trace.SpanKind;
17+
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1718
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1819
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1920
import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil;
@@ -118,10 +119,7 @@ void futureSet() throws ExecutionException, InterruptedException, TimeoutExcepti
118119
.hasAttributesSatisfyingExactly(
119120
equalTo(
120121
NetworkAttributes.NETWORK_TYPE,
121-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
122-
== null
123-
? null
124-
: "ipv4"),
122+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
125123
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
126124
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
127125
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -146,7 +144,8 @@ void futureWhenComplete() throws ExecutionException, InterruptedException, Timeo
146144
return future.whenComplete(
147145
(res, throwable) -> {
148146
assertThat(Span.current().getSpanContext().isValid()).isTrue();
149-
testing.runWithSpan("callback", () -> {});
147+
testing.runWithSpan("callback", () -> {
148+
});
150149
});
151150
});
152151
result.toCompletableFuture().get(30, TimeUnit.SECONDS);
@@ -162,10 +161,7 @@ void futureWhenComplete() throws ExecutionException, InterruptedException, Timeo
162161
.hasAttributesSatisfyingExactly(
163162
equalTo(
164163
NetworkAttributes.NETWORK_TYPE,
165-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
166-
== null
167-
? null
168-
: "ipv4"),
164+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
169165
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
170166
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
171167
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -231,7 +227,8 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo
231227
return batchResultFuture.whenComplete(
232228
(res, throwable) -> {
233229
assertThat(Span.current().getSpanContext().isValid()).isTrue();
234-
testing.runWithSpan("callback", () -> {});
230+
testing.runWithSpan("callback", () -> {
231+
});
235232
});
236233
});
237234
result.toCompletableFuture().get(30, TimeUnit.SECONDS);
@@ -247,10 +244,7 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo
247244
.hasAttributesSatisfyingExactly(
248245
equalTo(
249246
NetworkAttributes.NETWORK_TYPE,
250-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
251-
== null
252-
? null
253-
: "ipv4"),
247+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
254248
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
255249
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
256250
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -265,10 +259,7 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo
265259
.hasAttributesSatisfyingExactly(
266260
equalTo(
267261
NetworkAttributes.NETWORK_TYPE,
268-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
269-
== null
270-
? null
271-
: "ipv4"),
262+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
272263
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
273264
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
274265
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -287,10 +278,7 @@ void atomicBatchCommand() throws ExecutionException, InterruptedException, Timeo
287278
.hasAttributesSatisfyingExactly(
288279
equalTo(
289280
NetworkAttributes.NETWORK_TYPE,
290-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
291-
== null
292-
? null
293-
: "ipv4"),
281+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
294282
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
295283
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
296284
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),

‎instrumentation/redisson/redisson-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/redisson/AbstractRedissonClientTest.java‎

Lines changed: 15 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import static org.assertj.core.api.Assertions.assertThat;
1515

1616
import io.opentelemetry.api.trace.SpanKind;
17+
import io.opentelemetry.instrumentation.api.internal.SemconvStability;
1718
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1819
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1920
import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil;
@@ -121,10 +122,7 @@ void stringCommand() {
121122
.hasAttributesSatisfyingExactly(
122123
equalTo(
123124
NetworkAttributes.NETWORK_TYPE,
124-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
125-
== null
126-
? null
127-
: "ipv4"),
125+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
128126
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
129127
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
130128
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -144,10 +142,7 @@ void stringCommand() {
144142
.hasAttributesSatisfyingExactly(
145143
equalTo(
146144
NetworkAttributes.NETWORK_TYPE,
147-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
148-
== null
149-
? null
150-
: "ipv4"),
145+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
151146
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
152147
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
153148
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -181,10 +176,7 @@ void batchCommand()
181176
.hasAttributesSatisfyingExactly(
182177
equalTo(
183178
NetworkAttributes.NETWORK_TYPE,
184-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
185-
== null
186-
? null
187-
: "ipv4"),
179+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
188180
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
189181
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
190182
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -229,10 +221,7 @@ void atomicBatchCommand() {
229221
.hasAttributesSatisfyingExactly(
230222
equalTo(
231223
NetworkAttributes.NETWORK_TYPE,
232-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
233-
== null
234-
? null
235-
: "ipv4"),
224+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
236225
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
237226
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
238227
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -247,10 +236,7 @@ void atomicBatchCommand() {
247236
.hasAttributesSatisfyingExactly(
248237
equalTo(
249238
NetworkAttributes.NETWORK_TYPE,
250-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
251-
== null
252-
? null
253-
: "ipv4"),
239+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
254240
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
255241
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
256242
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -269,10 +255,7 @@ void atomicBatchCommand() {
269255
.hasAttributesSatisfyingExactly(
270256
equalTo(
271257
NetworkAttributes.NETWORK_TYPE,
272-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
273-
== null
274-
? null
275-
: "ipv4"),
258+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
276259
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
277260
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
278261
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -302,10 +285,7 @@ void listCommand() {
302285
.hasAttributesSatisfyingExactly(
303286
equalTo(
304287
NetworkAttributes.NETWORK_TYPE,
305-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
306-
== null
307-
? null
308-
: "ipv4"),
288+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
309289
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
310290
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
311291
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -338,10 +318,7 @@ void hashCommand() {
338318
.hasAttributesSatisfyingExactly(
339319
equalTo(
340320
NetworkAttributes.NETWORK_TYPE,
341-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
342-
== null
343-
? null
344-
: "ipv4"),
321+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
345322
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
346323
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
347324
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -361,10 +338,7 @@ void hashCommand() {
361338
.hasAttributesSatisfyingExactly(
362339
equalTo(
363340
NetworkAttributes.NETWORK_TYPE,
364-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
365-
== null
366-
? null
367-
: "ipv4"),
341+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
368342
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
369343
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
370344
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -393,10 +367,7 @@ void setCommand() {
393367
.hasAttributesSatisfyingExactly(
394368
equalTo(
395369
NetworkAttributes.NETWORK_TYPE,
396-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
397-
== null
398-
? null
399-
: "ipv4"),
370+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
400371
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
401372
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
402373
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -433,10 +404,7 @@ void sortedSetCommand()
433404
.hasAttributesSatisfyingExactly(
434405
equalTo(
435406
NetworkAttributes.NETWORK_TYPE,
436-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
437-
== null
438-
? null
439-
: "ipv4"),
407+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
440408
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
441409
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
442410
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -470,10 +438,7 @@ void atomicLongCommand() {
470438
.hasAttributesSatisfyingExactly(
471439
equalTo(
472440
NetworkAttributes.NETWORK_TYPE,
473-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
474-
== null
475-
? null
476-
: "ipv4"),
441+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
477442
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
478443
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
479444
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -507,10 +472,7 @@ void lockCommand() {
507472
.hasAttributesSatisfyingExactly(
508473
equalTo(
509474
NetworkAttributes.NETWORK_TYPE,
510-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
511-
== null
512-
? null
513-
: "ipv4"),
475+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
514476
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
515477
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
516478
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
@@ -531,10 +493,7 @@ void lockCommand() {
531493
.hasAttributesSatisfyingExactly(
532494
equalTo(
533495
NetworkAttributes.NETWORK_TYPE,
534-
SemconvStabilityUtil.getAttributeKey(NetworkAttributes.NETWORK_TYPE)
535-
== null
536-
? null
537-
: "ipv4"),
496+
SemconvStability.emitOldDatabaseSemconv() ? "ipv4" : null),
538497
equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip),
539498
equalTo(NetworkAttributes.NETWORK_PEER_PORT, (long) port),
540499
equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),

0 commit comments

Comments
 (0)