Skip to content

Revert RMI instrumentation deactivation (#10897) #10936

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

Merged
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Mar 25, 2026
+6 −16
Merged

Revert RMI instrumentation deactivation (#10897) #10936

Show file tree
Hide file tree
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
5 changes: 0 additions & 5 deletions ...-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ public RmiClientInstrumentation() {
super("rmi", "rmi-client");
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public String hierarchyMarkerType() {
return null; // bootstrap type
Expand Down
4 changes: 3 additions & 1 deletion ...ava/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
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;
Expand Down Expand Up @@ -54,7 +55,8 @@ public RmiClientContextInstrumentation() {

@Override
protected boolean defaultEnabled() {
return false;
return super.defaultEnabled()
&& !Platform.isNativeImageBuilder(); // not applicable in native-image
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion ...ava/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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;
Expand All @@ -28,7 +29,8 @@ public RmiServerContextInstrumentation() {

@Override
protected boolean defaultEnabled() {
return false;
return super.defaultEnabled()
&& !Platform.isNativeImageBuilder(); // not applicable in native-image
}

@Override
Expand Down
5 changes: 0 additions & 5 deletions ...-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@ public RmiServerInstrumentation() {
super("rmi", "rmi-server");
}

@Override
protected boolean defaultEnabled() {
return false;
}

@Override
public String hierarchyMarkerType() {
return null; // bootstrap type
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/groovy/RmiTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ 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)
Expand Down Expand Up @@ -231,7 +229,6 @@ abstract class RmiTest extends VersionedNamingTestBase {
}
}

@Ignore
class RmiV0Test extends RmiTest {

@Override
Expand All @@ -250,7 +247,6 @@ class RmiV0Test extends RmiTest {
}
}

@Ignore
class RmiV1ForkedTest extends RmiTest {

@Override
Expand Down
Loading