fix

Author: trask

instrumentation/jdbc/library/src/test/java/io/opentelemetry/instrumentation/jdbc/datasource/JdbcTelemetryTest.java

@@ -64,8 +64,8 @@ void buildWithDefaults() throws SQLException {
                 span -> span.hasName("parent"),
                 span ->
                     span.hasName(spanName)
-                        .hasAttribute(equalTo(maybeStable(DB_STATEMENT), "SELECT ?;"))
-                        .hasAttribute(
+                        .hasAttributesSatisfying(
+                            equalTo(maybeStable(DB_STATEMENT), "SELECT ?;"),
                             equalTo(
                                 DB_QUERY_SUMMARY,
                                 SemconvStability.emitStableDatabaseSemconv() ? spanName : null))));
@@ -234,8 +234,8 @@ void buildWithSanitizationDisabled() throws SQLException {
                 span -> span.hasName("parent"),
                 span ->
                     span.hasName(spanName)
-                        .hasAttribute(equalTo(maybeStable(DB_STATEMENT), "SELECT 1;"))
-                        .hasAttribute(
+                        .hasAttributesSatisfying(
+                            equalTo(maybeStable(DB_STATEMENT), "SELECT 1;"),
                             equalTo(
                                 DB_QUERY_SUMMARY,
                                 SemconvStability.emitStableDatabaseSemconv() ? spanName : null))));

instrumentation/jdbc/testing/src/main/java/io/opentelemetry/instrumentation/jdbc/testing/AbstractPreparedStatementParametersTest.java

@@ -10,6 +10,7 @@
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStableDbSystemName;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
@@ -19,8 +20,6 @@
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
 import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
 
-import static io.opentelemetry.semconv.DbAttributes.DB_QUERY_SUMMARY;
-
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import io.opentelemetry.api.trace.SpanKind;