wip

Author: SylvainJuge

smoke-tests-otel-starter/spring-boot-common/src/main/java/io/opentelemetry/spring/smoketest/AbstractOtelSpringStarterSmokeTest.java

@@ -12,6 +12,7 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelResourceProperties;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtelSpringProperties;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.OtlpExporterProperties;
@@ -26,6 +27,7 @@
 import io.opentelemetry.semconv.HttpAttributes;
 import io.opentelemetry.semconv.ServerAttributes;
 import io.opentelemetry.semconv.UrlAttributes;
+import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.DbIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
 import java.net.URI;
@@ -35,6 +37,7 @@
 import java.util.List;
 import org.assertj.core.api.AbstractCharSequenceAssert;
 import org.assertj.core.api.AbstractIterableAssert;
+import org.assertj.core.api.MapAssert;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
@@ -147,6 +150,7 @@ void propertyConversion() {
 
   @Test
   @org.junit.jupiter.api.Order(1)
+  @SuppressWarnings("deprecation") // testing deprecated code semconv
   void shouldSendTelemetry() {
     HttpHeaders headers = new HttpHeaders();
     headers.add("key", "value");
@@ -246,11 +250,22 @@ void shouldSendTelemetry() {
           .as("Should instrument logs")
           .startsWith("Starting ")
           .contains(this.getClass().getSimpleName());
-      assertThat(firstLog.getAttributes().asMap())
-          .as("Should capture code attributes")
-          .containsEntry(
-              CodeAttributes.CODE_FUNCTION_NAME,
-              "org.springframework.boot.StartupInfoLogger.logStarting");
+
+      MapAssert<AttributeKey<?>, Object> attributesAssert =
+          assertThat(firstLog.getAttributes().asMap()).as("Should capture code attributes");
+
+      if (SemconvStability.emitStableDatabaseSemconv()) {
+        attributesAssert.containsEntry(
+            CodeAttributes.CODE_FUNCTION_NAME,
+            "org.springframework.boot.StartupInfoLogger.logStarting");
+      }
+      if (SemconvStability.isEmitOldCodeSemconv()) {
+        attributesAssert
+            .containsEntry(
+                CodeIncubatingAttributes.CODE_NAMESPACE,
+                "org.springframework.boot.StartupInfoLogger")
+            .containsEntry(CodeIncubatingAttributes.CODE_FUNCTION, "logStarting");
+      }
     }
   }