Skip to content

Commit 9a2bad6

Browse files
heyamslaurit
andauthored
Convert netty 4.0 test to java (#9976)
Co-authored-by: Lauri Tulmin <[email protected]>
1 parent f61308c commit 9a2bad6

File tree

14 files changed

+1161
-948
lines changed

14 files changed

+1161
-948
lines changed

instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4/common/AbstractNettyChannelPipelineInstrumentation.java

+10-12
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,13 @@ public static void removeHandler(
167167
pipeline.remove(ourHandler);
168168
}
169169
virtualField.set(handler, null);
170-
} else if (handler
171-
.getClass()
172-
.getName()
173-
.startsWith("io.opentelemetry.javaagent.instrumentation.netty.")) {
174-
handler = pipeline.removeLast();
175-
} else if (handler
176-
.getClass()
177-
.getName()
178-
.startsWith("io.opentelemetry.instrumentation.netty.")) {
179-
handler = pipeline.removeLast();
170+
} else {
171+
String handlerClassName = handler.getClass().getName();
172+
if (handlerClassName.endsWith("TracingHandler")
173+
&& (handlerClassName.startsWith("io.opentelemetry.javaagent.instrumentation.netty.")
174+
|| handlerClassName.startsWith("io.opentelemetry.instrumentation.netty."))) {
175+
handler = pipeline.removeLast();
176+
}
180177
}
181178
}
182179
}
@@ -210,8 +207,9 @@ public static void wrapIterator(@Advice.Return Map<String, ChannelHandler> map)
210207
for (Iterator<ChannelHandler> iterator = map.values().iterator(); iterator.hasNext(); ) {
211208
ChannelHandler handler = iterator.next();
212209
String handlerClassName = handler.getClass().getName();
213-
if (handlerClassName.startsWith("io.opentelemetry.javaagent.instrumentation.netty.")
214-
|| handlerClassName.startsWith("io.opentelemetry.instrumentation.netty.")) {
210+
if (handlerClassName.endsWith("TracingHandler")
211+
&& (handlerClassName.startsWith("io.opentelemetry.javaagent.instrumentation.netty.")
212+
|| handlerClassName.startsWith("io.opentelemetry.instrumentation.netty."))) {
215213
iterator.remove();
216214
}
217215
}

instrumentation/netty/netty-4.0/javaagent/src/test/groovy/ChannelFutureTest.groovy

-74
This file was deleted.

instrumentation/netty/netty-4.0/javaagent/src/test/groovy/ChannelPipelineTest.groovy

-165
This file was deleted.

0 commit comments

Comments
 (0)