Skip to content

Commit 20b1364

Browse files
authored
fix test
1 parent 8092e60 commit 20b1364

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

instrumentation/jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jdbc/test/DataSourceInstrumentationTest.java

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,22 @@
66
package io.opentelemetry.javaagent.instrumentation.jdbc.test;
77

88
import static io.opentelemetry.api.trace.SpanKind.INTERNAL;
9+
import static io.opentelemetry.instrumentation.api.internal.SemconvStability.emitStableDatabaseSemconv;
10+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
11+
import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName;
912
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1013
import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
1114
import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;
15+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
1216
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
1317
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
14-
import static org.assertj.core.api.Assertions.assertThat;
18+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
1519

1620
import com.alibaba.druid.pool.DruidDataSource;
1721
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
1822
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
19-
import io.opentelemetry.sdk.trace.data.SpanData;
2023
import java.sql.Connection;
2124
import java.sql.SQLException;
22-
import java.util.List;
23-
import java.util.stream.Collectors;
2425
import javax.sql.DataSource;
2526
import org.junit.jupiter.api.AfterEach;
2627
import org.junit.jupiter.api.BeforeEach;
@@ -73,20 +74,14 @@ void testDruidDataSourceGetConnection() throws SQLException {
7374
span.hasName("DruidDataSource.getConnection")
7475
.hasKind(INTERNAL)
7576
.hasParent(trace.getSpan(0))
76-
.hasAttributesSatisfying(
77+
.hasAttributesSatisfyingExactly(
7778
equalTo(CODE_NAMESPACE, "com.alibaba.druid.pool.DruidDataSource"),
7879
equalTo(CODE_FUNCTION, "getConnection"),
79-
equalTo(DB_SYSTEM, "h2"),
80-
equalTo(DB_NAME, "test"))));
81-
82-
List<SpanData> spans = testing.spans();
83-
List<SpanData> dataSourceSpans =
84-
spans.stream()
85-
.filter(span -> span.getName().equals("DruidDataSource.getConnection"))
86-
.collect(Collectors.toList());
87-
88-
assertThat(dataSourceSpans)
89-
.as("Should have exactly one DruidDataSource.getConnection span, not duplicates")
90-
.hasSize(1);
80+
equalTo(
81+
DB_CONNECTION_STRING,
82+
emitStableDatabaseSemconv() ? null : "h2:mem:"),
83+
equalTo(maybeStable(DB_NAME), "test"),
84+
equalTo(maybeStable(DB_SYSTEM), maybeStableDbSystemName("h2")),
85+
equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "sa"))));
9186
}
9287
}

0 commit comments

Comments
 (0)