Test http pipelining (#8403)

laurit · web-flow · commit 413890d24625 · 2023-05-04T10:23:48.000+03:00
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerInstrumentationTestAsync.scala b/instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpServerInstrumentationTestAsync.scala
@@ -6,7 +6,10 @@
 package io.opentelemetry.javaagent.instrumentation.akkahttp
 
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension
-import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension
+import io.opentelemetry.instrumentation.testing.junit.http.{
+  HttpServerInstrumentationExtension,
+  HttpServerTestOptions
+}
 import org.junit.jupiter.api.extension.RegisterExtension
 
 class AkkaHttpServerInstrumentationTestAsync
@@ -22,4 +25,11 @@ class AkkaHttpServerInstrumentationTestAsync
 
   override protected def stopServer(server: Object): Unit =
     AkkaHttpTestAsyncWebServer.stop()
+
+  override protected def configure(
+      options: HttpServerTestOptions
+  ): Unit = {
+    super.configure(options)
+    options.setTestHttpPipelining(false)
+  }
 }
diff --git a/instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java b/instrumentation/armeria-1.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/armeria/v1_3/ArmeriaHttpServerTest.java
@@ -28,5 +28,6 @@ protected void configure(HttpServerTestOptions options) {
     super.configure(options);
     options.setHasResponseCustomizer(
         endpoint -> ServerEndpoint.NOT_FOUND != endpoint && ServerEndpoint.EXCEPTION != endpoint);
+    options.setTestHttpPipelining(false);
   }
 }
diff --git a/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala b/instrumentation/finatra-2.9/javaagent/src/latestDepTest/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerLatestTest.scala
@@ -55,6 +55,7 @@ class FinatraServerLatestTest extends AbstractHttpServerTest[HttpServer] {
       override def test(endpoint: ServerEndpoint): Boolean =
         endpoint != ServerEndpoint.NOT_FOUND
     })
+    options.setTestHttpPipelining(false)
   }
 
   override protected def assertHandlerSpan(
diff --git a/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala b/instrumentation/finatra-2.9/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/finatra/FinatraServerTest.scala
@@ -56,6 +56,7 @@ class FinatraServerTest extends AbstractHttpServerTest[HttpServer] {
       override def test(endpoint: ServerEndpoint): Boolean =
         endpoint != ServerEndpoint.NOT_FOUND
     })
+    options.setTestHttpPipelining(false)
   }
 
   override protected def assertHandlerSpan(
diff --git a/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyAsyncTest.groovy b/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyAsyncTest.groovy
@@ -39,6 +39,11 @@ class GrizzlyAsyncTest extends GrizzlyTest {
     false
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   @Override
   boolean verifyServerSpanEndTime() {
     // server spans are ended inside of the JAX-RS controller spans
diff --git a/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy b/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyFilterchainServerTest.groovy
@@ -84,6 +84,11 @@ class GrizzlyFilterchainServerTest extends HttpServerTest<HttpServer> implements
     false
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   @Override
   boolean verifyServerSpanEndTime() {
     // server spans are ended inside of the controller spans
diff --git a/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyTest.groovy b/instrumentation/grizzly-2.0/javaagent/src/test/groovy/GrizzlyTest.groovy
@@ -68,6 +68,11 @@ class GrizzlyTest extends HttpServerTest<HttpServer> implements AgentTestTrait {
     false
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   static class SimpleExceptionMapper implements ExceptionMapper<Throwable> {
 
     @Override
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.0/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy
@@ -29,7 +29,13 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
   }
 
   // resteasy 3.0.x does not support JAX-RS 2.1
+  @Override
   boolean shouldTestCompletableStageAsync() {
     false
   }
+
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
 }
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-resteasy-3.1/javaagent/src/test/groovy/ResteasyHttpServerTest.groovy
@@ -27,4 +27,9 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {
   void stopServer(UndertowJaxrsServer server) {
     server.stop()
   }
+
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
 }
diff --git a/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java b/instrumentation/netty/netty-4.1/testing/src/main/java/io/opentelemetry/instrumentation/netty/v4_1/AbstractNetty41ServerTest.java
@@ -62,6 +62,7 @@ protected void configure(HttpServerTestOptions options) {
         unused ->
             Sets.difference(
                 DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(SemanticAttributes.HTTP_ROUTE)));
+    options.setTestHttpPipelining(false);
   }
 
   @Override
diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/play24Test/groovy/server/PlayServerTest.groovy
@@ -90,6 +90,11 @@ class PlayServerTest extends HttpServerTest<Server> implements AgentTestTrait {
     true
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   @Override
   boolean verifyServerSpanEndTime() {
     // server spans are ended inside of the controller spans
diff --git a/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.4/javaagent/src/test/groovy/server/PlayServerTest.groovy
@@ -85,6 +85,11 @@ class PlayServerTest extends HttpServerTest<Server> implements AgentTestTrait {
     true
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   @Override
   boolean verifyServerSpanEndTime() {
     // server spans are ended inside of the controller spans
diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/latestDepTest/groovy/server/PlayServerTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/latestDepTest/groovy/server/PlayServerTest.groovy
@@ -87,6 +87,11 @@ class PlayServerTest extends HttpServerTest<Server> implements AgentTestTrait {
     true
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   @Override
   void handlerSpan(TraceAssert trace, int index, Object parent, String method = "GET", ServerEndpoint endpoint = SUCCESS) {
     trace.span(index) {
diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/test/groovy/server/PlayAsyncServerTest.groovy b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/src/test/groovy/server/PlayAsyncServerTest.groovy
@@ -98,4 +98,9 @@ class PlayAsyncServerTest extends PlayServerTest {
         .build()
     }
   }
+
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
 }
diff --git a/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/groovy/server/RatpackForkedHttpServerTest.groovy b/instrumentation/ratpack/ratpack-1.4/javaagent/src/test/groovy/server/RatpackForkedHttpServerTest.groovy
@@ -19,4 +19,9 @@ class RatpackForkedHttpServerTest extends AbstractRatpackForkedHttpServerTest im
   boolean hasResponseCustomizer(ServerEndpoint endpoint) {
     true
   }
+
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
 }
diff --git a/instrumentation/restlet/restlet-1.1/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.groovy b/instrumentation/restlet/restlet-1.1/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v1_1/AbstractRestletServerTest.groovy
@@ -162,6 +162,11 @@ abstract class AbstractRestletServerTest extends HttpServerTest<Server> {
     false
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   @Override
   String expectedHttpRoute(ServerEndpoint endpoint) {
     switch (endpoint) {
diff --git a/instrumentation/restlet/restlet-2.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.groovy b/instrumentation/restlet/restlet-2.0/testing/src/main/groovy/io/opentelemetry/instrumentation/restlet/v2_0/AbstractRestletServerTest.groovy
@@ -175,6 +175,11 @@ abstract class AbstractRestletServerTest extends HttpServerTest<Server> {
     false
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   @Override
   String expectedHttpRoute(ServerEndpoint endpoint) {
     switch (endpoint) {
diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/base/SpringWebFluxServerTest.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/base/SpringWebFluxServerTest.java
@@ -68,5 +68,6 @@ protected void configure(HttpServerTestOptions options) {
     options.setTestPathParam(true);
     options.setExpectedException(new IllegalStateException(EXCEPTION.getBody()));
     options.setHasHandlerSpan(unused -> true);
+    options.setTestHttpPipelining(false);
   }
 }
diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy
@@ -162,4 +162,9 @@ class VertxRxCircuitBreakerHttpServerTest extends VertxRxHttpServerTest {
   boolean hasExceptionOnServerSpan(ServerEndpoint endpoint) {
     return endpoint != EXCEPTION && super.hasExceptionOnServerSpan(endpoint)
   }
+
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
 }
diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxHttpServerTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/latestDepTest/groovy/server/VertxRxHttpServerTest.groovy
@@ -68,6 +68,11 @@ class VertxRxHttpServerTest extends HttpServerTest<Vertx> implements AgentTestTr
     return false
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   protected Class<AbstractVerticle> verticle() {
     return VertxReactiveWebServer
   }
diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/server/VertxRxCircuitBreakerHttpServerTest.groovy
@@ -161,4 +161,9 @@ class VertxRxCircuitBreakerHttpServerTest extends VertxRxHttpServerTest {
   boolean hasExceptionOnServerSpan(ServerEndpoint endpoint) {
     return endpoint != EXCEPTION && super.hasExceptionOnServerSpan(endpoint)
   }
+
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
 }
diff --git a/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/server/VertxRxHttpServerTest.groovy b/instrumentation/vertx/vertx-rx-java-3.5/javaagent/src/version35Test/groovy/server/VertxRxHttpServerTest.groovy
@@ -62,6 +62,11 @@ class VertxRxHttpServerTest extends HttpServerTest<Vertx> implements AgentTestTr
     return true
   }
 
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
+
   @Override
   boolean verifyServerSpanEndTime() {
     // server spans are ended inside of the controller spans
diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/groovy/server/VertxLatestHttpServerTest.groovy b/instrumentation/vertx/vertx-web-3.0/javaagent/src/latestDepTest/groovy/server/VertxLatestHttpServerTest.groovy
@@ -13,4 +13,9 @@ class VertxLatestHttpServerTest extends AbstractVertxHttpServerTest {
   protected Class<? extends AbstractVerticle> verticle() {
     return VertxLatestWebServer
   }
+
+  @Override
+  boolean testHttpPipelining() {
+    false
+  }
 }
diff --git a/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy b/testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy
@@ -144,6 +144,10 @@ abstract class HttpServerTest<SERVER> extends InstrumentationSpecification imple
     true
   }
 
+  boolean testHttpPipelining() {
+    true
+  }
+
   boolean verifyServerSpanEndTime() {
     return true
   }
@@ -217,6 +221,7 @@ abstract class HttpServerTest<SERVER> extends InstrumentationSpecification imple
       options.testPathParam = testPathParam()
       options.testCaptureHttpHeaders = testCapturedHttpHeaders()
       options.testCaptureRequestParameters = testCapturedRequestParameters()
+      options.testHttpPipelining = testHttpPipelining()
     }
 
     // Override trace assertion method. We can call java assertions from groovy but not the other
@@ -314,6 +319,12 @@ abstract class HttpServerTest<SERVER> extends InstrumentationSpecification imple
     junitTest.highConcurrency()
   }
 
+  def "http pipelining test"() {
+    assumeTrue(testHttpPipelining())
+    expect:
+    junitTest.httpPipelining()
+  }
+
   void assertHighConcurrency(int count) {
     def endpoint = INDEXED_CHILD
     assertTraces(count) {
diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java
diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java

Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@ protected void configure(HttpServerTestOptions options) {`
`28`	`28`	`super.configure(options);`
`29`	`29`	`options.setHasResponseCustomizer(`
`30`	`30`	`endpoint -> ServerEndpoint.NOT_FOUND != endpoint && ServerEndpoint.EXCEPTION != endpoint);`
	`31`	`+ options.setTestHttpPipelining(false);`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ class FinatraServerLatestTest extends AbstractHttpServerTest[HttpServer] {`
`55`	`55`	`override def test(endpoint: ServerEndpoint): Boolean =`
`56`	`56`	`endpoint != ServerEndpoint.NOT_FOUND`
`57`	`57`	`})`
	`58`	`+ options.setTestHttpPipelining(false)`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`override protected def assertHandlerSpan(`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ class FinatraServerTest extends AbstractHttpServerTest[HttpServer] {`
`56`	`56`	`override def test(endpoint: ServerEndpoint): Boolean =`
`57`	`57`	`endpoint != ServerEndpoint.NOT_FOUND`
`58`	`58`	`})`
	`59`	`+ options.setTestHttpPipelining(false)`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`override protected def assertHandlerSpan(`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,13 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// resteasy 3.0.x does not support JAX-RS 2.1`
	`32`	`+ @Override`
`32`	`33`	`boolean shouldTestCompletableStageAsync() {`
`33`	`34`	`false`
`34`	`35`	`}`
	`36`	`+`
	`37`	`+ @Override`
	`38`	`+ boolean testHttpPipelining() {`
	`39`	`+ false`
	`40`	`+ }`
`35`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,9 @@ class ResteasyHttpServerTest extends JaxRsHttpServerTest<UndertowJaxrsServer> {`
`27`	`27`	`void stopServer(UndertowJaxrsServer server) {`
`28`	`28`	`server.stop()`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ @Override`
	`32`	`+ boolean testHttpPipelining() {`
	`33`	`+ false`
	`34`	`+ }`
`30`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ protected void configure(HttpServerTestOptions options) {`
`62`	`62`	`unused ->`
`63`	`63`	`Sets.difference(`
`64`	`64`	`DEFAULT_HTTP_ATTRIBUTES, Collections.singleton(SemanticAttributes.HTTP_ROUTE)));`
	`65`	`+ options.setTestHttpPipelining(false);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`@Override`