Skip to content

Commit 0f1415b

Browse files
trasktrask
committed
temp
1 parent 97286ca commit 0f1415b

File tree

5 files changed

+81
-40
lines changed

5 files changed

+81
-40
lines changed

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,15 @@ public static class InvokeExceptionCaughtAdvice {
4949
public static void onEnter(
5050
@Advice.This ChannelHandlerContext ctx, @Advice.Argument(0) Throwable throwable) {
5151

52+
// On Windows, Netty wraps connection exceptions in AbstractChannel.AnnotatedConnectException
53+
// Unwrap to get the actual exception type for proper error reporting
54+
Throwable error = throwable;
55+
if (error != null
56+
&& error.getClass().getName().contains("AnnotatedConnectException")
57+
&& error.getCause() != null) {
58+
error = error.getCause();
59+
}
60+
5261
// we can't rely on exception handling in HttpClientTracingHandler because it can't catch
5362
// exceptions from handlers that run after it, for example ratpack has ReadTimeoutHandler
5463
// (trigger ReadTimeoutException) after HttpClientCodec (or handler is inserted after it)
@@ -58,12 +67,12 @@ public static void onEnter(
5867
ctx.channel().attr(AttributeKeys.CLIENT_PARENT_CONTEXT).remove();
5968
contextAttr.remove();
6069
HttpRequestAndChannel request = ctx.channel().attr(HTTP_CLIENT_REQUEST).getAndRemove();
61-
instrumenter().end(clientContext, request, null, throwable);
70+
instrumenter().end(clientContext, request, null, error);
6271
return;
6372
}
6473
ServerContext serverContext = ServerContexts.peekFirst(ctx.channel());
6574
if (serverContext != null) {
66-
NettyErrorHolder.set(serverContext.context(), throwable);
75+
NettyErrorHolder.set(serverContext.context(), error);
6776
}
6877
}
6978
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ public static void end(
4646
nettyScope.scope.close();
4747

4848
if (throwable != null) {
49+
// On Windows, Netty wraps connection exceptions in AbstractChannel.AnnotatedConnectException
50+
// Unwrap to get the actual exception type for proper error reporting
51+
if (throwable.getClass().getName().contains("AnnotatedConnectException")
52+
&& throwable.getCause() != null) {
53+
throwable = throwable.getCause();
54+
}
4955
instrumenter.end(nettyScope.context, nettyScope.request, null, throwable);
5056
} else {
5157
channelPromise.addListener(

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ public void operationComplete(Future<Void> future) {
3434
if (future instanceof ChannelFuture) {
3535
channel = ((ChannelFuture) future).channel();
3636
}
37-
instrumenter.end(context, request, channel, future.cause());
37+
Throwable error = future.cause();
38+
// On Windows, Netty wraps connection exceptions in AbstractChannel.AnnotatedConnectException
39+
// Unwrap to get the actual exception type for proper error reporting
40+
if (error != null
41+
&& error.getClass().getName().contains("AnnotatedConnectException")
42+
&& error.getCause() != null) {
43+
error = error.getCause();
44+
}
45+
instrumenter.end(context, request, channel, error);
3846
}
3947
}

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
1010
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
1111

12-
import io.netty.channel.ConnectTimeoutException;
1312
import io.netty.handler.timeout.ReadTimeoutException;
1413
import io.opentelemetry.api.common.AttributeKey;
1514
import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpClientTest;
@@ -23,7 +22,6 @@
2322
import java.util.Set;
2423
import org.junit.jupiter.api.AfterAll;
2524
import org.junit.jupiter.api.BeforeAll;
26-
import org.junit.jupiter.api.condition.OS;
2725
import ratpack.exec.Operation;
2826
import ratpack.exec.Promise;
2927
import ratpack.func.Action;
@@ -141,13 +139,6 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
141139
// these tests will pass, but they don't really test anything since REQUEST is Void
142140
optionsBuilder.disableTestReusedRequest();
143141

144-
// Connection error tests fail on Windows due to different exception handling by Netty
145-
// even with the unwrapping and error mapping logic above
146-
if (OS.WINDOWS.isCurrentOs()) {
147-
optionsBuilder.disableTestConnectionFailure();
148-
optionsBuilder.disableTestRemoteConnection();
149-
}
150-
151142
optionsBuilder.spanEndsAfterBody();
152143
}
153144

@@ -176,23 +167,32 @@ protected boolean useNettyClientAttributes() {
176167
}
177168

178169
private static Throwable nettyClientSpanErrorMapper(URI uri, Throwable exception) {
179-
if (uri.toString().equals("https://192.0.2.1/")) {
180-
return new ConnectTimeoutException(
181-
"connection timed out"
182-
+ (Boolean.getBoolean("testLatestDeps") ? " after 2000 ms" : "")
183-
+ ": /192.0.2.1:443");
184-
} else if (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/")) {
185-
return new ConnectTimeoutException("connection timed out: localhost/127.0.0.1:61");
186-
} else if (uri.getPath().equals("/read-timeout")) {
170+
// Unwrap AnnotatedConnectException (Windows behavior) so test assertions match what instrumentation records
171+
Throwable unwrappedException = exception;
172+
if (exception != null
173+
&& exception.getClass().getName().contains("AnnotatedConnectException")
174+
&& exception.getCause() != null) {
175+
unwrappedException = exception.getCause();
176+
}
177+
178+
// For read timeout, map to ReadTimeoutException
179+
if (uri.getPath().equals("/read-timeout")) {
187180
return ReadTimeoutException.INSTANCE;
188181
}
189-
return exception;
182+
return unwrappedException;
190183
}
191184

192185
private static String nettyExpectedClientSpanNameMapper(URI uri, String method) {
193186
switch (uri.toString()) {
194187
case "http://localhost:61/": // unopened port
188+
return "CONNECT";
195189
case "https://192.0.2.1/": // non routable address
190+
// On Windows, non-routable addresses don't fail at CONNECT level.
191+
// The connection proceeds far enough to start HTTP processing before
192+
// the channel closes, resulting in an HTTP span instead of CONNECT.
193+
if (System.getProperty("os.name").toLowerCase().contains("win")) {
194+
return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);
195+
}
196196
return "CONNECT";
197197
default:
198198
return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);

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

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PROTOCOL_VERSION;
99

1010
import com.google.common.collect.ImmutableList;
11-
import io.netty.channel.ConnectTimeoutException;
1211
import io.opentelemetry.api.common.AttributeKey;
1312
import io.opentelemetry.context.Context;
1413
import io.opentelemetry.instrumentation.ratpack.v1_7.internal.OpenTelemetryExecInitializer;
@@ -23,7 +22,6 @@
2322
import java.util.Set;
2423
import org.junit.jupiter.api.AfterAll;
2524
import org.junit.jupiter.api.BeforeAll;
26-
import org.junit.jupiter.api.condition.OS;
2725
import ratpack.exec.Operation;
2826
import ratpack.exec.Promise;
2927
import ratpack.exec.internal.DefaultExecController;
@@ -139,31 +137,51 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
139137
});
140138

141139
optionsBuilder.setClientSpanErrorMapper(
142-
(uri, exception) -> {
143-
if (uri.toString().equals("https://192.0.2.1/")) {
144-
return new ConnectTimeoutException("Connect timeout (PT2S) connecting to " + uri);
145-
} else if (OS.WINDOWS.isCurrentOs() && uri.toString().equals("http://localhost:61/")) {
146-
return new ConnectTimeoutException("Connect timeout (PT2S) connecting to " + uri);
147-
} else if (uri.getPath().equals("/read-timeout")) {
148-
return new HttpClientReadTimeoutException(
149-
"Read timeout (PT2S) waiting on HTTP server at " + uri);
150-
}
151-
return exception;
152-
});
140+
AbstractRatpackHttpClientTest::nettyClientSpanErrorMapper);
141+
142+
optionsBuilder.setExpectedClientSpanNameMapper(
143+
AbstractRatpackHttpClientTest::nettyExpectedClientSpanNameMapper);
144+
153145
optionsBuilder.setHttpAttributes(this::computeHttpAttributes);
154146

155147
optionsBuilder.disableTestRedirects();
156148
// these tests will pass, but they don't really test anything since REQUEST is Void
157149
optionsBuilder.disableTestReusedRequest();
158150

159-
// Connection error tests fail on Windows due to different exception handling by Netty
160-
// even with the unwrapping and error mapping logic above
161-
if (OS.WINDOWS.isCurrentOs()) {
162-
optionsBuilder.disableTestConnectionFailure();
163-
optionsBuilder.disableTestRemoteConnection();
151+
optionsBuilder.spanEndsAfterBody();
152+
}
153+
154+
private static Throwable nettyClientSpanErrorMapper(URI uri, Throwable exception) {
155+
// Unwrap AnnotatedConnectException (Windows behavior) so test assertions match what instrumentation records
156+
Throwable unwrappedException = exception;
157+
if (exception != null
158+
&& exception.getClass().getName().contains("AnnotatedConnectException")
159+
&& exception.getCause() != null) {
160+
unwrappedException = exception.getCause();
164161
}
165162

166-
optionsBuilder.spanEndsAfterBody();
163+
// For read timeout, map to HttpClientReadTimeoutException
164+
if (uri.getPath().equals("/read-timeout")) {
165+
return HttpClientReadTimeoutException.INSTANCE;
166+
}
167+
return unwrappedException;
168+
}
169+
170+
private static String nettyExpectedClientSpanNameMapper(URI uri, String method) {
171+
switch (uri.toString()) {
172+
case "http://localhost:61/": // unopened port
173+
return "CONNECT";
174+
case "https://192.0.2.1/": // non routable address
175+
// On Windows, non-routable addresses don't fail at CONNECT level.
176+
// The connection proceeds far enough to start HTTP processing before
177+
// the channel closes, resulting in an HTTP span instead of CONNECT.
178+
if (System.getProperty("os.name").toLowerCase().contains("win")) {
179+
return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);
180+
}
181+
return "CONNECT";
182+
default:
183+
return HttpClientTestOptions.DEFAULT_EXPECTED_CLIENT_SPAN_NAME_MAPPER.apply(uri, method);
184+
}
167185
}
168186

169187
protected Set<AttributeKey<?>> computeHttpAttributes(URI uri) {

0 commit comments

Comments
 (0)