add test

Author: zeitlinger

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

@@ -194,17 +194,10 @@ testing {
     }
 
     val testDeclarativeConfig by registering(JvmTestSuite::class) {
-      otelJava {
-        minJavaVersionSupported.set(JavaVersion.VERSION_17)
-      }
       dependencies {
         implementation(project())
-        implementation("org.springframework.boot:spring-boot-starter-web:3.2.4")
         implementation("io.opentelemetry:opentelemetry-sdk")
-        implementation(project(":instrumentation:spring:spring-web:spring-web-3.1:library"))
-        implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library"))
-        implementation("jakarta.servlet:jakarta.servlet-api:5.0.0")
-        implementation("org.springframework.boot:spring-boot-starter-test:3.2.4") {
+        implementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion") {
           exclude("org.junit.vintage", "junit-vintage-engine")
         }
       }

instrumentation/spring/spring-boot-autoconfigure/src/test/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java

@@ -152,10 +152,7 @@ void shouldInitializeSdkWhenNotDisabled() {
         .withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class))
         .withPropertyValues("otel.sdk.disabled=false")
         .run(
-            context -> {
-              assertThat(context).getBean("openTelemetry").isInstanceOf(OpenTelemetrySdk.class);
-              assertThat(context).hasBean("openTelemetry");
-            });
+            context -> assertThat(context).getBean("openTelemetry").isInstanceOf(OpenTelemetrySdk.class));
   }
 
   @Test

…/OpenTelemetryAutoConfigurationTest.java …autoconfigure/DeclarativeConfigTest.javainstrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java renamed to instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfigurationTest.java renamed to instrumentation/spring/spring-boot-autoconfigure/src/testDeclarativeConfig/java/io/opentelemetry/instrumentation/spring/autoconfigure/DeclarativeConfigTest.java

@@ -8,16 +8,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
 import org.springframework.context.annotation.Bean;
 
 /** Spring Boot auto configuration test for {@link OpenTelemetryAutoConfiguration}. */
-class OpenTelemetryAutoConfigurationTest {
+class DeclarativeConfigTest {
   @TestConfiguration
   static class CustomTracerConfiguration {
     @Bean
@@ -26,15 +28,18 @@ public OpenTelemetry customOpenTelemetry() {
     }
   }
 
-  private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();
+  private final ApplicationContextRunner contextRunner =
+      new ApplicationContextRunner()
+          .withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class))
+          // to load application.yaml
+          .withInitializer(new ConfigDataApplicationContextInitializer());
 
   @Test
   @DisplayName(
       "when Application Context contains OpenTelemetry bean should NOT initialize openTelemetry")
   void customOpenTelemetry() {
     this.contextRunner
         .withUserConfiguration(CustomTracerConfiguration.class)
-        .withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class))
         .run(
             context ->
                 assertThat(context)
@@ -47,24 +52,35 @@ void customOpenTelemetry() {
   @DisplayName(
       "when Application Context DOES NOT contain OpenTelemetry bean should initialize openTelemetry")
   void initializeProvidersAndOpenTelemetry() {
-    this.contextRunner
-        .withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class))
-        .run(context -> assertThat(context).hasBean("openTelemetry").hasBean("otelProperties"));
+    this.contextRunner.run(
+        context ->
+            assertThat(context)
+                .hasBean("openTelemetry")
+                .hasBean("otelProperties")
+                .getBean(InstrumentationConfig.class)
+                .isNotNull()
+                .satisfies(
+                    c ->
+                        assertThat(c.getDeclarativeConfig("foo"))
+                            .isNotNull()
+                            .satisfies(
+                                instrumentationConfig ->
+                                    assertThat(instrumentationConfig.getString("foo"))
+                                        .isEqualTo("bar"))));
   }
 
   @Test
   void shouldInitializeSdkWhenNotDisabled() {
     this.contextRunner
-        .withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class))
         .withPropertyValues("otel.sdk.disabled=false")
         .run(
-            context -> assertThat(context).getBean("openTelemetry").isInstanceOf(OpenTelemetrySdk.class));
+            context ->
+                assertThat(context).getBean("openTelemetry").isInstanceOf(OpenTelemetrySdk.class));
   }
 
   @Test
   void shouldInitializeNoopOpenTelemetryWhenSdkIsDisabled() {
     this.contextRunner
-        .withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class))
         .withPropertyValues(
             "otel.sdk.disabled=true",
             "otel.resource.attributes=service.name=workflow-backend-dev,service.version=3c8f9ce9")

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

@@ -1,31 +1,10 @@
 otel:
   # "file_format" serves as opt-in to the new file format
   file_format: "0.4"
-  tracer_provider:
-    processors:
-      - simple:
-          exporter:
-            test_bridge:
-      - simple:
-          exporter:
-            console:
 
-  logger_provider:
-    processors:
-      - simple:
-          exporter:
-            test_bridge:
-
-  meter_provider:
-    readers:
-      - periodic:
-          # Set really long interval. We'll call forceFlush when we need the metrics
-          # instead of collecting them periodically.
-          interval: 1000000
-          exporter:
-            test_bridge:
-
-  resource:
-    attributes:
-      - name: foo
-        value: bar
+  # 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
+  instrumentation/development:
+    java:
+      foo:
+        bar: baz

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

@@ -0,0 +1,22 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.spring.smoketest;
+
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(
+    classes = {
+      OtelSpringStarterSmokeTestApplication.class,
+      AbstractOtelSpringStarterSmokeTest.TestConfiguration.class,
+      SpringSmokeOtelConfiguration.class
+    },
+    webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+    properties = {
+      // The headers are simply set here to make sure that headers can be parsed
+      "otel.exporter.otlp.headers.c=3",
+      "otel.instrumentation.runtime-telemetry.emit-experimental-telemetry=true",
+    })
+class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {}

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

@@ -0,0 +1,31 @@
+otel:
+  # "file_format" serves as opt-in to the new file format
+  file_format: "0.4"
+  tracer_provider:
+    processors:
+      - simple:
+          exporter:
+            test_bridge:
+      - simple:
+          exporter:
+            console:
+
+  logger_provider:
+    processors:
+      - simple:
+          exporter:
+            test_bridge:
+
+  meter_provider:
+    readers:
+      - periodic:
+          # Set really long interval. We'll call forceFlush when we need the metrics
+          # instead of collecting them periodically.
+          interval: 1000000
+          exporter:
+            test_bridge:
+
+  resource:
+    attributes:
+      - name: foo
+        value: bar