fix

Author: trask

instrumentation/ratpack/ratpack-1.7/library/src/main/java/io/opentelemetry/instrumentation/ratpack/v1_7/internal/OpenTelemetryHttpClient.java

@@ -5,14 +5,10 @@
 
 package io.opentelemetry.instrumentation.ratpack.v1_7.internal;
 
-import io.netty.handler.codec.PrematureChannelClosureException;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.semconv.HttpAttributes;
-import java.net.ConnectException;
-import java.nio.channels.ClosedChannelException;
-import java.util.Locale;
 import ratpack.exec.Execution;
 import ratpack.http.client.HttpClient;
 import ratpack.http.client.HttpResponse;
@@ -72,38 +68,10 @@ public HttpClient instrument(HttpClient httpClient) throws Exception {
                     .ifPresent(
                         contextHolder -> {
                           execution.remove(ContextHolder.class);
-                          RequestSpec requestSpec = contextHolder.requestSpec();
-                          Throwable error = mapClientError(requestSpec, ex);
-                          if (shouldRenameSpanToConnect(requestSpec, error)) {
-                            Span.fromContext(contextHolder.context()).updateName("CONNECT");
-                          }
-                          instrumenter.end(contextHolder.context(), requestSpec, null, error);
+                          instrumenter.end(
+                              contextHolder.context(), contextHolder.requestSpec(), null, ex);
                         });
               });
         });
   }
-
-  private static Throwable mapClientError(RequestSpec requestSpec, Throwable error) {
-    if (isNonRoutableAddress(requestSpec) && error instanceof ClosedChannelException) {
-      return new PrematureChannelClosureException();
-    }
-    return error;
-  }
-
-  private static boolean shouldRenameSpanToConnect(RequestSpec requestSpec, Throwable error) {
-    if (error instanceof ConnectException) {
-      return true;
-    }
-    return !isWindows()
-        && isNonRoutableAddress(requestSpec)
-        && error instanceof ClosedChannelException;
-  }
-
-  private static boolean isNonRoutableAddress(RequestSpec requestSpec) {
-    return "192.0.2.1".equals(requestSpec.getUri().getHost());
-  }
-
-  private static boolean isWindows() {
-    return System.getProperty("os.name", "").toLowerCase(Locale.ROOT).contains("win");
-  }
 }

instrumentation/ratpack/ratpack-1.7/library/src/test/java/io/opentelemetry/instrumentation/ratpack/v1_7/AbstractRatpackHttpClientTest.java

@@ -38,6 +38,9 @@
 
 abstract class AbstractRatpackHttpClientTest extends AbstractHttpClientTest<Void> {
 
+  private static final boolean IS_WINDOWS =
+      System.getProperty("os.name", "").toLowerCase(Locale.ROOT).contains("win");
+
   final ExecHarness exec = ExecHarness.harness();
 
   HttpClient client;
@@ -161,21 +164,24 @@ private static Throwable nettyClientSpanErrorMapper(URI uri, Throwable exception
       return new HttpClientReadTimeoutException(
           "Read timeout (PT2S) waiting on HTTP server at " + uri);
     }
-    if (isNonRoutableAddress(uri) && exception instanceof ClosedChannelException) {
+    if (!IS_WINDOWS && isNonRoutableAddress(uri) && exception instanceof ClosedChannelException) {
       return new PrematureChannelClosureException();
     }
     return exception;
   }
 
   private static String nettyExpectedClientSpanNameMapper(URI uri, String method) {
     if (isUnopenedPort(uri)) {
+      if (IS_WINDOWS) {
+        return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);
+      }
       return "CONNECT";
     }
     if (isNonRoutableAddress(uri)) {
       // On Windows, non-routable addresses don't fail at CONNECT level.
       // The connection proceeds far enough to start HTTP processing before
       // the channel closes, resulting in an HTTP span instead of CONNECT.
-      if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("win")) {
+      if (IS_WINDOWS) {
         return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);
       }
       return "CONNECT";