Skip to content

Commit 138d61b

Browse files
mccullsmcculls
authored
Cleanup generic instrumentation helpers (#10695)
Move common log instrumentation helpers to agent-bootstrap Move ClassHierarchyIterable instrumentation helper to agent-bootstrap Merge branch 'master' into mcculls/cleanup-generic-inst-helpers Co-authored-by: stuart.mcculloch <stuart.mcculloch@datadoghq.com>
1 parent 1185d74 commit 138d61b

File tree

21 files changed

+17
-62
lines changed

21 files changed

+17
-62
lines changed

‎dd-java-agent/agent-bootstrap/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ dependencies {
2929
// ^ Generally a bad idea for libraries, but we're shadowing.
3030

3131
testImplementation project(':dd-java-agent:testing')
32+
testImplementation group: 'com.google.guava', name: 'guava-testlib', version: '20.0'
3233
}
3334

3435
// Must use Java 11 to build JFR enabled code - there is no JFR in OpenJDK 8 (revisit once JFR in Java 8 is available)

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ClassHierarchyIterable.java renamed to dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/ClassHierarchyIterable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.agent.tooling;
1+
package datadog.trace.bootstrap;
22

33
import java.util.ArrayDeque;
44
import java.util.HashSet;

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/LogContextScopeListener.java renamed to dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/LogContextScopeListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.agent.tooling.log;
1+
package datadog.trace.bootstrap.instrumentation.log;
22

33
import datadog.trace.api.CorrelationIdentifier;
44
import datadog.trace.api.WithGlobalTracer;

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/log/UnionMap.java renamed to dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/log/UnionMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.agent.tooling.log;
1+
package datadog.trace.bootstrap.instrumentation.log;
22

33
import java.io.Serializable;
44
import java.util.AbstractMap;

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/tooling/log/UnionMapTest.groovy renamed to dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/log/UnionMapTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.agent.tooling.log
1+
package datadog.trace.bootstrap.instrumentation.log
22

33

44
import com.google.common.collect.testing.MapTestSuiteBuilder

‎dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ClassLoaderMatchersTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.agent.test
22

33
import datadog.trace.agent.tooling.bytebuddy.matcher.ClassLoaderMatchers
4-
import datadog.trace.agent.tooling.log.LogContextScopeListener
4+
import datadog.trace.bootstrap.instrumentation.log.LogContextScopeListener
55
import datadog.trace.bootstrap.DatadogClassLoader
66
import datadog.trace.test.util.DDSpecification
77
import groovy.transform.CompileStatic
@@ -41,7 +41,7 @@ class ClassLoaderMatchersTest extends DDSpecification {
4141

4242
def "helper class names are hardcoded in Log Instrumentations"() {
4343
expect:
44-
LogContextScopeListener.name == "datadog.trace.agent.tooling.log.LogContextScopeListener"
44+
LogContextScopeListener.name == "datadog.trace.bootstrap.instrumentation.log.LogContextScopeListener"
4545
}
4646

4747
/*

‎dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/ExtLogRecordInstrumentation.java‎

Lines changed: 1 addition & 10 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.agent.tooling.log.UnionMap;
1413
import datadog.trace.api.Config;
1514
import datadog.trace.api.CorrelationIdentifier;
1615
import datadog.trace.api.DDSpanId;
@@ -19,6 +18,7 @@
1918
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
2019
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
2120
import datadog.trace.bootstrap.instrumentation.api.Tags;
21+
import datadog.trace.bootstrap.instrumentation.log.UnionMap;
2222
import java.util.HashMap;
2323
import java.util.Map;
2424
import net.bytebuddy.asm.Advice;
@@ -60,15 +60,6 @@ public void methodAdvice(MethodTransformer transformer) {
6060
ExtLogRecordInstrumentation.class.getName() + "$GetMdcCopyAdvice");
6161
}
6262

63-
@Override
64-
public String[] helperClassNames() {
65-
return new String[] {
66-
"datadog.trace.agent.tooling.log.UnionMap",
67-
"datadog.trace.agent.tooling.log.UnionMap$1",
68-
"datadog.trace.agent.tooling.log.UnionMap$1$1",
69-
};
70-
}
71-
7263
public static class GetMdcAdvice {
7364
@Advice.OnMethodExit(suppress = Throwable.class)
7465
public static void getMdcValue(

‎dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextInstrumentation.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ public String muzzleDirective() {
4444

4545
@Override
4646
public String[] helperClassNames() {
47-
return new String[] {
48-
"datadog.trace.agent.tooling.log.LogContextScopeListener",
49-
"datadog.trace.instrumentation.log4j2.ThreadContextUpdater"
50-
};
47+
return new String[] {"datadog.trace.instrumentation.log4j2.ThreadContextUpdater"};
5148
}
5249

5350
public static class ThreadContextAdvice {

‎dd-java-agent/instrumentation/log4j/log4j-2.0/src/main/java/datadog/trace/instrumentation/log4j2/ThreadContextUpdater.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.instrumentation.log4j2;
22

3-
import datadog.trace.agent.tooling.log.LogContextScopeListener;
3+
import datadog.trace.bootstrap.instrumentation.log.LogContextScopeListener;
44
import org.apache.logging.log4j.ThreadContext;
55

66
public class ThreadContextUpdater extends LogContextScopeListener {

‎dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LoggingEventInstrumentation.java‎

Lines changed: 1 addition & 10 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.agent.tooling.log.UnionMap;
1413
import datadog.trace.api.Config;
1514
import datadog.trace.api.CorrelationIdentifier;
1615
import datadog.trace.api.DDSpanId;
@@ -19,6 +18,7 @@
1918
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
2019
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
2120
import datadog.trace.bootstrap.instrumentation.api.Tags;
21+
import datadog.trace.bootstrap.instrumentation.log.UnionMap;
2222
import java.util.HashMap;
2323
import java.util.Map;
2424
import net.bytebuddy.asm.Advice;
@@ -56,15 +56,6 @@ public void methodAdvice(MethodTransformer transformer) {
5656
LoggingEventInstrumentation.class.getName() + "$GetMdcAdvice");
5757
}
5858

59-
@Override
60-
public String[] helperClassNames() {
61-
return new String[] {
62-
"datadog.trace.agent.tooling.log.UnionMap",
63-
"datadog.trace.agent.tooling.log.UnionMap$1",
64-
"datadog.trace.agent.tooling.log.UnionMap$1$1",
65-
};
66-
}
67-
6859
public static class GetMdcAdvice {
6960
@Advice.OnMethodExit(suppress = Throwable.class)
7061
public static void onExit(

0 commit comments

Comments
 (0)