Fix

Author: heyams

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayAsyncServerTest.java

@@ -29,7 +29,7 @@ class PlayAsyncServerTest extends PlayServerTest {
   private static final ExecutorService executor = Executors.newCachedThreadPool();
 
   @Override
-  protected Server setupServer(int port) {
+  protected Server setupServer() {
     ExecutionContextExecutor executionContextExecutor = HttpExecution.fromThread(executor);
     return Server.forRouter(
         Mode.TEST,

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/latestDepTest/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayServerTest.java

@@ -94,8 +94,6 @@ protected Server setupServer() {
                 .build());
   }
 
-  protected abstract Server setupServer(int port);
-
   @Override
   protected void stopServer(Server server) {
     server.stop();
@@ -112,7 +110,7 @@ protected void configure(HttpServerTestOptions options) {
   }
 
   @Override
-  public SpanDataAssert assertHandlerSpan(
+  protected SpanDataAssert assertHandlerSpan(
       SpanDataAssert span, String method, ServerEndpoint endpoint) {
     span.hasName("play.request").hasKind(INTERNAL);
     if (endpoint == EXCEPTION) {

instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/play/v2_6/PlayServerTest.java

@@ -13,18 +13,15 @@
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.QUERY_PARAM;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.REDIRECT;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.SUCCESS;
+import static java.util.Collections.emptySet;
 
-import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerTest;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
 import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
 import io.opentelemetry.sdk.testing.assertj.SpanDataAssert;
 import io.opentelemetry.sdk.trace.data.StatusData;
-import io.opentelemetry.semconv.HttpAttributes;
-import java.util.HashSet;
-import java.util.Set;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import play.Mode;
 import play.mvc.Controller;
@@ -106,18 +103,7 @@ protected void stopServer(Server server) throws Exception {
   @Override
   protected void configure(HttpServerTestOptions options) {
     options.setHasHandlerSpan(unused -> true);
-    options.setTestHttpPipelining(false);
-    options.setResponseCodeOnNonStandardHttpMethod(404);
-    // server spans are ended inside of the controller spans
-    options.setVerifyServerSpanEndTime(false);
-    options.setHttpAttributes(
-        serverEndpoint -> {
-          Set<AttributeKey<?>> attributes =
-              new HashSet<>(HttpServerTestOptions.DEFAULT_HTTP_ATTRIBUTES);
-          attributes.remove(HttpAttributes.HTTP_ROUTE);
-          return attributes;
-        });
-
+    options.setHttpAttributes(endpoint -> emptySet());
     options.setExpectedException(new IllegalArgumentException(EXCEPTION.getBody()));
     options.disableTestNonStandardHttpMethod();
   }