better

Author: trask

instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/AbstractChannelHandlerContextInstrumentation.java

@@ -49,15 +49,6 @@ public static class InvokeExceptionCaughtAdvice {
     public static void onEnter(
         @Advice.This ChannelHandlerContext ctx, @Advice.Argument(0) Throwable throwable) {
 
-      // On Windows, Netty wraps connection exceptions in AbstractChannel.AnnotatedConnectException
-      // Unwrap to get the actual exception type for proper error reporting
-      Throwable error = throwable;
-      if (error != null
-          && error.getClass().getName().contains("AnnotatedConnectException")
-          && error.getCause() != null) {
-        error = error.getCause();
-      }
-
       // we can't rely on exception handling in HttpClientTracingHandler because it can't catch
       // exceptions from handlers that run after it, for example ratpack has ReadTimeoutHandler
       // (trigger ReadTimeoutException) after HttpClientCodec (or handler is inserted after it)
@@ -67,12 +58,12 @@ public static void onEnter(
         ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT).remove();
         contextAttr.remove();
         HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndRemove();
-        instrumenter().end(clientContext, request, null, error);
+        instrumenter().end(clientContext, request, null, throwable);
         return;
       }
       ServerContext serverContext = ServerContexts.peekFirst(ctx.channel());
       if (serverContext != null) {
-        NettyErrorHolder.set(serverContext.context(), error);
+        NettyErrorHolder.set(serverContext.context(), throwable);
       }
     }
   }

instrumentation/netty/netty-common-4.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/NettyScope.java

@@ -46,12 +46,6 @@ public static void end(
     nettyScope.scope.close();
 
     if (throwable != null) {
-      // On Windows, Netty wraps connection exceptions in AbstractChannel.AnnotatedConnectException
-      // Unwrap to get the actual exception type for proper error reporting
-      if (throwable.getClass().getName().contains("AnnotatedConnectException")
-          && throwable.getCause() != null) {
-        throwable = throwable.getCause();
-      }
       instrumenter.end(nettyScope.context, nettyScope.request, null, throwable);
     } else {
       channelPromise.addListener(

instrumentation/netty/netty-common-4.0/library/src/main/java/io/opentelemetry/instrumentation/netty/common/v4_0/internal/client/ConnectionCompleteListener.java

@@ -34,14 +34,6 @@ public void operationComplete(Future<Void> future) {
     if (future instanceof ChannelFuture) {
       channel = ((ChannelFuture) future).channel();
     }
-    Throwable error = future.cause();
-    // On Windows, Netty wraps connection exceptions in AbstractChannel.AnnotatedConnectException
-    // Unwrap to get the actual exception type for proper error reporting
-    if (error != null
-        && error.getClass().getName().contains("AnnotatedConnectException")
-        && error.getCause() != null) {
-      error = error.getCause();
-    }
-    instrumenter.end(context, request, channel, error);
+    instrumenter.end(context, request, channel, future.cause());
   }
 }

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

@@ -9,15 +9,18 @@
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
 import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
 
+import io.netty.handler.codec.PrematureChannelClosureException;
 import io.netty.handler.timeout.ReadTimeoutException;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions;
 import java.net.URI;
+import java.nio.channels.ClosedChannelException;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import org.junit.jupiter.api.AfterAll;
@@ -167,19 +170,14 @@ protected boolean useNettyClientAttributes() {
   }
 
   private static Throwable nettyClientSpanErrorMapper(URI uri, Throwable exception) {
-    // Unwrap AnnotatedConnectException (Windows behavior) so test assertions match what instrumentation records
-    Throwable unwrappedException = exception;
-    if (exception != null
-        && exception.getClass().getName().contains("AnnotatedConnectException")
-        && exception.getCause() != null) {
-      unwrappedException = exception.getCause();
-    }
-
     // For read timeout, map to ReadTimeoutException
     if (uri.getPath().equals("/read-timeout")) {
       return ReadTimeoutException.INSTANCE;
     }
-    return unwrappedException;
+    if (isNonRoutableAddress(uri) && exception instanceof ClosedChannelException) {
+      return new PrematureChannelClosureException();
+    }
+    return exception;
   }
 
   private static String nettyExpectedClientSpanNameMapper(URI uri, String method) {
@@ -190,12 +188,16 @@ private static String nettyExpectedClientSpanNameMapper(URI uri, String method)
         // 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().contains("win")) {
+        if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("win")) {
           return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);
         }
         return "CONNECT";
       default:
         return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);
     }
   }
+
+  private static boolean isNonRoutableAddress(URI uri) {
+    return "192.0.2.1".equals(uri.getHost());
+  }
 }

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

@@ -18,6 +18,7 @@
 import java.net.URI;
 import java.time.Duration;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import org.junit.jupiter.api.AfterAll;
@@ -152,19 +153,11 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
   }
 
   private static Throwable nettyClientSpanErrorMapper(URI uri, Throwable exception) {
-    // Unwrap AnnotatedConnectException (Windows behavior) so test assertions match what instrumentation records
-    Throwable unwrappedException = exception;
-    if (exception != null
-        && exception.getClass().getName().contains("AnnotatedConnectException")
-        && exception.getCause() != null) {
-      unwrappedException = exception.getCause();
-    }
-
     // For read timeout, map to HttpClientReadTimeoutException
     if (uri.getPath().equals("/read-timeout")) {
       return HttpClientReadTimeoutException.INSTANCE;
     }
-    return unwrappedException;
+    return exception;
   }
 
   private static String nettyExpectedClientSpanNameMapper(URI uri, String method) {
@@ -175,7 +168,7 @@ private static String nettyExpectedClientSpanNameMapper(URI uri, String method)
         // 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().contains("win")) {
+        if (System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("win")) {
           return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);
         }
         return "CONNECT";