simplify

Author: trask

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

@@ -10,6 +10,7 @@
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil;
@@ -202,7 +203,8 @@ void commandWithNoArguments() throws Exception {
   }
 
   private static AttributeAssertion[] redisSpanAttributes(String operation, String statement) {
-    if (SemconvStabilityUtil.isStable()) {
+    // not testing database/dup
+    if (SemconvStability.emitStableDatabaseSemconv()) {
       return new AttributeAssertion[] {
         equalTo(DbIncubatingAttributes.DB_SYSTEM, "redis"),
         equalTo(AttributeKey.stringKey("db.query.text"), statement),

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/db/SemconvStabilityUtil.java

@@ -47,13 +47,10 @@ private static <T> void addKey(
 
   @SuppressWarnings("unchecked")
   public static <T> AttributeKey<T> getAttributeKey(AttributeKey<T> oldKey) {
-    if (isStable()) {
+    // not testing database/dup
+    if (SemconvStability.emitStableDatabaseSemconv()) {
       return (AttributeKey<T>) oldToNewMap.get(oldKey);
     }
     return oldKey;
   }
-
-  public static boolean isStable() {
-    return SemconvStability.emitStableDatabaseSemconv();
-  }
 }