convert groovy smoke tests to java

Author: zeitlinger

smoke-tests/src/test/groovy/io/opentelemetry/smoketest/LogsSmokeTest.groovy

@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.condition.DisabledIf;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
-public class AgentDebugLoggingTest extends JavaSmokeTest {
+class AgentDebugLoggingTest extends JavaSmokeTest {
   @Override
   protected String getTargetImage(String jdk) {
     return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
@@ -25,7 +25,7 @@ protected TargetWaitStrategy getWaitStrategy() {
   }
 
   @Test
-  public void verify_that_debug_logging_is_working() {
+  void verify_that_debug_logging_is_working() {
     startTarget(8);
     stopTarget();
   }

smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package io.opentelemetry.smoketest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
+import java.time.Duration;
+import java.util.Collection;
+import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
+class LogsSmokeTest extends SmokeTest {
+  protected String getTargetImage(String jdk) {
+    return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
+        + jdk
+        + "-20211213.1570880324";
+  }
+
+  @Override
+  protected TargetWaitStrategy getWaitStrategy() {
+    return new TargetWaitStrategy.Log(
+        Duration.ofMinutes(1), ".*Started SpringbootApplication in.*");
+  }
+
+  @ParameterizedTest
+  @ValueSource(ints = {8, 11, 17})
+  void Should_export_logs(int jdk) {
+    startTarget(jdk);
+
+    client().get("/greeting").aggregate().join();
+    Collection<ExportLogsServiceRequest> logs = waitForLogs();
+
+    assertThat(logs).isNotEmpty();
+
+    stopTarget();
+  }
+}

smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java

@@ -14,7 +14,7 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 @DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
-public class SecurityManagerSmokeTest extends JavaSmokeTest {
+class SecurityManagerSmokeTest extends JavaSmokeTest {
   @Override
   protected String getTargetImage(String jdk) {
     return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk"
@@ -30,7 +30,7 @@ protected Map<String, String> getExtraEnv() {
 
   @ParameterizedTest
   @ValueSource(ints = {8, 11, 17, 21, 23})
-  public void security_manager_smoke_test_on_JDK__jdk(int jdk) {
+  void security_manager_smoke_test_on_JDK__jdk(int jdk) {
     startTarget(jdk);
 
     assertThat(waitForTraces())