Skip to content

Commit 5dca385

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
committed
Revert changes and simply skip netty test on arm64 linux.
1 parent 0384ca2 commit 5dca385

4 files changed

Lines changed: 9 additions & 43 deletions

File tree

‎dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/build.gradle‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,8 @@ addTestSuiteForDir('latestDepTest', 'test')
1515
dependencies {
1616
testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
1717
testImplementation libs.guava
18-
// netty-all ships with the linux arm64 libs only since 4.1.50+
19-
testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.50.Final'
18+
testImplementation group: 'io.netty', name: 'netty-all', version: '4.1.9.Final'
2019
testImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.0'
21-
2220
// Tomcat 10.1.+ seems to require Java 11. Limit to fix build.
2321
// TODO: Tomcat 10.0.10 has a copy of the JSR166 ThreadPoolExecutor so it needs special instrumentation
2422
latestDepTestImplementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '10.0.8'

‎dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/gradle.lockfile‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -47,37 +47,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC
4747
commons-io:commons-io:2.20.0=spotbugs
4848
de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4949
io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath
50-
io.netty:netty-all:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
51-
io.netty:netty-buffer:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
52-
io.netty:netty-codec-dns:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
53-
io.netty:netty-codec-haproxy:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
54-
io.netty:netty-codec-http2:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
55-
io.netty:netty-codec-http:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
56-
io.netty:netty-codec-memcache:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
57-
io.netty:netty-codec-mqtt:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
58-
io.netty:netty-codec-redis:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
59-
io.netty:netty-codec-smtp:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
60-
io.netty:netty-codec-socks:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
61-
io.netty:netty-codec-stomp:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
62-
io.netty:netty-codec-xml:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
63-
io.netty:netty-codec:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
64-
io.netty:netty-common:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
65-
io.netty:netty-handler-proxy:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
66-
io.netty:netty-handler-ssl-ocsp:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
67-
io.netty:netty-handler:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
68-
io.netty:netty-resolver-dns-classes-macos:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
69-
io.netty:netty-resolver-dns-native-macos:4.1.133.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath
70-
io.netty:netty-resolver-dns:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
71-
io.netty:netty-resolver:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
72-
io.netty:netty-transport-classes-epoll:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
73-
io.netty:netty-transport-classes-kqueue:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
74-
io.netty:netty-transport-native-epoll:4.1.133.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath
75-
io.netty:netty-transport-native-kqueue:4.1.133.Final=latestDepTestRuntimeClasspath,testRuntimeClasspath
76-
io.netty:netty-transport-native-unix-common:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
77-
io.netty:netty-transport-rxtx:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
78-
io.netty:netty-transport-sctp:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
79-
io.netty:netty-transport-udt:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
80-
io.netty:netty-transport:4.1.133.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
50+
io.netty:netty-all:4.1.9.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8151
io.sqreen:libsqreen:17.3.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
8252
javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8353
jaxen:jaxen:2.0.0=spotbugs

‎dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/runnable/RunnableFutureInstrumentation.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@
3030
import java.util.Collection;
3131
import java.util.Map;
3232
import java.util.concurrent.Callable;
33-
import java.util.concurrent.Delayed;
3433
import java.util.concurrent.RunnableFuture;
35-
import java.util.concurrent.TimeUnit;
3634
import net.bytebuddy.asm.Advice;
3735
import net.bytebuddy.description.type.TypeDescription;
3836
import net.bytebuddy.matcher.ElementMatcher;
@@ -149,13 +147,6 @@ public static <T> void captureScope(@Advice.This RunnableFuture<T> task) {
149147
public static final class Run {
150148
@Advice.OnMethodEnter
151149
public static <T> AgentScope activate(@Advice.This RunnableFuture<T> task) {
152-
// Newer Netty versions may execute a delayed ScheduledFutureTask once only to move it into
153-
// the scheduled queue. Keep the continuation for the run that actually invokes the task.
154-
if (task instanceof Delayed
155-
&& task.getClass().getName().endsWith(".netty.util.concurrent.ScheduledFutureTask")
156-
&& ((Delayed) task).getDelay(TimeUnit.NANOSECONDS) > 0) {
157-
return null;
158-
}
159150
return startTaskScope(InstrumentationContext.get(RunnableFuture.class, State.class), task);
160151
}
161152

‎dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,18 @@ import java.util.concurrent.Future
1717
import java.util.concurrent.RejectedExecutionException
1818
import java.util.concurrent.TimeUnit
1919
import runnable.JavaAsyncChild
20+
import spock.lang.IgnoreIf
2021
import spock.lang.Shared
2122

23+
// TODO: netty-all 4.1.9 only ships linux-x86_64 epoll native libraries.
24+
@IgnoreIf({
25+
OperatingSystem.isLinux() && OperatingSystem.isArm64()
26+
})
2227
class NettyExecutorInstrumentationTest extends InstrumentationSpecification {
28+
2329
@Shared
2430
boolean isLinux = OperatingSystem.isLinux()
31+
2532
@Shared
2633
EpollEventLoopGroup epollEventLoopGroup = isLinux ? new EpollEventLoopGroup(4) : null
2734
@Shared

0 commit comments

Comments
 (0)