Skip to content

Commit d25eced

Browse files
mccullsmcculls
committed
WIP
1 parent 0dc9c08 commit d25eced

File tree

751 files changed

+902
-782
lines changed

Some content is hidden

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

751 files changed

+902
-782
lines changed

‎dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/InstrumenterModule.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ protected final boolean isShortcutMatchingEnabled(boolean defaultToShortcut) {
191191
}
192192

193193
/** Parent class for all tracing related instrumentations */
194-
public abstract static class Tracing extends InstrumenterModule implements HasMethodAdvice {
194+
public abstract static class Tracing extends InstrumenterModule {
195195
public Tracing(String instrumentationName, String... additionalNames) {
196196
super(instrumentationName, additionalNames);
197197
}
@@ -203,7 +203,7 @@ public boolean isApplicable(Set<TargetSystem> enabledSystems) {
203203
}
204204

205205
/** Parent class for all profiling related instrumentations */
206-
public abstract static class Profiling extends InstrumenterModule implements HasMethodAdvice {
206+
public abstract static class Profiling extends InstrumenterModule {
207207
public Profiling(String instrumentationName, String... additionalNames) {
208208
super(instrumentationName, additionalNames);
209209
}
@@ -222,7 +222,7 @@ public boolean isEnabled() {
222222
}
223223

224224
/** Parent class for all AppSec related instrumentations */
225-
public abstract static class AppSec extends InstrumenterModule implements HasMethodAdvice {
225+
public abstract static class AppSec extends InstrumenterModule {
226226
public AppSec(String instrumentationName, String... additionalNames) {
227227
super(instrumentationName, additionalNames);
228228
}
@@ -235,8 +235,7 @@ public boolean isApplicable(Set<TargetSystem> enabledSystems) {
235235

236236
/** Parent class for all IAST related instrumentations */
237237
@SuppressForbidden
238-
public abstract static class Iast extends InstrumenterModule
239-
implements HasMethodAdvice, WithPostProcessor {
238+
public abstract static class Iast extends InstrumenterModule implements WithPostProcessor {
240239
public Iast(String instrumentationName, String... additionalNames) {
241240
super(instrumentationName, additionalNames);
242241
}
@@ -291,7 +290,7 @@ protected boolean isOptOutEnabled() {
291290
}
292291

293292
/** Parent class for all USM related instrumentations */
294-
public abstract static class Usm extends InstrumenterModule implements HasMethodAdvice {
293+
public abstract static class Usm extends InstrumenterModule {
295294
public Usm(String instrumentationName, String... additionalNames) {
296295
super(instrumentationName, additionalNames);
297296
}
@@ -303,7 +302,7 @@ public boolean isApplicable(Set<TargetSystem> enabledSystems) {
303302
}
304303

305304
/** Parent class for all CI related instrumentations */
306-
public abstract static class CiVisibility extends InstrumenterModule implements HasMethodAdvice {
305+
public abstract static class CiVisibility extends InstrumenterModule {
307306
public CiVisibility(String instrumentationName, String... additionalNames) {
308307
super(instrumentationName, additionalNames);
309308
}

‎dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@AutoService(InstrumenterModule.class)
1919
public final class AerospikeClientInstrumentation extends InstrumenterModule.Tracing
20-
implements Instrumenter.ForSingleType {
20+
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
2121
public AerospikeClientInstrumentation() {
2222
super("aerospike");
2323
}

‎dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/CommandInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@AutoService(InstrumenterModule.class)
2121
public final class CommandInstrumentation extends InstrumenterModule.Tracing
22-
implements Instrumenter.ForSingleType {
22+
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
2323
public CommandInstrumentation() {
2424
super("aerospike");
2525
}

‎dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/NioEventLoopInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
@AutoService(InstrumenterModule.class)
1818
public final class NioEventLoopInstrumentation extends InstrumenterModule.Tracing
19-
implements Instrumenter.ForSingleType {
19+
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
2020
public NioEventLoopInstrumentation() {
2121
super("aerospike", "java_concurrent");
2222
}

‎dd-java-agent/instrumentation/aerospike-4/src/main/java/datadog/trace/instrumentation/aerospike4/PartitionInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@AutoService(InstrumenterModule.class)
2222
public final class PartitionInstrumentation extends InstrumenterModule.Tracing
23-
implements Instrumenter.ForSingleType {
23+
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
2424
public PartitionInstrumentation() {
2525
super("aerospike");
2626
}

‎dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaActorCellInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
@AutoService(InstrumenterModule.class)
2323
public class AkkaActorCellInstrumentation extends InstrumenterModule.Tracing
24-
implements Instrumenter.ForSingleType {
24+
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
2525

2626
public AkkaActorCellInstrumentation() {
2727
super("akka_actor_receive", "akka_actor", "akka_concurrent", "java_concurrent");

‎dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaEnvelopeInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
@AutoService(InstrumenterModule.class)
1717
public class AkkaEnvelopeInstrumentation extends InstrumenterModule.Tracing
18-
implements Instrumenter.ForSingleType {
18+
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
1919

2020
public AkkaEnvelopeInstrumentation() {
2121
super("akka_actor_send", "akka_actor", "akka_concurrent", "java_concurrent");

‎dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinExecutorTaskInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*/
2626
@AutoService(InstrumenterModule.class)
2727
public final class AkkaForkJoinExecutorTaskInstrumentation extends InstrumenterModule.Tracing
28-
implements Instrumenter.ForSingleType {
28+
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
2929
public AkkaForkJoinExecutorTaskInstrumentation() {
3030
super("java_concurrent", "akka_concurrent");
3131
}

‎dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinPoolInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@AutoService(InstrumenterModule.class)
2121
public final class AkkaForkJoinPoolInstrumentation extends InstrumenterModule.Tracing
22-
implements Instrumenter.ForSingleType {
22+
implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice {
2323

2424
public AkkaForkJoinPoolInstrumentation() {
2525
super("java_concurrent", "akka_concurrent");

‎dd-java-agent/instrumentation/akka-concurrent/src/main/java/datadog/trace/instrumentation/akka/concurrent/AkkaForkJoinTaskInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
*/
4040
@AutoService(InstrumenterModule.class)
4141
public final class AkkaForkJoinTaskInstrumentation extends InstrumenterModule.Tracing
42-
implements Instrumenter.ForTypeHierarchy, ExcludeFilterProvider {
42+
implements Instrumenter.ForTypeHierarchy, Instrumenter.HasMethodAdvice, ExcludeFilterProvider {
4343

4444
public AkkaForkJoinTaskInstrumentation() {
4545
super("java_concurrent", "akka_concurrent");

0 commit comments

Comments
 (0)