test stable semconv

Author: trask

instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts

@@ -24,4 +24,12 @@ tasks {
   withType<Test>().configureEach {
     usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
   }
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+  }
+
+  check {
+    dependsOn(testStableSemconv)
+  }
 }

instrumentation/vertx/vertx-redis-client-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/vertx/v4_0/redis/VertxRedisClientTest.java

@@ -8,9 +8,11 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.semconv.NetworkAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
@@ -200,15 +202,28 @@ void commandWithNoArguments() throws Exception {
   }
 
   private static AttributeAssertion[] redisSpanAttributes(String operation, String statement) {
-    return new AttributeAssertion[] {
-      equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
-      equalTo(DbIncubatingAttributes.DB_STATEMENT, statement),
-      equalTo(DbIncubatingAttributes.DB_OPERATION, operation),
-      equalTo(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, 1),
-      equalTo(ServerAttributes.SERVER_ADDRESS, host),
-      equalTo(ServerAttributes.SERVER_PORT, port),
-      equalTo(NetworkAttributes.NETWORK_PEER_PORT, port),
-      equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip)
-    };
+    if (SemconvStabilityUtil.isStable()) {
+      return new AttributeAssertion[] {
+          equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
+          equalTo(AttributeKey.stringKey("db.query.text"), statement),
+          equalTo(AttributeKey.stringKey("db.operation.name"), operation),
+          equalTo(AttributeKey.stringKey("db.namespace"), "1"),
+          equalTo(ServerAttributes.SERVER_ADDRESS, host),
+          equalTo(ServerAttributes.SERVER_PORT, port),
+          equalTo(NetworkAttributes.NETWORK_PEER_PORT, port),
+          equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip)
+      };
+    } else {
+      return new AttributeAssertion[] {
+          equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
+          equalTo(DbIncubatingAttributes.DB_STATEMENT, statement),
+          equalTo(DbIncubatingAttributes.DB_OPERATION, operation),
+          equalTo(DbIncubatingAttributes.DB_REDIS_DATABASE_INDEX, 1),
+          equalTo(ServerAttributes.SERVER_ADDRESS, host),
+          equalTo(ServerAttributes.SERVER_PORT, port),
+          equalTo(NetworkAttributes.NETWORK_PEER_PORT, port),
+          equalTo(NetworkAttributes.NETWORK_PEER_ADDRESS, ip)
+      };
+    }
   }
 }