fix

Author: trask

instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java

@@ -182,7 +182,12 @@ private static Throwable nettyClientSpanErrorMapper(URI uri, Throwable exception
       if (isWindows()) {
         return exception;
       }
-      return rootCause != null ? rootCause : exception;
+      Throwable candidate = rootCause != null ? rootCause : exception;
+      Throwable timeoutCause = findExceptionWithMessage(exception, "connection timed out");
+      if (timeoutCause != null) {
+        candidate = timeoutCause;
+      }
+      return candidate;
     }
     return exception;
   }
@@ -222,4 +227,24 @@ private static Throwable unwrapConnectionException(Throwable exception) {
     }
     return current;
   }
+
+  private static Throwable findExceptionWithMessage(Throwable exception, String expectedFragment) {
+    if (exception == null) {
+      return null;
+    }
+    String needle = expectedFragment.toLowerCase(Locale.ROOT);
+    Throwable current = exception;
+    while (current != null) {
+      String message = current.getMessage();
+      if (message != null && message.toLowerCase(Locale.ROOT).contains(needle)) {
+        return current;
+      }
+      Throwable cause = current.getCause();
+      if (cause == null || cause == current) {
+        break;
+      }
+      current = cause;
+    }
+    return null;
+  }
 }

instrumentation/ratpack/ratpack-1.7/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/ratpack/v1_7/client/RatpackTestUtils.java

@@ -23,6 +23,9 @@ public static Throwable ratpackClientSpanErrorMapper(URI uri, Throwable exceptio
           "Read timeout (PT2S) waiting on HTTP server at " + uri);
     }
     if (isNonRoutableAddress(uri) && exception instanceof ClosedChannelException) {
+      if (OS.WINDOWS.isCurrentOs()) {
+        return exception;
+      }
       return new PrematureChannelClosureException();
     }
     return exception;

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

@@ -164,8 +164,16 @@ private static Throwable nettyClientSpanErrorMapper(URI uri, Throwable exception
       return new HttpClientReadTimeoutException(
           "Read timeout (PT2S) waiting on HTTP server at " + uri);
     }
-    if (!IS_WINDOWS && isNonRoutableAddress(uri) && exception instanceof ClosedChannelException) {
-      return new PrematureChannelClosureException();
+    if (isNonRoutableAddress(uri)) {
+      if (exception instanceof ClosedChannelException) {
+        return IS_WINDOWS ? exception : new PrematureChannelClosureException();
+      }
+      if (!IS_WINDOWS) {
+        Throwable timeoutCause = findExceptionWithMessage(exception, "connection timed out");
+        if (timeoutCause != null) {
+          return timeoutCause;
+        }
+      }
     }
     return exception;
   }
@@ -202,4 +210,24 @@ private static boolean isNonRoutableAddress(URI uri) {
   private static boolean isUnopenedPort(URI uri) {
     return "localhost".equals(uri.getHost()) && uri.getPort() == PortUtils.UNUSABLE_PORT;
   }
+
+  private static Throwable findExceptionWithMessage(Throwable exception, String expectedFragment) {
+    if (exception == null) {
+      return null;
+    }
+    String needle = expectedFragment.toLowerCase(Locale.ROOT);
+    Throwable current = exception;
+    while (current != null) {
+      String message = current.getMessage();
+      if (message != null && message.toLowerCase(Locale.ROOT).contains(needle)) {
+        return current;
+      }
+      Throwable cause = current.getCause();
+      if (cause == null || cause == current) {
+        break;
+      }
+      current = cause;
+    }
+    return null;
+  }
 }