fix(deps): update dependency io.opentelemetry.semconv:opentelemetry-semconv to v1.30.0-rc.1 (#13116)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <[email protected]>

Author: renovate[bot]

bom-alpha/build.gradle.kts

@@ -18,11 +18,10 @@ dependencies {
   // Get the semconv version from :dependencyManagement
   val semconvConstraint = project.project(project(":dependencyManagement").path).configurations["api"].allDependencyConstraints
     .find { it.group.equals("io.opentelemetry.semconv")
-            && it.name.equals("opentelemetry-semconv") }
+            && it.name.equals("opentelemetry-semconv-incubating") }
     ?: throw Exception("semconv constraint not found")
-  val semconvVersion = semconvConstraint.version ?: throw Exception("missing version")
-  otelBom.addExtra(semconvConstraint.group, semconvConstraint.name, semconvVersion)
-  otelBom.addExtra(semconvConstraint.group, "opentelemetry-semconv-incubating", semconvVersion)
+  val semconvAlphaVersion = semconvConstraint.version ?: throw Exception("missing version")
+  otelBom.addExtra(semconvConstraint.group, "opentelemetry-semconv-incubating", semconvAlphaVersion)
 }
 
 otelBom.projectFilter.set { it.findProperty("otel.stable") != "true" }

bom/build.gradle.kts

@@ -12,6 +12,14 @@ javaPlatform {
 
 dependencies {
   api(platform("io.opentelemetry:opentelemetry-bom"))
+
+  // Get the semconv version from :dependencyManagement
+  val semconvConstraint = project.project(project(":dependencyManagement").path).configurations["api"].allDependencyConstraints
+    .find { it.group.equals("io.opentelemetry.semconv")
+        && it.name.equals("opentelemetry-semconv") }
+    ?: throw Exception("semconv constraint not found")
+  val semconvVersion = semconvConstraint.version ?: throw Exception("missing version")
+  otelBom.addExtra(semconvConstraint.group, semconvConstraint.name, semconvVersion)
 }
 
 otelBom.projectFilter.set { it.findProperty("otel.stable") == "true" }

dependencyManagement/build.gradle.kts

@@ -46,11 +46,12 @@ val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"
 val slf4jVersion = "2.0.16"
-val semConvVersion = "1.29.0-alpha"
+val semConvVersion = "1.30.0-rc.1"
+val semConvAlphaVersion =  semConvVersion.replaceFirst("(-rc.*)?$".toRegex(), "-alpha$1")
 
 val CORE_DEPENDENCIES = listOf(
   "io.opentelemetry.semconv:opentelemetry-semconv:${semConvVersion}",
-  "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvVersion}",
+  "io.opentelemetry.semconv:opentelemetry-semconv-incubating:${semConvAlphaVersion}",
   "com.google.auto.service:auto-service:${autoServiceVersion}",
   "com.google.auto.service:auto-service-annotations:${autoServiceVersion}",
   "com.google.auto.value:auto-value:${autoValueVersion}",

instrumentation-annotations-support-testing/src/main/java/io/opentelemetry/javaagent/instrumentation/otelannotations/AbstractWithSpanTest.java

@@ -19,6 +19,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
+@SuppressWarnings("deprecation") // CodeIncubatingAttributes.CODE_FUNCTION is deprecated
 public abstract class AbstractWithSpanTest<T extends U, U> {
 
   @RegisterExtension

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientCommonAttributesExtractor.java

@@ -24,6 +24,8 @@ abstract class DbClientCommonAttributesExtractor<
   private static final AttributeKey<String> DB_NAME = AttributeKey.stringKey("db.name");
   static final AttributeKey<String> DB_NAMESPACE = AttributeKey.stringKey("db.namespace");
   static final AttributeKey<String> DB_SYSTEM = AttributeKey.stringKey("db.system");
+  public static final AttributeKey<String> DB_SYSTEM_NAME =
+      AttributeKey.stringKey("db.system.name");
   private static final AttributeKey<String> DB_USER = AttributeKey.stringKey("db.user");
   private static final AttributeKey<String> DB_CONNECTION_STRING =
       AttributeKey.stringKey("db.connection_string");
@@ -37,11 +39,15 @@ abstract class DbClientCommonAttributesExtractor<
   @SuppressWarnings("deprecation") // until old db semconv are dropped
   @Override
   public void onStart(AttributesBuilder attributes, Context parentContext, REQUEST request) {
-    internalSet(attributes, DB_SYSTEM, getter.getDbSystem(request));
     if (SemconvStability.emitStableDatabaseSemconv()) {
+      internalSet(
+          attributes,
+          DB_SYSTEM_NAME,
+          SemconvStability.stableDbSystemName(getter.getDbSystem(request)));
       internalSet(attributes, DB_NAMESPACE, getter.getDbNamespace(request));
     }
     if (SemconvStability.emitOldDatabaseSemconv()) {
+      internalSet(attributes, DB_SYSTEM, getter.getDbSystem(request));
       internalSet(attributes, DB_USER, getter.getUser(request));
       internalSet(attributes, DB_NAME, getter.getDbNamespace(request));
       internalSet(attributes, DB_CONNECTION_STRING, getter.getConnectionString(request));

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsAdvice.java

@@ -28,7 +28,7 @@ static void applyClientDurationAdvice(DoubleHistogramBuilder builder) {
     ((ExtendedDoubleHistogramBuilder) builder)
         .setAttributesAdvice(
             asList(
-                DbClientCommonAttributesExtractor.DB_SYSTEM,
+                DbClientCommonAttributesExtractor.DB_SYSTEM_NAME,
                 SqlClientAttributesExtractor.DB_COLLECTION_NAME,
                 DbClientCommonAttributesExtractor.DB_NAMESPACE,
                 DbClientAttributesExtractor.DB_OPERATION_NAME,

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/code/CodeAttributesExtractorTest.java

@@ -37,6 +37,7 @@ public String getMethodName(Map<String, String> request) {
     }
   }
 
+  @SuppressWarnings("deprecation") // using deprecated semconv
   @Test
   void shouldExtractAllAttributes() {
     // given

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientAttributesExtractorTest.java

@@ -84,6 +84,7 @@ void shouldExtractAllAvailableAttributes() {
       assertThat(startAttributes.build())
           .containsOnly(
               entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
+              entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
               entry(DbIncubatingAttributes.DB_USER, "username"),
               entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
               entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
@@ -104,7 +105,7 @@ void shouldExtractAllAvailableAttributes() {
     } else if (SemconvStability.emitStableDatabaseSemconv()) {
       assertThat(startAttributes.build())
           .containsOnly(
-              entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
+              entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
               entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
               entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato"),
               entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"));

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/DbClientMetricsTest.java

@@ -42,7 +42,7 @@ void collectsMetrics() {
 
     Attributes operationAttributes =
         Attributes.builder()
-            .put(DbClientCommonAttributesExtractor.DB_SYSTEM, "myDb")
+            .put(DbClientCommonAttributesExtractor.DB_SYSTEM_NAME, "myDb")
             .put(SqlClientAttributesExtractor.DB_COLLECTION_NAME, "table")
             .put(DbClientCommonAttributesExtractor.DB_NAMESPACE, "potatoes")
             .put(DbClientAttributesExtractor.DB_OPERATION_NAME, "SELECT")
@@ -89,7 +89,7 @@ void collectsMetrics() {
                                         .hasSum(0.15 /* seconds */)
                                         .hasAttributesSatisfying(
                                             equalTo(
-                                                DbClientCommonAttributesExtractor.DB_SYSTEM,
+                                                DbClientCommonAttributesExtractor.DB_SYSTEM_NAME,
                                                 "myDb"),
                                             equalTo(
                                                 DbClientCommonAttributesExtractor.DB_NAMESPACE,

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/db/SqlClientAttributesExtractorTest.java

@@ -108,6 +108,7 @@ void shouldExtractAllAttributes() {
       assertThat(startAttributes.build())
           .containsOnly(
               entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
+              entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
               entry(DbIncubatingAttributes.DB_USER, "username"),
               entry(DbIncubatingAttributes.DB_NAME, "potatoes"),
               entry(DbIncubatingAttributes.DB_CONNECTION_STRING, "mydb:///potatoes"),
@@ -131,7 +132,7 @@ void shouldExtractAllAttributes() {
     } else if (SemconvStability.emitStableDatabaseSemconv()) {
       assertThat(startAttributes.build())
           .containsOnly(
-              entry(DbIncubatingAttributes.DB_SYSTEM, "myDb"),
+              entry(DbIncubatingAttributes.DB_SYSTEM_NAME, "myDb"),
               entry(DbIncubatingAttributes.DB_NAMESPACE, "potatoes"),
               entry(DbIncubatingAttributes.DB_QUERY_TEXT, "SELECT * FROM potato WHERE id=?"),
               entry(DbIncubatingAttributes.DB_OPERATION_NAME, "SELECT"),