Skip to content

Commit 57d8e2f

Browse files
trasktrask
committed
simplify
1 parent e478ba4 commit 57d8e2f

File tree

1 file changed

+9
-82
lines changed

1 file changed

+9
-82
lines changed

‎instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/JdbcInstrumentationTest.java‎

Lines changed: 9 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
99
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
1010
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
11-
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
1211
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1312
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
1413
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
@@ -375,15 +374,7 @@ public void testBasicStatement(
375374
.hasAttributesSatisfyingExactly(
376375
equalTo(DB_SYSTEM, system),
377376
equalTo(maybeStable(DB_NAME), dbNameLower),
378-
satisfies(
379-
DB_USER,
380-
val -> {
381-
if (emitStableDatabaseSemconv()) {
382-
val.isNull();
383-
} else {
384-
val.isEqualTo(username);
385-
}
386-
}),
377+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username),
387378
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
388379
equalTo(maybeStable(DB_STATEMENT), sanitizedQuery),
389380
equalTo(maybeStable(DB_OPERATION), "SELECT"),
@@ -502,15 +493,7 @@ void testPreparedStatementExecute(
502493
.hasAttributesSatisfying(
503494
equalTo(DB_SYSTEM, system),
504495
equalTo(maybeStable(DB_NAME), dbNameLower),
505-
satisfies(
506-
DB_USER,
507-
val -> {
508-
if (emitStableDatabaseSemconv()) {
509-
val.isNull();
510-
} else {
511-
val.isEqualTo(username);
512-
}
513-
}),
496+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username),
514497
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
515498
equalTo(maybeStable(DB_STATEMENT), sanitizedQuery),
516499
equalTo(maybeStable(DB_OPERATION), "SELECT"),
@@ -547,15 +530,7 @@ void testPreparedStatementQuery(
547530
.hasAttributesSatisfying(
548531
equalTo(DB_SYSTEM, system),
549532
equalTo(maybeStable(DB_NAME), dbNameLower),
550-
satisfies(
551-
DB_USER,
552-
val -> {
553-
if (emitStableDatabaseSemconv()) {
554-
val.isNull();
555-
} else {
556-
val.isEqualTo(username);
557-
}
558-
}),
533+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username),
559534
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
560535
equalTo(maybeStable(DB_STATEMENT), sanitizedQuery),
561536
equalTo(maybeStable(DB_OPERATION), "SELECT"),
@@ -592,15 +567,7 @@ void testPreparedCall(
592567
.hasAttributesSatisfying(
593568
equalTo(DB_SYSTEM, system),
594569
equalTo(maybeStable(DB_NAME), dbNameLower),
595-
satisfies(
596-
DB_USER,
597-
val -> {
598-
if (emitStableDatabaseSemconv()) {
599-
val.isNull();
600-
} else {
601-
val.isEqualTo(username);
602-
}
603-
}),
570+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username),
604571
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
605572
equalTo(maybeStable(DB_STATEMENT), sanitizedQuery),
606573
equalTo(maybeStable(DB_OPERATION), "SELECT"),
@@ -736,15 +703,7 @@ void testStatementUpdate(
736703
.hasAttributesSatisfying(
737704
equalTo(DB_SYSTEM, system),
738705
equalTo(maybeStable(DB_NAME), dbNameLower),
739-
satisfies(
740-
DB_USER,
741-
val -> {
742-
if (emitStableDatabaseSemconv()) {
743-
val.isNull();
744-
} else {
745-
val.isEqualTo(username);
746-
}
747-
}),
706+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username),
748707
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
749708
equalTo(maybeStable(DB_STATEMENT), query),
750709
equalTo(maybeStable(DB_OPERATION), "CREATE TABLE"),
@@ -846,15 +805,7 @@ void testPreparedStatementUpdate(
846805
.hasAttributesSatisfying(
847806
equalTo(DB_SYSTEM, system),
848807
equalTo(maybeStable(DB_NAME), dbNameLower),
849-
satisfies(
850-
DB_USER,
851-
val -> {
852-
if (emitStableDatabaseSemconv()) {
853-
val.isNull();
854-
} else {
855-
val.isEqualTo(username);
856-
}
857-
}),
808+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username),
858809
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
859810
equalTo(maybeStable(DB_STATEMENT), query),
860811
equalTo(maybeStable(DB_OPERATION), "CREATE TABLE"),
@@ -961,15 +912,7 @@ void testConnectionConstructorThrowing(
961912
.hasAttributesSatisfying(
962913
equalTo(DB_SYSTEM, system),
963914
equalTo(maybeStable(DB_NAME), dbNameLower),
964-
satisfies(
965-
DB_USER,
966-
val -> {
967-
if (emitStableDatabaseSemconv()) {
968-
val.isNull();
969-
} else {
970-
val.isEqualTo(username);
971-
}
972-
}),
915+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : username),
973916
equalTo(DB_CONNECTION_STRING, emitStableDatabaseSemconv() ? null : url),
974917
equalTo(maybeStable(DB_STATEMENT), sanitizedQuery),
975918
equalTo(maybeStable(DB_OPERATION), "SELECT"),
@@ -1038,15 +981,7 @@ void testGetConnection(
1038981
datasource.getClass().getName()),
1039982
equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "getConnection"),
1040983
equalTo(DB_SYSTEM, system),
1041-
satisfies(
1042-
DB_USER,
1043-
val -> {
1044-
if (emitStableDatabaseSemconv()) {
1045-
val.isNull();
1046-
} else {
1047-
val.isEqualTo(user);
1048-
}
1049-
}),
984+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : user),
1050985
equalTo(maybeStable(DB_NAME), "jdbcunittest"),
1051986
equalTo(
1052987
DB_CONNECTION_STRING,
@@ -1063,15 +998,7 @@ void testGetConnection(
1063998
datasource.getClass().getName()),
1064999
equalTo(CodeIncubatingAttributes.CODE_FUNCTION, "getConnection"),
10651000
equalTo(DB_SYSTEM, system),
1066-
satisfies(
1067-
DB_USER,
1068-
val -> {
1069-
if (emitStableDatabaseSemconv()) {
1070-
val.isNull();
1071-
} else {
1072-
val.isEqualTo(user);
1073-
}
1074-
}),
1001+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : user),
10751002
equalTo(maybeStable(DB_NAME), "jdbcunittest"),
10761003
equalTo(
10771004
DB_CONNECTION_STRING,

0 commit comments

Comments
 (0)