try to fix netty tests

amarziali · amarziali · commit 3357f5c8fe4f · 2025-04-16T14:00:47.000+02:00
diff --git a/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ServerTest.groovy b/dd-java-agent/instrumentation/netty-3.8/src/test/groovy/datadog/trace/instrumentation/netty38/Netty38ServerTest.groovy
@@ -172,7 +172,7 @@ abstract class Netty38ServerTest extends HttpServerTest<ServerBootstrap> {
             def frame = msg.getMessage() as WebSocketFrame
 
             if (frame instanceof CloseWebSocketFrame) {
-              this.handshaker.close(ctx.getChannel(), (CloseWebSocketFrame) frame)
+              WsEndpoint.onClose()
             } else if (frame instanceof PingWebSocketFrame) {
               ctx.getChannel().write(new PongWebSocketFrame(frame.getBinaryData()))
             } else if (frame instanceof TextWebSocketFrame || frame instanceof BinaryWebSocketFrame || frame instanceof ContinuationWebSocketFrame) {
diff --git a/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ServerTest.groovy b/dd-java-agent/instrumentation/netty-4.0/src/test/groovy/Netty40ServerTest.groovy
@@ -136,6 +136,8 @@ abstract class Netty40ServerTest extends HttpServerTest<EventLoopGroup> {
                 if (msg instanceof TextWebSocketFrame || msg instanceof BinaryWebSocketFrame || msg instanceof ContinuationWebSocketFrame) {
                   // generate a child span. The websocket test expects this way
                   runUnderTrace("onRead", {})
+                } else if (msg instanceof CloseWebSocketFrame) {
+                  WsEndpoint.onClose()
                 }
               },
               exceptionCaught    : { ChannelHandlerContext ctx, Throwable cause ->
diff --git a/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ServerTest.groovy b/dd-java-agent/instrumentation/netty-4.1/src/test/groovy/Netty41ServerTest.groovy
@@ -162,6 +162,8 @@ abstract class Netty41ServerTest extends HttpServerTest<EventLoopGroup> {
                 if (msg instanceof TextWebSocketFrame || msg instanceof BinaryWebSocketFrame || msg instanceof ContinuationWebSocketFrame) {
                   // generate a child span. The websocket test expects this way
                   runUnderTrace("onRead", {})
+                } else if (msg instanceof CloseWebSocketFrame) {
+                  WsEndpoint.onClose()
                 }
               },
               exceptionCaught    : { ChannelHandlerContext ctx, Throwable cause ->

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,8 @@ abstract class Netty40ServerTest extends HttpServerTest<EventLoopGroup> {`
`136`	`136`	`if (msg instanceof TextWebSocketFrame \|\| msg instanceof BinaryWebSocketFrame \|\| msg instanceof ContinuationWebSocketFrame) {`
`137`	`137`	`// generate a child span. The websocket test expects this way`
`138`	`138`	`runUnderTrace("onRead", {})`
	`139`	`+ } else if (msg instanceof CloseWebSocketFrame) {`
	`140`	`+ WsEndpoint.onClose()`
`139`	`141`	`}`
`140`	`142`	`},`
`141`	`143`	`exceptionCaught : { ChannelHandlerContext ctx, Throwable cause ->`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,8 @@ abstract class Netty41ServerTest extends HttpServerTest<EventLoopGroup> {`
`162`	`162`	`if (msg instanceof TextWebSocketFrame \|\| msg instanceof BinaryWebSocketFrame \|\| msg instanceof ContinuationWebSocketFrame) {`
`163`	`163`	`// generate a child span. The websocket test expects this way`
`164`	`164`	`runUnderTrace("onRead", {})`
	`165`	`+ } else if (msg instanceof CloseWebSocketFrame) {`
	`166`	`+ WsEndpoint.onClose()`
`165`	`167`	`}`
`166`	`168`	`},`
`167`	`169`	`exceptionCaught : { ChannelHandlerContext ctx, Throwable cause ->`