Skip to content

Commit ee6b3da

Browse files
chore(rmi): Disabling outdated instrumentation (#10897)
chore(rmi): Disabling outdated instrumentation Co-authored-by: bruce.bujon <bruce.bujon@datadoghq.com>
1 parent f452dff commit ee6b3da

File tree

5 files changed

+16
-6
lines changed

5 files changed

+16
-6
lines changed

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

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

33+
@Override
34+
protected boolean defaultEnabled() {
35+
return false;
36+
}
37+
3338
@Override
3439
public String hierarchyMarkerType() {
3540
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: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
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;
1514
import datadog.trace.bootstrap.ContextStore;
1615
import datadog.trace.bootstrap.InstrumentationContext;
1716
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
@@ -55,8 +54,7 @@ public RmiClientContextInstrumentation() {
5554

5655
@Override
5756
protected boolean defaultEnabled() {
58-
return super.defaultEnabled()
59-
&& !Platform.isNativeImageBuilder(); // not applicable in native-image
57+
return false;
6058
}
6159

6260
@Override

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
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;
1413
import datadog.trace.bootstrap.instrumentation.rmi.ContextDispatcher;
1514
import net.bytebuddy.asm.Advice;
1615
import net.bytebuddy.description.type.TypeDescription;
@@ -29,8 +28,7 @@ public RmiServerContextInstrumentation() {
2928

3029
@Override
3130
protected boolean defaultEnabled() {
32-
return super.defaultEnabled()
33-
&& !Platform.isNativeImageBuilder(); // not applicable in native-image
31+
return false;
3432
}
3533

3634
@Override

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

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

36+
@Override
37+
protected boolean defaultEnabled() {
38+
return false;
39+
}
40+
3641
@Override
3742
public String hierarchyMarkerType() {
3843
return null; // bootstrap type

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ 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+
1719
abstract class RmiTest extends VersionedNamingTestBase {
1820
def registryPort = PortUtils.randomOpenPort()
1921
def serverRegistry = LocateRegistry.createRegistry(registryPort)
@@ -229,6 +231,7 @@ abstract class RmiTest extends VersionedNamingTestBase {
229231
}
230232
}
231233

234+
@Ignore
232235
class RmiV0Test extends RmiTest {
233236

234237
@Override
@@ -247,6 +250,7 @@ class RmiV0Test extends RmiTest {
247250
}
248251
}
249252

253+
@Ignore
250254
class RmiV1ForkedTest extends RmiTest {
251255

252256
@Override

0 commit comments

Comments
 (0)