Fix Long vs int type mismatch in isIn() for NETWORK_PEER_PORT

trask · trask · commit 614ac2b2ea71 · 2026-03-31T19:49:55.000-07:00
diff --git a/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java b/instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ConnectionSpanTest.java
@@ -143,7 +143,7 @@ void failedRequest() throws Exception {
                       equalTo(SERVER_ADDRESS, uri.getHost()),
                       equalTo(SERVER_PORT, uri.getPort()),
                       equalTo(maybeStablePeerService(), "test-peer-service"),
-                      satisfies(NETWORK_PEER_PORT, val -> val.isIn(uri.getPort(), null)),
+                      satisfies(NETWORK_PEER_PORT, val -> val.isIn((long) uri.getPort(), null)),
                       satisfies(NETWORK_PEER_ADDRESS, val -> val.isIn("127.0.0.1", null)));
                 }));
   }
diff --git a/instrumentation/netty/netty-4.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/Netty41ConnectionSpanTest.java b/instrumentation/netty/netty-4.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/Netty41ConnectionSpanTest.java
@@ -184,7 +184,7 @@ void testFailingRequest() throws Exception {
                             satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", null)),
                             equalTo(SERVER_ADDRESS, uri.getHost()),
                             equalTo(SERVER_PORT, uri.getPort()),
-                            satisfies(NETWORK_PEER_PORT, val -> val.isIn(uri.getPort(), null)),
+                            satisfies(NETWORK_PEER_PORT, val -> val.isIn((long) uri.getPort(), null)),
                             satisfies(NETWORK_PEER_ADDRESS, val -> val.isIn("127.0.0.1", null)),
                             equalTo(maybeStablePeerService(), "test-peer-service"))));
   }

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ void failedRequest() throws Exception {`
`143`	`143`	`equalTo(SERVER_ADDRESS, uri.getHost()),`
`144`	`144`	`equalTo(SERVER_PORT, uri.getPort()),`
`145`	`145`	`equalTo(maybeStablePeerService(), "test-peer-service"),`
`146`		`- satisfies(NETWORK_PEER_PORT, val -> val.isIn(uri.getPort(), null)),`
	`146`	`+ satisfies(NETWORK_PEER_PORT, val -> val.isIn((long) uri.getPort(), null)),`
`147`	`147`	`satisfies(NETWORK_PEER_ADDRESS, val -> val.isIn("127.0.0.1", null)));`
`148`	`148`	`}));`
`149`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ void testFailingRequest() throws Exception {`
`184`	`184`	`satisfies(NETWORK_TYPE, val -> val.isIn("ipv4", null)),`
`185`	`185`	`equalTo(SERVER_ADDRESS, uri.getHost()),`
`186`	`186`	`equalTo(SERVER_PORT, uri.getPort()),`
`187`		`- satisfies(NETWORK_PEER_PORT, val -> val.isIn(uri.getPort(), null)),`
	`187`	`+ satisfies(NETWORK_PEER_PORT, val -> val.isIn((long) uri.getPort(), null)),`
`188`	`188`	`satisfies(NETWORK_PEER_ADDRESS, val -> val.isIn("127.0.0.1", null)),`
`189`	`189`	`equalTo(maybeStablePeerService(), "test-peer-service"))));`
`190`	`190`	`}`