Skip to content

Commit e4973fc

Browse files
committed
Remove knownMatchingTypes override from version-specific impls
1 parent 5483ba8 commit e4973fc

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

dd-java-agent/instrumentation/spark/spark_2.12/src/main/java/datadog/trace/instrumentation/spark/Spark212Instrumentation.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@ public String[] helperClassNames() {
3636
};
3737
}
3838

39-
@Override
40-
public String[] knownMatchingTypes() {
41-
String[] res = new String[super.knownMatchingTypes().length + 1];
42-
int idx = 0;
43-
for (String match : super.knownMatchingTypes()) {
44-
res[idx] = match;
45-
idx++;
46-
}
47-
res[idx] = "org.apache.spark.sql.execution.SparkPlanInfo$";
48-
return res;
49-
}
50-
5139
@Override
5240
public void methodAdvice(MethodTransformer transformer) {
5341
super.methodAdvice(transformer);

dd-java-agent/instrumentation/spark/spark_2.13/src/main/java/datadog/trace/instrumentation/spark/Spark213Instrumentation.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@ public String[] helperClassNames() {
3636
};
3737
}
3838

39-
@Override
40-
public String[] knownMatchingTypes() {
41-
String[] res = new String[super.knownMatchingTypes().length + 1];
42-
int idx = 0;
43-
for (String match : super.knownMatchingTypes()) {
44-
res[idx] = match;
45-
idx++;
46-
}
47-
res[idx] = "org.apache.spark.sql.execution.SparkPlanInfo$";
48-
return res;
49-
}
50-
5139
@Override
5240
public void methodAdvice(MethodTransformer transformer) {
5341
super.methodAdvice(transformer);

dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/AbstractSparkInstrumentation.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public String[] knownMatchingTypes() {
3636
"org.apache.spark.deploy.yarn.ApplicationMaster",
3737
"org.apache.spark.util.Utils",
3838
"org.apache.spark.util.SparkClassUtils",
39-
"org.apache.spark.scheduler.LiveListenerBus"
39+
"org.apache.spark.scheduler.LiveListenerBus",
40+
"org.apache.spark.sql.execution.SparkPlanInfo$"
4041
};
4142
}
4243

0 commit comments

Comments
 (0)