Change from enum to object for map lookup key
MODIFY
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/CallDepthThreadLocalMap.java
dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/CallDepthThreadLocalMap.java
@@ -11,16 +11,16 @@ import java.util.concurrent.atomic.AtomicInteger;
* #incrementCallDepth at the beginning of each constructor.
*/
public class CallDepthThreadLocalMap {
- private static final ThreadLocal<Map<Key, AtomicInteger>> TLS =
- new ThreadLocal<Map<Key, AtomicInteger>>() {
+ private static final ThreadLocal<Map<Object, AtomicInteger>> TLS =
+ new ThreadLocal<Map<Object, AtomicInteger>>() {
@Override
- public Map<Key, AtomicInteger> initialValue() {
+ public Map<Object, AtomicInteger> initialValue() {
return new HashMap<>();
}
};
- public static int incrementCallDepth(final Key k) {
- final Map<Key, AtomicInteger> map = TLS.get();
+ public static int incrementCallDepth(final Object k) {
+ final Map<Object, AtomicInteger> map = TLS.get();
AtomicInteger depth = map.get(k);
if (depth == null) {
depth = new AtomicInteger(0);
@@ -31,17 +31,10 @@ public class CallDepthThreadLocalMap {
}
}
- public static void reset(final Key k) {
- final Map<Key, AtomicInteger> map = TLS.get();
+ public static void reset(final Object k) {
+ final Map<Object, AtomicInteger> map = TLS.get();
if (map != null) {
map.remove(k);
}
}
-
- public enum Key {
- CLASSLOADER,
- CONNECTION,
- PREPARED_STATEMENT,
- STATEMENT
- }
}

MODIFY
dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/CallDepthThreadLocalMapTest.groovy
dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/CallDepthThreadLocalMapTest.groovy
@@ -6,8 +6,8 @@ class CallDepthThreadLocalMapTest extends Specification {
def "test CallDepthThreadLocalMap"() {
setup:
- def k1 = CallDepthThreadLocalMap.Key.CLASSLOADER
- def k2 = CallDepthThreadLocalMap.Key.CONNECTION
+ def k1 = new Object()
+ def k2 = new Object()
expect:
CallDepthThreadLocalMap.incrementCallDepth(k1) == 0

MODIFY
dd-java-agent/instrumentation/classloaders/src/main/java/datadog/trace/instrumentation/classloaders/ClassLoaderInstrumentation.java
dd-java-agent/instrumentation/classloaders/src/main/java/datadog/trace/instrumentation/classloaders/ClassLoaderInstrumentation.java
package datadog.trace.instrumentation.classloaders;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
-import static datadog.trace.bootstrap.CallDepthThreadLocalMap.Key.CLASSLOADER;
import static net.bytebuddy.matcher.ElementMatchers.failSafe;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
import static net.bytebuddy.matcher.ElementMatchers.isSubTypeOf;
@@ -46,7 +45,7 @@ public final class ClassLoaderInstrumentation extends Instrumenter.Configurable
public static int constructorEnter() {
// We use this to make sure we only apply the exit instrumentation
// after the constructors are done calling their super constructors.
- return CallDepthThreadLocalMap.incrementCallDepth(CLASSLOADER);
+ return CallDepthThreadLocalMap.incrementCallDepth(ClassLoader.class);
}
// Not sure why, but adding suppress causes a verify error.
@@ -54,7 +53,7 @@ public final class ClassLoaderInstrumentation extends Instrumenter.Configurable
public static void constructorExit(
@Advice.This final ClassLoader cl, @Advice.Enter final int depth) {
if (depth == 0) {
- CallDepthThreadLocalMap.reset(CLASSLOADER);
+ CallDepthThreadLocalMap.reset(ClassLoader.class);
try {
final Field field = GlobalTracer.class.getDeclaredField("tracer");

MODIFY
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/ConnectionInstrumentation.java
package datadog.trace.instrumentation.jdbc;
-import static datadog.trace.bootstrap.CallDepthThreadLocalMap.Key.CONNECTION;
import static net.bytebuddy.matcher.ElementMatchers.failSafe;
import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@@ -59,7 +58,7 @@ public final class ConnectionInstrumentation extends Instrumenter.Configurable {
public static int constructorEnter() {
// We use this to make sure we only apply the exit instrumentation
// after the constructors are done calling their super constructors.
- return CallDepthThreadLocalMap.incrementCallDepth(CONNECTION);
+ return CallDepthThreadLocalMap.incrementCallDepth(Connection.class);
}
// Since we're instrumenting the constructor, we can't add onThrowable.
@@ -68,7 +67,7 @@ public final class ConnectionInstrumentation extends Instrumenter.Configurable {
@Advice.Enter final int depth, @Advice.This final Connection connection)
throws SQLException {
if (depth == 0) {
- CallDepthThreadLocalMap.reset(CONNECTION);
+ CallDepthThreadLocalMap.reset(Connection.class);
final String url = connection.getMetaData().getURL();
if (url != null) {
// Remove end of url to prevent passwords from leaking:

MODIFY
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/PreparedStatementInstrumentation.java
package datadog.trace.instrumentation.jdbc;
-import static datadog.trace.bootstrap.CallDepthThreadLocalMap.Key.PREPARED_STATEMENT;
import static io.opentracing.log.Fields.ERROR_OBJECT;
import static net.bytebuddy.matcher.ElementMatchers.failSafe;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@@ -52,7 +51,7 @@ public final class PreparedStatementInstrumentation extends Instrumenter.Configu
@Advice.OnMethodEnter(suppress = Throwable.class)
public static Scope startSpan(@Advice.This final PreparedStatement statement) {
- final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(PREPARED_STATEMENT);
+ final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(PreparedStatement.class);
if (callDepth > 0) {
return null;
}
@@ -99,7 +98,7 @@ public final class PreparedStatementInstrumentation extends Instrumenter.Configu
span.log(Collections.singletonMap(ERROR_OBJECT, throwable));
}
scope.close();
- CallDepthThreadLocalMap.reset(PREPARED_STATEMENT);
+ CallDepthThreadLocalMap.reset(PreparedStatement.class);
}
}
}

MODIFY
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java
package datadog.trace.instrumentation.jdbc;
-import static datadog.trace.bootstrap.CallDepthThreadLocalMap.Key.STATEMENT;
import static io.opentracing.log.Fields.ERROR_OBJECT;
import static net.bytebuddy.matcher.ElementMatchers.failSafe;
import static net.bytebuddy.matcher.ElementMatchers.isInterface;
@@ -53,7 +52,7 @@ public final class StatementInstrumentation extends Instrumenter.Configurable {
@Advice.OnMethodEnter(suppress = Throwable.class)
public static Scope startSpan(
@Advice.Argument(0) final String sql, @Advice.This final Statement statement) {
- final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(STATEMENT);
+ final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Statement.class);
if (callDepth > 0) {
return null;
}
@@ -101,7 +100,7 @@ public final class StatementInstrumentation extends Instrumenter.Configurable {
span.log(Collections.singletonMap(ERROR_OBJECT, throwable));
}
scope.close();
- CallDepthThreadLocalMap.reset(STATEMENT);
+ CallDepthThreadLocalMap.reset(Statement.class);
}
}
}

Change from enum to object for map lookup key