cleanup

Author: zeitlinger

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

@@ -31,7 +31,7 @@ dependencies {
 
 tasks {
   test {
-    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service)
+    usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) // is this needed?
 
     // suppress warning about byte-buddy-agent being loaded dynamically
     jvmArgs("-XX:+EnableDynamicAgentLoading")

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

@@ -23,7 +23,6 @@
 @SpringBootTest(
     classes = {OtelSpringStarterSmokeTestApplication.class, SpringSmokeOtelConfiguration.class},
     webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {
-//      "spring.kafka.bootstrap-servers=${KAFKA_BOOTSTRAP_SERVERS}",
       "spring.kafka.consumer.auto-offset-reset=earliest",
       "spring.kafka.consumer.linger-ms=10",
       "spring.kafka.listener.idle-between-polls=1000",
@@ -34,14 +33,6 @@ abstract class AbstractKafkaSpringStarterSmokeTest extends AbstractSpringStarter
 
   @Autowired private KafkaTemplate<String, String> kafkaTemplate;
 
-  //            .withPropertyValues(
-//                "spring.kafka.bootstrap-servers=" + kafka.getBootstrapServers(),
-//                "spring.kafka.consumer.auto-offset-reset=earliest",
-//                "spring.kafka.consumer.linger-ms=10",
-//                "spring.kafka.listener.idle-between-polls=1000",
-//                "spring.kafka.producer.transaction-id-prefix=test-");
-//  }
-
   // In kafka 2 ops.send is deprecated. We are using it to avoid reflection because kafka 3 also has
   // ops.send, although with different return type.
   @SuppressWarnings({"unchecked", "deprecation"})

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

@@ -5,6 +5,8 @@
 
 package io.opentelemetry.smoketest;
 
+import org.junit.jupiter.api.condition.EnabledInNativeImage;
+
 /**
  * GraalVM native image doesn't support Testcontainers in our case, so the docker container is
  * started manually before running the tests.
@@ -16,6 +18,6 @@
  * <p>In CI, this is done in reusable-native-tests.yml. If you want to run the tests locally, you
  * need to start the container manually: docker run -d -p 9092:9092 --name kafka --rm confluentinc/cp-kafka:6.2.10
  */
-//@EnabledInNativeImage
+@EnabledInNativeImage
 public class GraalVmNativeKafkaSpringStarterSmokeTest
     extends AbstractKafkaSpringStarterSmokeTest {}

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

@@ -6,7 +6,6 @@
 package io.opentelemetry.smoketest;
 
 import java.time.Duration;
-import org.junit.jupiter.api.condition.DisabledInNativeImage;
 import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -15,23 +14,11 @@
 import org.testcontainers.utility.DockerImageName;
 
 @Testcontainers
-@DisabledInNativeImage
 public class JvmKafkaSpringStarterSmokeTest extends AbstractKafkaSpringStarterSmokeTest {
 
   @Container @ServiceConnection
   static KafkaContainer kafka = new KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:6.2.10"))
       .withEnv("KAFKA_HEAP_OPTS", "-Xmx256m")
       .waitingFor(Wait.forLogMessage(".*started \\(kafka.server.KafkaServer\\).*", 1))
       .withStartupTimeout(Duration.ofMinutes(1));
-//
-//  @BeforeAll
-//  static void setUpKafka() {
-//    kafka.start();
-//  }
-//
-//  @AfterAll
-//  static void tearDownKafka() {
-//    kafka.stop();
-//  }
-
 }