Skip to content

Commit ec9d8b5

Browse files
committed
chore(rmi): Revert RMI instrumentation deactivation (#10897)
This reverts commit ee6b3da.
1 parent 68aa369 commit ec9d8b5

File tree

5 files changed

+6
-16
lines changed

5 files changed

+6
-16
lines changed

dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ public RmiClientInstrumentation() {
3030
super("rmi", "rmi-client");
3131
}
3232

33-
@Override
34-
protected boolean defaultEnabled() {
35-
return false;
36-
}
37-
3833
@Override
3934
public String hierarchyMarkerType() {
4035
return null; // bootstrap type

dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/client/RmiClientContextInstrumentation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.google.auto.service.AutoService;
1212
import datadog.trace.agent.tooling.Instrumenter;
1313
import datadog.trace.agent.tooling.InstrumenterModule;
14+
import datadog.trace.api.Platform;
1415
import datadog.trace.bootstrap.ContextStore;
1516
import datadog.trace.bootstrap.InstrumentationContext;
1617
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
@@ -54,7 +55,8 @@ public RmiClientContextInstrumentation() {
5455

5556
@Override
5657
protected boolean defaultEnabled() {
57-
return false;
58+
return super.defaultEnabled()
59+
&& !Platform.isNativeImageBuilder(); // not applicable in native-image
5860
}
5961

6062
@Override

dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/context/server/RmiServerContextInstrumentation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.google.auto.service.AutoService;
1111
import datadog.trace.agent.tooling.Instrumenter;
1212
import datadog.trace.agent.tooling.InstrumenterModule;
13+
import datadog.trace.api.Platform;
1314
import datadog.trace.bootstrap.instrumentation.rmi.ContextDispatcher;
1415
import net.bytebuddy.asm.Advice;
1516
import net.bytebuddy.description.type.TypeDescription;
@@ -28,7 +29,8 @@ public RmiServerContextInstrumentation() {
2829

2930
@Override
3031
protected boolean defaultEnabled() {
31-
return false;
32+
return super.defaultEnabled()
33+
&& !Platform.isNativeImageBuilder(); // not applicable in native-image
3234
}
3335

3436
@Override

dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ public RmiServerInstrumentation() {
3333
super("rmi", "rmi-server");
3434
}
3535

36-
@Override
37-
protected boolean defaultEnabled() {
38-
return false;
39-
}
40-
4136
@Override
4237
public String hierarchyMarkerType() {
4338
return null; // bootstrap type

dd-java-agent/instrumentation/java/java-rmi-1.1/src/test/groovy/RmiTest.groovy

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
1414
import static datadog.trace.agent.test.utils.TraceUtils.basicSpan
1515
import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace
1616

17-
import spock.lang.Ignore
18-
1917
abstract class RmiTest extends VersionedNamingTestBase {
2018
def registryPort = PortUtils.randomOpenPort()
2119
def serverRegistry = LocateRegistry.createRegistry(registryPort)
@@ -231,7 +229,6 @@ abstract class RmiTest extends VersionedNamingTestBase {
231229
}
232230
}
233231

234-
@Ignore
235232
class RmiV0Test extends RmiTest {
236233

237234
@Override
@@ -250,7 +247,6 @@ class RmiV0Test extends RmiTest {
250247
}
251248
}
252249

253-
@Ignore
254250
class RmiV1ForkedTest extends RmiTest {
255251

256252
@Override

0 commit comments

Comments
 (0)