Skip to content

Fix netty instrumentation requirement for JDK 27 #11904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sarahchen6 wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −6
Open

Fix netty instrumentation requirement for JDK 27 #11904

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/Netty41ClientTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
import static org.asynchttpclient.Dsl.asyncHttpClient

import datadog.environment.JavaVirtualMachine
import datadog.trace.agent.test.base.HttpClientTest
import datadog.trace.agent.test.naming.TestingNettyHttpNamingConventions
import datadog.trace.bootstrap.instrumentation.api.Tags
Expand All @@ -23,7 +22,6 @@ import org.asynchttpclient.DefaultAsyncHttpClientConfig
import org.asynchttpclient.Response
import org.asynchttpclient.proxy.ProxyServer
import spock.lang.AutoCleanup
import spock.lang.IgnoreIf
import spock.lang.Timeout

import java.util.concurrent.ExecutionException
Expand Down Expand Up @@ -97,9 +95,6 @@ abstract class Netty41ClientTest extends HttpClientTest {
return false
}

@IgnoreIf(reason = "JDK 27 TODO: address failing test", value = {
JavaVirtualMachine.isJavaVersion(27)
})
def "connection error (unopened port)"() {
given:
def uri = new URI("http://127.0.0.1:$UNUSABLE_PORT/")
Expand All @@ -126,7 +121,9 @@ abstract class Netty41ClientTest extends HttpClientTest {
errored true
tags {
"$Tags.COMPONENT" "netty"
errorTags AbstractChannel.AnnotatedConnectException, "Connection refused: /127.0.0.1:$UNUSABLE_PORT"
errorTags AbstractChannel.AnnotatedConnectException, {
it.startsWith("Connection refused") && it.endsWith("/127.0.0.1:$UNUSABLE_PORT")
}
defaultTags()
}
}
Expand Down
Loading