diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java index 299f9189089..a260389d649 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java @@ -30,6 +30,11 @@ public RmiClientInstrumentation() { super("rmi", "rmi-client"); } + @Override + protected boolean defaultEnabled() { + return false; + } + @Override public String hierarchyMarkerType() { return null; // bootstrap type diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java index 2baea7bb86e..876d7347c8b 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java @@ -11,7 +11,6 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Platform; import datadog.trace.bootstrap.ContextStore; import datadog.trace.bootstrap.InstrumentationContext; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -55,8 +54,7 @@ public RmiClientContextInstrumentation() { @Override protected boolean defaultEnabled() { - return super.defaultEnabled() - && !Platform.isNativeImageBuilder(); // not applicable in native-image + return false; } @Override diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java index bb479566719..386b75b04eb 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java @@ -10,7 +10,6 @@ import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.api.Platform; import datadog.trace.bootstrap.instrumentation.rmi.ContextDispatcher; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; @@ -29,8 +28,7 @@ public RmiServerContextInstrumentation() { @Override protected boolean defaultEnabled() { - return super.defaultEnabled() - && !Platform.isNativeImageBuilder(); // not applicable in native-image + return false; } @Override diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java index dab340c3833..ab8f49f3339 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java @@ -33,6 +33,11 @@ public RmiServerInstrumentation() { super("rmi", "rmi-server"); } + @Override + protected boolean defaultEnabled() { + return false; + } + @Override public String hierarchyMarkerType() { return null; // bootstrap type diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/groovy/RmiTest.groovy b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/groovy/RmiTest.groovy index 4e834313dd5..8cd16e04e8b 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/groovy/RmiTest.groovy +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/groovy/RmiTest.groovy @@ -14,6 +14,8 @@ import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces import static datadog.trace.agent.test.utils.TraceUtils.basicSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace +import spock.lang.Ignore + abstract class RmiTest extends VersionedNamingTestBase { def registryPort = PortUtils.randomOpenPort() def serverRegistry = LocateRegistry.createRegistry(registryPort) @@ -229,6 +231,7 @@ abstract class RmiTest extends VersionedNamingTestBase { } } +@Ignore class RmiV0Test extends RmiTest { @Override @@ -247,6 +250,7 @@ class RmiV0Test extends RmiTest { } } +@Ignore class RmiV1ForkedTest extends RmiTest { @Override