jdbc

Author: trask

instrumentation/jdbc/javaagent/build.gradle.kts

@@ -67,7 +67,25 @@ tasks {
     jvmArgs("-Dotel.instrumentation.jdbc-datasource.enabled=true")
   }
 
+  val testStableSemconv by registering(Test::class) {
+    filter {
+      excludeTestsMatching("SlickTest")
+    }
+    jvmArgs("-Dotel.instrumentation.jdbc-datasource.enabled=true")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  val testSlickStableSemconv by registering(Test::class) {
+    filter {
+      includeTestsMatching("SlickTest")
+    }
+    include("**/SlickTest.*")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
   check {
     dependsOn(testSlick)
+    dependsOn(testStableSemconv)
+    dependsOn(testSlickStableSemconv)
   }
 }

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

@@ -378,7 +378,9 @@ public void testBasicStatement(
                             satisfies(
                                 DB_USER,
                                 val -> {
-                                  if (username != null) {
+                                  if (emitStableDatabaseSemconv()) {
+                                    val.isNull();
+                                  } else {
                                     val.isEqualTo(username);
                                   }
                                 }),
@@ -503,7 +505,9 @@ void testPreparedStatementExecute(
                             satisfies(
                                 DB_USER,
                                 val -> {
-                                  if (username != null) {
+                                  if (emitStableDatabaseSemconv()) {
+                                    val.isNull();
+                                  } else {
                                     val.isEqualTo(username);
                                   }
                                 }),
@@ -546,7 +550,9 @@ void testPreparedStatementQuery(
                             satisfies(
                                 DB_USER,
                                 val -> {
-                                  if (username != null) {
+                                  if (emitStableDatabaseSemconv()) {
+                                    val.isNull();
+                                  } else {
                                     val.isEqualTo(username);
                                   }
                                 }),
@@ -589,7 +595,9 @@ void testPreparedCall(
                             satisfies(
                                 DB_USER,
                                 val -> {
-                                  if (username != null) {
+                                  if (emitStableDatabaseSemconv()) {
+                                    val.isNull();
+                                  } else {
                                     val.isEqualTo(username);
                                   }
                                 }),
@@ -731,7 +739,9 @@ void testStatementUpdate(
                             satisfies(
                                 DB_USER,
                                 val -> {
-                                  if (username != null) {
+                                  if (emitStableDatabaseSemconv()) {
+                                    val.isNull();
+                                  } else {
                                     val.isEqualTo(username);
                                   }
                                 }),
@@ -839,7 +849,9 @@ void testPreparedStatementUpdate(
                             satisfies(
                                 DB_USER,
                                 val -> {
-                                  if (username != null) {
+                                  if (emitStableDatabaseSemconv()) {
+                                    val.isNull();
+                                  } else {
                                     val.isEqualTo(username);
                                   }
                                 }),
@@ -952,7 +964,9 @@ void testConnectionConstructorThrowing(
                             satisfies(
                                 DB_USER,
                                 val -> {
-                                  if (username != null) {
+                                  if (emitStableDatabaseSemconv()) {
+                                    val.isNull();
+                                  } else {
                                     val.isEqualTo(username);
                                   }
                                 }),
@@ -1027,7 +1041,9 @@ void testGetConnection(
                                   satisfies(
                                       DB_USER,
                                       val -> {
-                                        if (user != null) {
+                                        if (emitStableDatabaseSemconv()) {
+                                          val.isNull();
+                                        } else {
                                           val.isEqualTo(user);
                                         }
                                       }),
@@ -1050,7 +1066,9 @@ void testGetConnection(
                             satisfies(
                                 DB_USER,
                                 val -> {
-                                  if (user != null) {
+                                  if (emitStableDatabaseSemconv()) {
+                                    val.isNull();
+                                  } else {
                                     val.isEqualTo(user);
                                   }
                                 }),
@@ -1225,7 +1243,7 @@ void testConnectionCached(String connectionPoolName) throws SQLException {
                         .hasAttributesSatisfying(
                             equalTo(DB_SYSTEM, "hsqldb"),
                             equalTo(maybeStable(DB_NAME), dbNameLower),
-                            equalTo(DB_USER, "SA"),
+                            equalTo(DB_USER, emitStableDatabaseSemconv() ? null : "SA"),
                             equalTo(
                                 DB_CONNECTION_STRING,
                                 emitStableDatabaseSemconv() ? null : "hsqldb:mem:"),