Skip to content

Commit c21ff33

Browse files
authored
Fix netty instrumentation requirement for JDK 27 (#11904)
Fix netty instrumentation requirement for JDK 27 Co-authored-by: sarah.chen <sarah.chen@datadoghq.com>
1 parent 9e673a6 commit c21ff33

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
33
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
44
import static org.asynchttpclient.Dsl.asyncHttpClient
55

6-
import datadog.environment.JavaVirtualMachine
76
import datadog.trace.agent.test.base.HttpClientTest
87
import datadog.trace.agent.test.naming.TestingNettyHttpNamingConventions
98
import datadog.trace.bootstrap.instrumentation.api.Tags
@@ -23,7 +22,6 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig
2322
import org.asynchttpclient.Response
2423
import org.asynchttpclient.proxy.ProxyServer
2524
import spock.lang.AutoCleanup
26-
import spock.lang.IgnoreIf
2725
import spock.lang.Timeout
2826

2927
import java.util.concurrent.ExecutionException
@@ -97,9 +95,6 @@ abstract class Netty41ClientTest extends HttpClientTest {
9795
return false
9896
}
9997

100-
@IgnoreIf(reason = "JDK 27 TODO: address failing test", value = {
101-
JavaVirtualMachine.isJavaVersion(27)
102-
})
10398
def "connection error (unopened port)"() {
10499
given:
105100
def uri = new URI("http://127.0.0.1:$UNUSABLE_PORT/")
@@ -126,7 +121,9 @@ abstract class Netty41ClientTest extends HttpClientTest {
126121
errored true
127122
tags {
128123
"$Tags.COMPONENT" "netty"
129-
errorTags AbstractChannel.AnnotatedConnectException, "Connection refused: /127.0.0.1:$UNUSABLE_PORT"
124+
errorTags AbstractChannel.AnnotatedConnectException, {
125+
it.startsWith("Connection refused") && it.endsWith("/127.0.0.1:$UNUSABLE_PORT")
126+
}
130127
defaultTags()
131128
}
132129
}

0 commit comments

Comments
 (0)