add test

Author: zeitlinger

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

@@ -6,7 +6,8 @@ plugins {
 base.archivesName.set("opentelemetry-spring-boot-autoconfigure")
 group = "io.opentelemetry.instrumentation"
 
-val springBootVersion = "2.7.18" // AutoConfiguration is added in 2.7.0, but can be used with older versions
+val springBootVersion =
+  "2.7.18" // AutoConfiguration is added in 2.7.0, but can be used with older versions
 
 // r2dbc-proxy is shadowed to prevent org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration
 // from being loaded by Spring Boot (by the presence of META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider) - even if the user doesn't want to use R2DBC.
@@ -43,7 +44,12 @@ dependencies {
   implementation(project(":instrumentation-annotations-support"))
   implementation(project(":instrumentation:kafka:kafka-clients:kafka-clients-2.6:library"))
   implementation(project(":instrumentation:mongo:mongo-3.1:library"))
-  compileOnly(project(path = ":instrumentation:r2dbc-1.0:library-instrumentation-shaded", configuration = "shadow"))
+  compileOnly(
+    project(
+      path = ":instrumentation:r2dbc-1.0:library-instrumentation-shaded",
+      configuration = "shadow"
+    )
+  )
   implementation(project(":instrumentation:spring:spring-kafka-2.7:library"))
   implementation(project(":instrumentation:spring:spring-web:spring-web-3.1:library"))
   implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-5.3:library"))
@@ -109,8 +115,14 @@ dependencies {
   add("javaSpring3CompileOnly", files(sourceSets.main.get().output.classesDirs))
   add("javaSpring3CompileOnly", "org.springframework.boot:spring-boot-starter-web:3.2.4")
   add("javaSpring3CompileOnly", "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
-  add("javaSpring3CompileOnly", project(":instrumentation:spring:spring-web:spring-web-3.1:library"))
-  add("javaSpring3CompileOnly", project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library"))
+  add(
+    "javaSpring3CompileOnly",
+    project(":instrumentation:spring:spring-web:spring-web-3.1:library")
+  )
+  add(
+    "javaSpring3CompileOnly",
+    project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library")
+  )
 }
 
 val latestDepTest = findProperty("testLatestDeps") as Boolean
@@ -122,8 +134,10 @@ if (latestDepTest) {
   }
 }
 
-val testJavaVersion = gradle.startParameter.projectProperties["testJavaVersion"]?.let(JavaVersion::toVersion)
-val testSpring3 = (testJavaVersion == null || testJavaVersion.compareTo(JavaVersion.VERSION_17) >= 0)
+val testJavaVersion =
+  gradle.startParameter.projectProperties["testJavaVersion"]?.let(JavaVersion::toVersion)
+val testSpring3 =
+  (testJavaVersion == null || testJavaVersion.compareTo(JavaVersion.VERSION_17) >= 0)
 
 testing {
   suites {
@@ -180,10 +194,16 @@ 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-extension-autoconfigure")
+        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") {
           exclude("org.junit.vintage", "junit-vintage-engine")
         }

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

@@ -8,6 +8,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.AutoConfigurations;

smoke-tests-otel-starter/spring-boot-2/build.gradle.kts

@@ -34,3 +34,16 @@ configurations.configureEach {
     force("org.slf4j:slf4j-api:1.7.36")
   }
 }
+
+testing {
+  suites {
+    val testDeclarativeConfig by registering(JvmTestSuite::class) {
+    }
+  }
+}
+
+tasks {
+  check {
+    dependsOn(testing.suites)
+  }
+}