undo http-pipelining changes (will move to another PR)

Author: samwright

instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoHttpServerTracer.java

@@ -101,7 +101,7 @@ public void onPush() {
               if (instrumenter().shouldStart(parentContext, request)) {
                 Context context = instrumenter().start(parentContext, request);
                 context = PekkoRouteHolder.init(context);
-                tracingRequest = new PekkoTracingRequest(context, parentContext, request);
+                tracingRequest = new PekkoTracingRequest(context, request);
                 request =
                     (HttpRequest)
                         request.addAttribute(PekkoTracingRequest.ATTR_KEY, tracingRequest);
@@ -144,14 +144,6 @@ public void onPush() {
                   response = (HttpResponse) response.addHeaders(headers);
                 }
 
-                // When GraphInterpreterInstrumentation sets `tracingRequest.context` as the current
-                // context, the akka Envelope + Actor instrumentation propagates it all the way
-                // back to here and follows the HttpResponse up the stack of stages.
-                // If http-pipelining is enabled, it will also propagate this context to the
-                // handling of the next request, leading to context-leaking errors.
-                // To prevent this, we reset the context to what it was before creating it.
-                tracingRequest.parentContext.makeCurrent();
-
                 instrumenter().end(tracingRequest.context, tracingRequest.request, response, null);
               }
               push(responseOut, response);

instrumentation/pekko/pekko-http-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/server/PekkoTracingRequest.java

@@ -5,32 +5,19 @@
 
 package io.opentelemetry.javaagent.instrumentation.pekkohttp.v1_0.server;
 
-import static io.opentelemetry.context.ContextKey.named;
-
 import io.opentelemetry.context.Context;
-import io.opentelemetry.context.ContextKey;
-import io.opentelemetry.context.ImplicitContextKeyed;
 import org.apache.pekko.http.scaladsl.model.AttributeKey;
 import org.apache.pekko.http.scaladsl.model.HttpRequest;
 
-public class PekkoTracingRequest implements ImplicitContextKeyed {
-  private static final ContextKey<PekkoTracingRequest> CONTEXT_KEY =
-      named("opentelemetry-pekko-tracing-request");
+public class PekkoTracingRequest {
   static final AttributeKey<PekkoTracingRequest> ATTR_KEY =
       new AttributeKey<>("_otel_ctx", PekkoTracingRequest.class);
-  static final PekkoTracingRequest EMPTY = new PekkoTracingRequest(null, null, null);
+  static final PekkoTracingRequest EMPTY = new PekkoTracingRequest(null, null);
   final Context context;
-  final Context parentContext;
   final HttpRequest request;
 
-  PekkoTracingRequest(Context context, Context parentContext, HttpRequest request) {
+  PekkoTracingRequest(Context context, HttpRequest request) {
     this.context = context;
-    this.parentContext = parentContext;
     this.request = request;
   }
-
-  @Override
-  public Context storeInContext(Context context) {
-    return context.with(CONTEXT_KEY, this);
-  }
 }

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/resources/application.conf

@@ -8,7 +8,4 @@ pekko.http {
       connecting-timeout = 5s
     }
   }
-  server {
-    pipelining-limit = 4 # default is 1
-  }
 }

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpServerInstrumentationTestAsync.scala

@@ -25,4 +25,11 @@ class PekkoHttpServerInstrumentationTestAsync
 
   override protected def stopServer(server: Object): Unit =
     PekkoHttpTestAsyncWebServer.stop()
+
+  override protected def configure(
+      options: HttpServerTestOptions
+  ): Unit = {
+    super.configure(options)
+    options.setTestHttpPipelining(false)
+  }
 }

instrumentation/pekko/pekko-http-1.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/pekkohttp/v1_0/PekkoHttpTestAsyncWebServer.scala

@@ -64,8 +64,7 @@ object PekkoHttpTestAsyncWebServer {
     if (null == binding) {
       import scala.concurrent.duration._
       binding = Await.result(
-        Http()
-          .bindAndHandleAsync(asyncHandler, "localhost", port, parallelism = 2),
+        Http().bindAndHandleAsync(asyncHandler, "localhost", port),
         10.seconds
       )
     }