Add some more missing helper classes
MODIFY
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/HelperInjector.java
@@ -76,14 +76,15 @@ public class HelperInjector implements Transformer {
}
}
}
+ log.debug("Injecting classes onto classloader {} -> {}", classLoader, helperClassNames);
if (classLoader == BOOTSTRAP_CLASSLOADER) {
- Map<TypeDescription, Class<?>> injected =
+ final Map<TypeDescription, Class<?>> injected =
ClassInjector.UsingInstrumentation.of(
new File(System.getProperty("java.io.tmpdir")),
ClassInjector.UsingInstrumentation.Target.BOOTSTRAP,
AgentInstaller.getInstrumentation())
.inject(helperMap);
- for (TypeDescription desc : injected.keySet()) {
+ for (final TypeDescription desc : injected.keySet()) {
Class.forName(desc.getName(), false, Utils.getBootstrapProxy());
}
} else {

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java
dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java
@@ -50,6 +50,9 @@ public class Elasticsearch2TransportClientInstrumentation extends Instrumenter.C
new HelperInjector(
"com.google.common.base.Preconditions",
"com.google.common.base.Joiner",
+ "com.google.common.base.Joiner$1",
+ "com.google.common.base.Joiner$2",
+ "com.google.common.base.Joiner$MapJoiner",
"datadog.trace.instrumentation.elasticsearch2.TransportActionListener"))
.transform(DDTransformers.defaultTransformers())
.transform(

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java
dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java
@@ -50,6 +50,9 @@ public class Elasticsearch5TransportClientInstrumentation extends Instrumenter.C
new HelperInjector(
"com.google.common.base.Preconditions",
"com.google.common.base.Joiner",
+ "com.google.common.base.Joiner$1",
+ "com.google.common.base.Joiner$2",
+ "com.google.common.base.Joiner$MapJoiner",
"datadog.trace.instrumentation.elasticsearch5.TransportActionListener"))
.transform(DDTransformers.defaultTransformers())
.transform(

MODIFY
dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java
dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java
@@ -54,6 +54,9 @@ public class Elasticsearch6TransportClientInstrumentation extends Instrumenter.C
new HelperInjector(
"com.google.common.base.Preconditions",
"com.google.common.base.Joiner",
+ "com.google.common.base.Joiner$1",
+ "com.google.common.base.Joiner$2",
+ "com.google.common.base.Joiner$MapJoiner",
"datadog.trace.instrumentation.elasticsearch6.TransportActionListener"))
.transform(DDTransformers.defaultTransformers())
.transform(

Add some more missing helper classes