better

Author: trask

instrumentation/grizzly-2.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/grizzly/v2_3/SameThreadTest.java

@@ -5,16 +5,26 @@
 
 package io.opentelemetry.javaagent.instrumentation.grizzly.v2_3;
 
-import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions;
+import static io.opentelemetry.instrumentation.testing.util.TestLatestDeps.testLatestDeps;
+
+import io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint;
+import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpRequest;
+import io.opentelemetry.testing.internal.armeria.common.HttpHeaderNames;
 import org.glassfish.grizzly.IOStrategy;
 import org.glassfish.grizzly.strategies.SameThreadIOStrategy;
 
 class SameThreadTest extends GrizzlyIoStrategyTest {
 
   @Override
-  protected void configure(HttpServerTestOptions options) {
-    super.configure(options);
-    options.setCloseClientConnectionAfterRequest(true);
+  protected AggregatedHttpRequest request(ServerEndpoint uri, String method) {
+    AggregatedHttpRequest request = super.request(uri, method);
+    if (testLatestDeps()) {
+      return request;
+    }
+    // Older Grizzly versions may race SameThreadIOStrategy keep-alive connection reuse
+    // with a server-side close.
+    return AggregatedHttpRequest.of(
+        request.headers().toBuilder().set(HttpHeaderNames.CONNECTION, "close").build());
   }
 
   @Override

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/AbstractHttpServerTest.java

@@ -186,14 +186,8 @@ public static String readRequestBody(InputStream inputStream) throws IOException
   }
 
   protected AggregatedHttpRequest request(ServerEndpoint uri, String method) {
-    AggregatedHttpRequest request =
-        AggregatedHttpRequest.of(
-            HttpMethod.valueOf(method), resolveAddress(uri, getProtocolPrefix()));
-    if (!options.closeClientConnectionAfterRequest) {
-      return request;
-    }
     return AggregatedHttpRequest.of(
-        request.headers().toBuilder().set(HttpHeaderNames.CONNECTION, "close").build());
+        HttpMethod.valueOf(method), resolveAddress(uri, getProtocolPrefix()));
   }
 
   private String getProtocolPrefix() {

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpServerTestOptions.java

@@ -66,7 +66,6 @@ public class HttpServerTestOptions {
   boolean testNonStandardHttpMethod = true;
   boolean verifyServerSpanEndTime = true;
   boolean useHttp2 = false;
-  boolean closeClientConnectionAfterRequest = false;
 
   HttpServerTestOptions() {}
 
@@ -234,13 +233,6 @@ public HttpServerTestOptions setUseHttp2(boolean useHttp2) {
     return this;
   }
 
-  @CanIgnoreReturnValue
-  public HttpServerTestOptions setCloseClientConnectionAfterRequest(
-      boolean closeClientConnectionAfterRequest) {
-    this.closeClientConnectionAfterRequest = closeClientConnectionAfterRequest;
-    return this;
-  }
-
   @CanIgnoreReturnValue
   public HttpServerTestOptions useHttp2() {
     return setUseHttp2(true);