fix test

Author: zeitlinger

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts

@@ -69,7 +69,9 @@ dependencies {
   library("org.springframework.boot:spring-boot-starter-data-jdbc:$springBootVersion")
 
   implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
+  implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   implementation(project(":sdk-autoconfigure-support"))
+  implementation(project(":declarative-config-bridge"))
   compileOnly("io.opentelemetry:opentelemetry-extension-trace-propagators")
   compileOnly("io.opentelemetry.contrib:opentelemetry-aws-xray-propagator")
   compileOnly("io.opentelemetry:opentelemetry-exporter-logging")
@@ -187,16 +189,6 @@ testing {
         }
       }
     }
-
-    val testStableSemconv by registering(JvmTestSuite::class) {
-      targets {
-        all {
-          testTask.configure {
-            jvmArgs("-Dotel.semconv-stability.opt-in=database")
-          }
-        }
-      }
-    }
   }
 }
 

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java

@@ -12,7 +12,7 @@
 import io.opentelemetry.common.ComponentLoader;
 import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.instrumentation.api.internal.EmbeddedInstrumentationProperties;
-import io.opentelemetry.instrumentation.sdk.DeclarativeConfigPropertiesBridgeBuilder;
+import io.opentelemetry.instrumentation.config.bridge.DeclarativeConfigPropertiesBridgeBuilder;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeclarativeConfigDisabled;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeclarativeConfigEnabled;
 import io.opentelemetry.instrumentation.spring.autoconfigure.internal.OtelDisabled;
@@ -141,7 +141,7 @@ public ConfigProperties otelProperties(
           AutoConfiguredOpenTelemetrySdk autoConfiguredOpenTelemetrySdk) {
         return AutoConfigureUtil.getConfig(autoConfiguredOpenTelemetrySdk);
       }
-  }
+    }
 
     @Configuration
     @Conditional(DeclarativeConfigEnabled.class)

instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/resources/application.yaml

@@ -1,6 +1,6 @@
 otel:
   # "file_format" serves as opt-in to the new file format
-  file_format: "0.4"
+  file_format: "1.0-rc.1"
 
   # very lightweight test to make sure the declarative config is loaded
   # the full config is tested in smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig

smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.ServiceAttributes;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -42,7 +43,16 @@ void restTemplate() {
     testing.waitAndAssertTraces(
         traceAssert ->
             traceAssert.hasSpansSatisfyingExactly(
-                span -> HttpSpanDataAssert.create(span).assertClientGetRequest("/ping"),
+                span ->
+                    HttpSpanDataAssert.create(span)
+                        .assertClientGetRequest("/ping")
+                        .hasResourceSatisfying(
+                            r ->
+                                r.hasAttribute(
+                                    // to make sure the declarative config is picked up
+                                    // in application.yaml
+                                    ServiceAttributes.SERVICE_NAME,
+                                    "declarative-config-spring-boot-2")),
                 span ->
                     span.hasKind(SpanKind.SERVER).hasAttribute(HttpAttributes.HTTP_ROUTE, "/ping"),
                 AbstractSpringStarterSmokeTest::withSpanAssert));

smoke-tests-otel-starter/spring-boot-2/src/testDeclarativeConfig/resources/application.yaml

@@ -1,6 +1,11 @@
 otel:
   # "file_format" serves as opt-in to the new file format
-  file_format: "0.4"
+  file_format: "1.0-rc.1"
+  resource:
+    attributes:
+      - name: service.name
+        value: declarative-config-spring-boot-2
+
   tracer_provider:
     processors:
       - simple: