wip

Author: SylvainJuge

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts

@@ -78,7 +78,7 @@ tasks {
   }
 
   val testStableSemconv by registering(Test::class) {
-    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
   }
 
   check {

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java

@@ -7,6 +7,7 @@
 
 import static io.opentelemetry.api.common.AttributeKey.longKey;
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
+import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionAssertions;
 import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
@@ -17,7 +18,6 @@
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
-import io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import java.io.File;
@@ -310,6 +310,6 @@ void crud() {
   }
 
   private static List<AttributeAssertion> assertFunctionName(String methodName) {
-    return SemconvCodeStabilityUtil.codeFunctionAssertions(DocRepository.class, methodName);
+    return codeFunctionAssertions(DocRepository.class, methodName);
   }
 }

instrumentation/logback/logback-appender-1.0/library/build.gradle.kts

@@ -145,8 +145,18 @@ testing {
 }
 
 tasks {
+
+  val testStableSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=code")
+  }
+
+  val testBothSemconv by registering(Test::class) {
+    jvmArgs("-Dotel.semconv-stability.opt-in=code/dup")
+  }
+
   check {
-    dependsOn(testing.suites)
+    dependsOn(testStableSemconv)
+    dependsOn(testBothSemconv)
   }
 }
 

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/code/SemconvCodeStabilityUtil.java

@@ -8,9 +8,9 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 
+import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.StringAssertConsumer;
 import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
-import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
 import io.opentelemetry.semconv.CodeAttributes;
 import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
 import java.util.ArrayList;
@@ -38,9 +38,9 @@ public static List<AttributeAssertion> codeFileAndLineAssertions(String filePath
       assertions.add(satisfies(CodeAttributes.CODE_LINE_NUMBER, AbstractLongAssert::isPositive));
     }
     if (SemconvStability.isEmitOldCodeSemconv()) {
-      assertions.add(equalTo(CodeIncubatingAttributes.CODE_FILE_PATH, filePath));
+      assertions.add(equalTo(CodeIncubatingAttributes.CODE_FILEPATH, filePath));
       assertions.add(
-          satisfies(CodeIncubatingAttributes.CODE_LINE_NUMBER, AbstractLongAssert::isPositive));
+          satisfies(CodeIncubatingAttributes.CODE_LINENO, AbstractLongAssert::isPositive));
     }
 
     return assertions;
@@ -70,8 +70,8 @@ public static List<AttributeAssertion> codeFunctionPrefixAssertions(
   @SuppressWarnings("deprecation") // testing deprecated code semconv
   private static List<AttributeAssertion> internalFunctionAssert(
       String methodName,
-      OpenTelemetryAssertions.StringAssertConsumer functionNameAssert,
-      OpenTelemetryAssertions.StringAssertConsumer namespaceAssert) {
+      StringAssertConsumer functionNameAssert,
+      StringAssertConsumer namespaceAssert) {
     List<AttributeAssertion> assertions = new ArrayList<>();
     if (SemconvStability.isEmitStableCodeSemconv()) {
       assertions.add(satisfies(CodeAttributes.CODE_FUNCTION_NAME, functionNameAssert));
@@ -83,5 +83,16 @@ private static List<AttributeAssertion> internalFunctionAssert(
     return assertions;
   }
 
+  public static int codeAttributesLogCount() {
+    int count = 0;
+    if (SemconvStability.isEmitOldCodeSemconv()) {
+      count += 4;
+    }
+    if (SemconvStability.isEmitStableCodeSemconv()) {
+      count += 3;
+    }
+    return count;
+  }
+
   private SemconvCodeStabilityUtil() {}
 }