Skip to content

Commit 311e16c

Browse files
sarahchen6sarahchen6
authored
Remove manually listed instrumentation helpers (#12649)
Remove manually listed instrumentation helpers Merge branch 'master' into sarahchen6/remove-helpers Co-authored-by: sarah.chen <sarah.chen@datadoghq.com>
1 parent 9d73aa8 commit 311e16c

282 files changed

Lines changed: 0 additions & 2307 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeModule.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ public AerospikeModule() {
1515
super("aerospike");
1616
}
1717

18-
@Override
19-
public String[] helperClassNames() {
20-
return new String[] {
21-
packageName + ".AerospikeClientDecorator", packageName + ".TracingListener",
22-
};
23-
}
24-
2518
@Override
2619
public List<Instrumenter> typeInstrumentations() {
2720
final List<Instrumenter> ret = new ArrayList<>(4);

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,6 @@ public String[] knownMatchingTypes() {
3232
return new String[] {"akka.http.scaladsl.Http2Ext", "akka.http.impl.engine.http2.Http2Ext"};
3333
}
3434

35-
@Override
36-
public String[] helperClassNames() {
37-
return new String[] {
38-
packageName + ".DatadogWrapperHelper",
39-
packageName + ".DatadogWrapperHelper$SwappedContextScope",
40-
packageName + ".DatadogAsyncHandlerWrapper",
41-
packageName + ".DatadogAsyncHandlerWrapper$1",
42-
packageName + ".DatadogAsyncHandlerWrapper$2",
43-
packageName + ".AkkaHttpServerHeaders",
44-
packageName + ".AkkaHttpServerDecorator",
45-
packageName + ".RecoverFromBlockedExceptionPF",
46-
packageName + ".UriAdapter",
47-
packageName + ".appsec.AkkaBlockResponseFunction",
48-
packageName + ".appsec.BlockingResponseHelper",
49-
packageName + ".appsec.ScalaListCollector",
50-
};
51-
}
52-
5335
@Override
5436
public Reference[] additionalMuzzleReferences() {
5537
return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -61,27 +61,6 @@ public String instrumentedType() {
6161
return "akka.http.scaladsl.HttpExt";
6262
}
6363

64-
@Override
65-
public String[] helperClassNames() {
66-
return new String[] {
67-
packageName + ".DatadogWrapperHelper",
68-
packageName + ".DatadogWrapperHelper$SwappedContextScope",
69-
packageName + ".DatadogServerRequestResponseFlowWrapper",
70-
packageName + ".DatadogServerRequestResponseFlowWrapper$1",
71-
packageName + ".DatadogServerRequestResponseFlowWrapper$1$1",
72-
packageName + ".DatadogServerRequestResponseFlowWrapper$1$2",
73-
packageName + ".DatadogServerRequestResponseFlowWrapper$1$3",
74-
packageName + ".DatadogServerRequestResponseFlowWrapper$1$4",
75-
packageName + ".AkkaHttpServerHeaders",
76-
packageName + ".AkkaHttpServerDecorator",
77-
packageName + ".UriAdapter",
78-
packageName + ".RecoverFromBlockedExceptionPF",
79-
packageName + ".appsec.BlockingResponseHelper",
80-
packageName + ".appsec.ScalaListCollector",
81-
packageName + ".appsec.AkkaBlockResponseFunction",
82-
};
83-
}
84-
8564
@Override
8665
public Reference[] additionalMuzzleReferences() {
8766
return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DefaultExceptionHandlerInstrumentation.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ public String instrumentedType() {
2525
return "akka.http.scaladsl.server.ExceptionHandler$";
2626
}
2727

28-
@Override
29-
public String[] helperClassNames() {
30-
return new String[] {
31-
packageName + ".MarkSpanAsErroredPF",
32-
};
33-
}
34-
3528
@Override
3629
public void methodAdvice(MethodTransformer transformer) {
3730
transformer.applyAdvice(

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/Bug4304Instrumentation.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,6 @@ public String hierarchyMarkerType() {
4141
return "akka.http.impl.engine.server.HttpServerBluePrint";
4242
}
4343

44-
@Override
45-
public String[] helperClassNames() {
46-
return new String[] {
47-
packageName + ".AkkaBlockResponseFunction",
48-
packageName + ".BlockingResponseHelper",
49-
packageName + ".ScalaListCollector",
50-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator",
51-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders",
52-
"datadog.trace.instrumentation.akkahttp.UriAdapter",
53-
};
54-
}
55-
5644
@Override
5745
public Reference[] additionalMuzzleReferences() {
5846
return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/FormDataToStrictInstrumentation.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,6 @@ public FormDataToStrictInstrumentation() {
2727
super("akka-http");
2828
}
2929

30-
@Override
31-
public String[] helperClassNames() {
32-
return new String[] {
33-
packageName + ".UnmarshallerHelpers",
34-
packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException",
35-
packageName + ".AkkaBlockResponseFunction",
36-
packageName + ".BlockingResponseHelper",
37-
packageName + ".ScalaListCollector",
38-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator",
39-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders",
40-
"datadog.trace.instrumentation.akkahttp.UriAdapter",
41-
};
42-
}
43-
4430
@Override
4531
public String instrumentedType() {
4632
return "akka.http.scaladsl.model.Multipart$FormData";

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/JacksonUnmarshallerInstrumentation.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,6 @@ public JacksonUnmarshallerInstrumentation() {
2222
super("akka-http");
2323
}
2424

25-
@Override
26-
public String[] helperClassNames() {
27-
return new String[] {
28-
packageName + ".UnmarshallerHelpers",
29-
packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException",
30-
packageName + ".AkkaBlockResponseFunction",
31-
packageName + ".BlockingResponseHelper",
32-
packageName + ".ScalaListCollector",
33-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator",
34-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders",
35-
"datadog.trace.instrumentation.akkahttp.UriAdapter",
36-
};
37-
}
38-
3925
@Override
4026
public Reference[] additionalMuzzleReferences() {
4127
return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/MultipartUnmarshallersInstrumentation.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,6 @@ public MultipartUnmarshallersInstrumentation() {
2525
super("akka-http");
2626
}
2727

28-
@Override
29-
public String[] helperClassNames() {
30-
return new String[] {
31-
packageName + ".UnmarshallerHelpers",
32-
packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException",
33-
packageName + ".AkkaBlockResponseFunction",
34-
packageName + ".BlockingResponseHelper",
35-
packageName + ".ScalaListCollector",
36-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator",
37-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders",
38-
"datadog.trace.instrumentation.akkahttp.UriAdapter",
39-
};
40-
}
41-
4228
@Override
4329
public String[] knownMatchingTypes() {
4430
return new String[] {

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/PredefinedFromEntityUnmarshallersInstrumentation.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,6 @@ public PredefinedFromEntityUnmarshallersInstrumentation() {
2929
super("akka-http");
3030
}
3131

32-
@Override
33-
public String[] helperClassNames() {
34-
return new String[] {
35-
packageName + ".UnmarshallerHelpers",
36-
packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException",
37-
packageName + ".AkkaBlockResponseFunction",
38-
packageName + ".BlockingResponseHelper",
39-
packageName + ".ScalaListCollector",
40-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator",
41-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders",
42-
"datadog.trace.instrumentation.akkahttp.UriAdapter",
43-
};
44-
}
45-
4632
@Override
4733
public Reference[] additionalMuzzleReferences() {
4834
return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/appsec/SprayUnmarshallerInstrumentation.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,6 @@ public String[] knownMatchingTypes() {
3030
};
3131
}
3232

33-
@Override
34-
public String[] helperClassNames() {
35-
return new String[] {
36-
packageName + ".UnmarshallerHelpers",
37-
packageName + ".UnmarshallerHelpers$UnmarkStrictFormOngoingOnUnsupportedException",
38-
packageName + ".AkkaBlockResponseFunction",
39-
packageName + ".BlockingResponseHelper",
40-
packageName + ".ScalaListCollector",
41-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator",
42-
"datadog.trace.instrumentation.akkahttp.AkkaHttpServerHeaders",
43-
"datadog.trace.instrumentation.akkahttp.UriAdapter",
44-
};
45-
}
46-
4733
@Override
4834
public Reference[] additionalMuzzleReferences() {
4935
return ScalaListCollectorMuzzleReferences.additionalMuzzleReferences();

0 commit comments

Comments
 (0)