app server

Author: zeitlinger

smoke-tests/src/main/java/io/opentelemetry/smoketest/SmokeTestInstrumentationExtension.java

@@ -97,6 +97,10 @@ private SmokeTestInstrumentationExtension(
     this.telemetryTimeout = telemetryTimeout;
   }
 
+  public WebClient client() {
+    return WebClient.of("h1c://localhost:" + containerManager.getTargetMappedPort(8080));
+  }
+
   @Override
   public void beforeAll(ExtensionContext context) throws Exception {
     containerManager.startEnvironmentOnce();
@@ -118,10 +122,6 @@ public void afterEach(ExtensionContext context) throws Exception {
     super.afterEach(context);
   }
 
-  public WebClient client() {
-    return WebClient.of("h1c://localhost:" + containerManager.getTargetMappedPort(8080));
-  }
-
   public String getAgentVersion() {
     try (JarFile agentJar = new JarFile(agentPath)) {
       return agentJar
@@ -138,9 +138,7 @@ public int getTargetMappedPort(int originalPort) {
   }
 
   public Set<String> getSpanTraceIds() {
-    Set<String> spanTraceIds =
-        spans().stream().map(SpanData::getTraceId).collect(Collectors.toSet());
-    return spanTraceIds;
+    return spans().stream().map(SpanData::getTraceId).collect(Collectors.toSet());
   }
 
   public SmokeTestOutput start(int jdk) {

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

@@ -13,7 +13,6 @@
 import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc;
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
 import java.time.Duration;
-
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;

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

@@ -9,14 +9,10 @@
 import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
 
 import io.opentelemetry.api.common.AttributeKey;
-import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.semconv.ServiceAttributes;
 import io.opentelemetry.semconv.incubating.OsIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
 import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;