Don't override the OpenTelemetry bean in the OTel starter reactive te…

…sts (#11256)

settings.gradle.kts

@@ -138,6 +138,7 @@ include(":smoke-tests:images:servlet:servlet-3.0")
 include(":smoke-tests:images:servlet:servlet-5.0")
 include(":smoke-tests:images:spring-boot")
 
+include(":smoke-tests-otel-starter:spring-smoke-testing")
 include(":smoke-tests-otel-starter:spring-boot-3")
 include(":smoke-tests-otel-starter:spring-boot-3-reactive")
 

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

@@ -18,7 +18,7 @@ dependencies {
 
   testImplementation("org.springframework.boot:spring-boot-starter-test")
   testImplementation("io.projectreactor:reactor-test")
-  testImplementation(project(":testing-common"))
+  testImplementation(project(":smoke-tests-otel-starter:spring-smoke-testing"))
 }
 
 tasks {

smoke-tests-otel-starter/spring-boot-3-reactive/src/test/java/io/opentelemetry/smoketest/OtelReactiveSpringStarterSmokeTest.java

@@ -7,62 +7,38 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.SpanKind;
-import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
 import io.opentelemetry.semconv.HttpAttributes;
 import io.opentelemetry.semconv.UrlAttributes;
+import io.opentelemetry.spring.smoketest.AbstractSpringStarterSmokeTest;
 import io.opentelemetry.spring.smoketest.OtelReactiveSpringStarterSmokeTestApplication;
 import io.opentelemetry.spring.smoketest.OtelReactiveSpringStarterSmokeTestController;
-import org.junit.jupiter.api.AfterEach;
+import io.opentelemetry.spring.smoketest.SpringSmokeOtelConfiguration;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.system.CapturedOutput;
-import org.springframework.boot.test.system.OutputCaptureExtension;
 import org.springframework.boot.test.web.server.LocalServerPort;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.function.client.WebClient;
 
-@ExtendWith(OutputCaptureExtension.class)
 @SpringBootTest(
     classes = {
       OtelReactiveSpringStarterSmokeTestApplication.class,
-      OtelReactiveSpringStarterSmokeTest.TestConfiguration.class
+      SpringSmokeOtelConfiguration.class
     },
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-class OtelReactiveSpringStarterSmokeTest {
-
-  @RegisterExtension
-  static final LibraryInstrumentationExtension testing = LibraryInstrumentationExtension.create();
+class OtelReactiveSpringStarterSmokeTest extends AbstractSpringStarterSmokeTest {
 
   @LocalServerPort int serverPort;
 
   @Autowired WebClient.Builder webClientBuilder;
   private WebClient webClient;
 
-  @Configuration(proxyBeanMethods = false)
-  static class TestConfiguration {
-    @Bean
-    OpenTelemetry openTelemetry() {
-      return testing.getOpenTelemetry();
-    }
-  }
-
   @BeforeEach
   void setUp() {
     webClient = webClientBuilder.baseUrl("http://localhost:" + serverPort).build();
   }
 
-  @AfterEach
-  void tearDown(CapturedOutput output) {
-    assertThat(output).doesNotContain("WARN").doesNotContain("ERROR");
-  }
-
   @Test
   void webClientAndWebFluxAndR2dbc() {
     webClient

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

@@ -22,7 +22,7 @@ dependencies {
   implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
 
   testImplementation("org.springframework.boot:spring-boot-starter-test")
-  testImplementation(project(":testing-common"))
+  testImplementation(project(":smoke-tests-otel-starter:spring-smoke-testing"))
 }
 
 tasks {

smoke-tests-otel-starter/spring-boot-3/src/main/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTestController.java

@@ -23,6 +23,8 @@ public class OtelSpringStarterSmokeTestController {
   public static final String REST_CLIENT = "/rest-client";
   public static final String REST_TEMPLATE = "/rest-template";
   public static final String TEST_HISTOGRAM = "histogram-test-otel-spring-starter";
+  public static final String METER_SCOPE_NAME =
+      OtelSpringStarterSmokeTestApplication.class.getName();
   private final LongHistogram histogram;
   private final Optional<RestTemplate> restTemplate;
   private final Optional<RestClient> restClient;
@@ -32,7 +34,7 @@ public OtelSpringStarterSmokeTestController(
       RestClient.Builder restClientBuilder,
       RestTemplateBuilder restTemplateBuilder,
       Optional<ServletWebServerApplicationContext> server) {
-    Meter meter = openTelemetry.getMeter(OtelSpringStarterSmokeTestApplication.class.getName());
+    Meter meter = openTelemetry.getMeter(METER_SCOPE_NAME);
     histogram = meter.histogramBuilder(TEST_HISTOGRAM).ofLongs().build();
     Optional<String> rootUri = server.map(s -> "http://localhost:" + s.getWebServer().getPort());
     restClient = rootUri.map(uri -> restClientBuilder.baseUrl(uri).build());