fix more tests, exclude tests from latestdeps

Author: jaydeluca

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

@@ -108,6 +108,8 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-exporter-zipkin")
   testImplementation(project(":instrumentation-annotations"))
 
+  latestDepTestLibrary("org.springframework.boot:spring-boot-starter-micrometer-metrics:latest.release")
+
   // needed for the Spring Boot 3 support
   implementation(project(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library"))
 
@@ -126,6 +128,7 @@ dependencies {
   add("javaSpring4CompileOnly", "org.springframework.boot:spring-boot-starter-jdbc:4.0.0")
   add("javaSpring4CompileOnly", "org.springframework.boot:spring-boot-restclient:4.0.0")
   add("javaSpring4CompileOnly", "org.springframework.boot:spring-boot-starter-data-mongodb:4.0.0")
+  add("javaSpring4CompileOnly", "org.springframework.boot:spring-boot-starter-micrometer-metrics:4.0.0")
   add("javaSpring4CompileOnly", project(":instrumentation:kafka:kafka-clients:kafka-clients-2.6:library"))
   add("javaSpring4CompileOnly", project(":instrumentation:spring:spring-kafka-2.7:library"))
   add("javaSpring4CompileOnly", project(":instrumentation:mongo:mongo-3.1:library"))
@@ -203,10 +206,16 @@ testing {
         implementation("org.springframework.boot:spring-boot-starter-jdbc:4.0.0")
         implementation("org.springframework.boot:spring-boot-restclient:4.0.0")
         implementation("org.springframework.boot:spring-boot-starter-kafka:4.0.0")
+        implementation("org.springframework.boot:spring-boot-starter-actuator:4.0.0")
+        implementation("org.springframework.boot:spring-boot-starter-data-r2dbc:4.0.0")
+        implementation("io.opentelemetry:opentelemetry-sdk")
+        implementation("io.opentelemetry:opentelemetry-sdk-testing")
+        implementation(project(":instrumentation-api"))
         implementation("org.springframework.boot:spring-boot-starter-test:4.0.0") {
           exclude("org.junit.vintage", "junit-vintage-engine")
         }
         runtimeOnly("com.h2database:h2:1.4.197")
+        runtimeOnly("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
       }
     }
 
@@ -232,6 +241,15 @@ configurations.configureEach {
 tasks {
   compileTestJava {
     options.compilerArgs.add("-parameters")
+
+    // Exclude Spring Boot specific tests from compilation when testLatestDeps is true
+    // These tests are covered by testSpring4 suite
+    if (latestDepTest) {
+      exclude("**/micrometer/MicrometerBridgeAutoConfigurationTest.java")
+      exclude("**/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java")
+      exclude("**/jdbc/JdbcInstrumentationAutoConfigurationTest.java")
+      exclude("**/web/SpringWebInstrumentationAutoConfigurationTest.java")
+    }
   }
 
   withType<Test>().configureEach {
@@ -242,6 +260,17 @@ tasks {
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
   }
 
+  test {
+    // Exclude Spring Boot specific tests when testLatestDeps is true
+    // These tests are covered by testSpring4 suite
+    if (latestDepTest) {
+      exclude("**/micrometer/MicrometerBridgeAutoConfigurationTest.class")
+      exclude("**/r2dbc/R2DbcInstrumentationAutoConfigurationTest.class")
+      exclude("**/jdbc/JdbcInstrumentationAutoConfigurationTest.class")
+      exclude("**/web/SpringWebInstrumentationAutoConfigurationTest.class")
+    }
+  }
+
   named<JavaCompile>("compileJavaSpring3Java") {
     sourceCompatibility = "17"
     targetCompatibility = "17"

instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring4/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/micrometer/MicrometerBridgeAutoConfiguration.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.micrometer;
+
+import io.micrometer.core.instrument.Clock;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
+import io.opentelemetry.instrumentation.spring.autoconfigure.OpenTelemetryAutoConfiguration;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.ConditionalOnEnabledInstrumentation;
+import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+@ConditionalOnEnabledInstrumentation(module = "micrometer", enabledByDefault = false)
+@AutoConfigureAfter({MetricsAutoConfiguration.class, OpenTelemetryAutoConfiguration.class})
+@AutoConfigureBefore(CompositeMeterRegistryAutoConfiguration.class)
+@ConditionalOnBean(Clock.class)
+@ConditionalOnClass(MeterRegistry.class)
+@Configuration
+public class MicrometerBridgeAutoSpringBoot4Configuration {
+
+  @Bean
+  MeterRegistry otelMeterRegistry(OpenTelemetry openTelemetry, Clock micrometerClock) {
+    return OpenTelemetryMeterRegistry.builder(openTelemetry).setClock(micrometerClock).build();
+  }
+}

instrumentation/spring/spring-boot-autoconfigure/src/testSpring4/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/micrometer/MicrometerBridgeAutoConfigurationTest.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.micrometer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.micrometer.v1_5.OpenTelemetryMeterRegistry;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+
+class MicrometerBridgeAutoConfigurationTest {
+
+  private final ApplicationContextRunner runner =
+      new ApplicationContextRunner()
+          .withBean(OpenTelemetry.class, OpenTelemetry::noop)
+          .withConfiguration(
+              AutoConfigurations.of(MicrometerBridgeAutoSpringBoot4Configuration.class));
+
+  @Test
+  void metricsEnabled() {
+    runner
+        .withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class))
+        .withPropertyValues("otel.instrumentation.micrometer.enabled = true")
+        .run(
+            context ->
+                assertThat(context.getBean("otelMeterRegistry", MeterRegistry.class))
+                    .isNotNull()
+                    .isInstanceOf(OpenTelemetryMeterRegistry.class));
+  }
+
+  @Test
+  void metricsDisabledByDefault() {
+    runner
+        .withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class))
+        .run(context -> assertThat(context.containsBean("otelMeterRegistry")).isFalse());
+  }
+
+  @Test
+  void metricsDisabled() {
+    runner
+        .withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class))
+        .withPropertyValues("otel.instrumentation.micrometer.enabled = false")
+        .run(context -> assertThat(context.containsBean("otelMeterRegistry")).isFalse());
+  }
+
+  @Test
+  void noActuatorAutoConfiguration() {
+    runner
+        .withPropertyValues("otel.instrumentation.micrometer.enabled = true")
+        .run(context -> assertThat(context.containsBean("otelMeterRegistry")).isFalse());
+  }
+}

instrumentation/spring/spring-boot-autoconfigure/src/testSpring4/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/r2dbc/R2DbcInstrumentationAutoConfigurationTest.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.spring.autoconfigure.internal.instrumentation.r2dbc;
+
+import static io.opentelemetry.instrumentation.testing.junit.db.SemconvStabilityUtil.maybeStable;
+import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
+
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.instrumentation.api.incubator.config.internal.InstrumentationConfig;
+import io.opentelemetry.instrumentation.spring.autoconfigure.internal.properties.ConfigPropertiesBridge;
+import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
+import io.opentelemetry.sdk.autoconfigure.spi.internal.DefaultConfigProperties;
+import java.util.Collections;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.boot.autoconfigure.AutoConfigurations;
+import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
+import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.r2dbc.core.DatabaseClient;
+
+class R2DbcInstrumentationAutoConfigurationTest {
+
+  @RegisterExtension
+  static final LibraryInstrumentationExtension testing = LibraryInstrumentationExtension.create();
+
+  private final ApplicationContextRunner runner =
+      new ApplicationContextRunner()
+          .withBean(
+              InstrumentationConfig.class,
+              () ->
+                  new ConfigPropertiesBridge(
+                      DefaultConfigProperties.createFromMap(Collections.emptyMap())))
+          .withConfiguration(
+              AutoConfigurations.of(
+                  R2dbcInstrumentationAutoConfiguration.class, R2dbcAutoConfiguration.class))
+          .withBean("openTelemetry", OpenTelemetry.class, testing::getOpenTelemetry);
+
+  @SuppressWarnings("deprecation") // using deprecated semconv
+  @Test
+  void statementSanitizerEnabledByDefault() {
+    runner.run(
+        context -> {
+          DatabaseClient client = context.getBean(DatabaseClient.class);
+          client
+              .sql(
+                  "CREATE TABLE IF NOT EXISTS player(id INT NOT NULL AUTO_INCREMENT, name VARCHAR(255), age INT, PRIMARY KEY (id))")
+              .fetch()
+              .all()
+              .blockLast();
+          client.sql("SELECT * FROM player WHERE id = 1").fetch().all().blockLast();
+          testing.waitAndAssertTraces(
+              trace ->
+                  trace.hasSpansSatisfyingExactly(
+                      span ->
+                          span.hasAttribute(
+                              maybeStable(DB_STATEMENT),
+                              "CREATE TABLE IF NOT EXISTS player(id INT NOT NULL AUTO_INCREMENT, name VARCHAR(?), age INT, PRIMARY KEY (id))")),
+              trace ->
+                  trace.hasSpansSatisfyingExactly(
+                      span ->
+                          span.hasAttribute(
+                              maybeStable(DB_STATEMENT), "SELECT * FROM player WHERE id = ?")));
+        });
+  }
+}