use tester

Author: zeitlinger

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

@@ -5,11 +5,8 @@
 
 package io.opentelemetry.smoketest;
 
-import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 
-import io.opentelemetry.sdk.testing.assertj.TracesAssert;
-import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.semconv.ServiceAttributes;
 import io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;

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

@@ -5,26 +5,25 @@
 
 package io.opentelemetry.smoketest;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.emptyMap;
+import static java.util.stream.Collectors.toSet;
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.smoketest.windows.WindowsTestContainerManager;
 import io.opentelemetry.testing.internal.armeria.client.WebClient;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.extension.RegisterExtension;
-import org.testcontainers.containers.output.OutputFrame;
-import org.testcontainers.containers.output.ToStringConsumer;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
-
-import static java.util.Collections.emptyList;
-import static java.util.Collections.emptyMap;
-import static java.util.stream.Collectors.toSet;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.testcontainers.containers.output.OutputFrame;
+import org.testcontainers.containers.output.ToStringConsumer;
 
 public abstract class JavaSmokeTest extends AbstractRemoteTelemetryTest {
 
@@ -113,7 +112,7 @@ protected String[] getCommand() {
     return null;
   }
 
-    protected static void assertVersionLogged(Consumer<OutputFrame> output, String version) {
+  protected static void assertVersionLogged(Consumer<OutputFrame> output, String version) {
     assertThat(
             logLines(output)
                 .anyMatch(l -> l.contains("opentelemetry-javaagent - version: " + version)))

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

@@ -5,8 +5,6 @@
 
 package io.opentelemetry.smoketest;
 
-import static io.opentelemetry.sdk.testing.assertj.TracesAssert.assertThat;
-
 import io.opentelemetry.semconv.ServiceAttributes;
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
 import java.time.Duration;

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

@@ -5,11 +5,9 @@
 
 package io.opentelemetry.smoketest;
 
-import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import java.util.Collections;
 import java.util.Map;
 import org.junit.jupiter.api.condition.DisabledIf;
-import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 

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

@@ -107,7 +107,7 @@ void springBootSmokeTest(int jdk) throws Exception {
     assertThat(loggedTraceIds).isEqualTo(spanTraceIds);
 
     // Check JVM metrics are exported
-      testing.waitAndAssertMetrics(
+    testing.waitAndAssertMetrics(
         "io.opentelemetry.runtime-telemetry-java8",
         metric -> metric.hasName("jvm.memory.used"),
         metric -> metric.hasName("jvm.memory.committed"),

smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/OtTracePropagationTest.java

@@ -7,15 +7,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.smoketest.JavaSmokeTest;
 import io.opentelemetry.smoketest.TargetWaitStrategy;
 import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
 import java.time.Duration;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
@@ -38,7 +34,7 @@ protected TargetWaitStrategy getWaitStrategy() {
   public void shouldPropagate() {
     startTarget(11);
     AggregatedHttpResponse response = client().get("/front").aggregate().join();
-      var traceId = testing.waitForTraces(1).get(0).get(0).getTraceId();
+    var traceId = testing.waitForTraces(1).get(0).get(0).getTraceId();
 
     assertThat(response.contentUtf8()).matches("[0-9a-f]{16}" + traceId + ";[0]{16}" + traceId);
   }

smoke-tests/src/test/java/io/opentelemetry/smoketest/propagation/PropagationTest.java

@@ -5,14 +5,13 @@
 
 package io.opentelemetry.smoketest.propagation;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.opentelemetry.smoketest.JavaSmokeTest;
 import io.opentelemetry.smoketest.TargetWaitStrategy;
 import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
-import org.junit.jupiter.api.Test;
-
 import java.time.Duration;
-
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
 public abstract class PropagationTest extends JavaSmokeTest {