From b58a7db7a769c39926887c67187dc59fa6950b45 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Wed, 30 May 2018 10:31:00 +1000 Subject: [PATCH] Add another helper used by Joiner. --- .../Elasticsearch2TransportClientInstrumentation.java | 1 + .../Elasticsearch5TransportClientInstrumentation.java | 1 + .../Elasticsearch6TransportClientInstrumentation.java | 1 + 3 files changed, 3 insertions(+) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java index 95b20c451b..c9e8ffe5f9 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java @@ -48,6 +48,7 @@ public class Elasticsearch2TransportClientInstrumentation extends Instrumenter.C classLoaderHasClasses("org.elasticsearch.plugins.SitePlugin")) .transform( new HelperInjector( + "com.google.common.base.Preconditions", "com.google.common.base.Joiner", "datadog.trace.instrumentation.elasticsearch2.TransportActionListener")) .transform(DDTransformers.defaultTransformers()) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java index 5dbfd3232a..1dbafa4561 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java @@ -48,6 +48,7 @@ public class Elasticsearch5TransportClientInstrumentation extends Instrumenter.C classLoaderHasClasses("org.elasticsearch.percolator.TransportMultiPercolateAction")) .transform( new HelperInjector( + "com.google.common.base.Preconditions", "com.google.common.base.Joiner", "datadog.trace.instrumentation.elasticsearch5.TransportActionListener")) .transform(DDTransformers.defaultTransformers()) diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java index 076a6526d3..f1e80adac4 100644 --- a/dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch-transport-6/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java @@ -52,6 +52,7 @@ public class Elasticsearch6TransportClientInstrumentation extends Instrumenter.C classLoaderHasClasses("org.elasticsearch.client.RestClientBuilder$2")) .transform( new HelperInjector( + "com.google.common.base.Preconditions", "com.google.common.base.Joiner", "datadog.trace.instrumentation.elasticsearch6.TransportActionListener")) .transform(DDTransformers.defaultTransformers())