elasticsearch rest client doesn't use native instrumentation, revert …

…these changes
open-telemetry · Sep 12, 2023 · 1c5fb6e · 1c5fb6e
1 parent 897d9ad
commit 1c5fb6e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts
@@ -6,7 +6,7 @@ muzzle {
   pass {
     group.set("org.elasticsearch.client")
     module.set("elasticsearch-rest-client")
-    versions.set("[7.0,8.10)") // 8.10+ has native, on-by-default opentelemetry instrumentation
+    versions.set("[7.0,)")
     assertInverse.set(true)
   }
 

diff --git a/...gent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java b/...gent/instrumentation/elasticsearch/rest/v7_0/ElasticsearchRest7InstrumentationModule.java
@@ -7,7 +7,6 @@
 
 import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Collections.singletonList;
-import static net.bytebuddy.matcher.ElementMatchers.not;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
@@ -24,12 +23,7 @@ public ElasticsearchRest7InstrumentationModule() {
   @Override
   public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
     // Class `org.elasticsearch.client.RestClient$InternalRequest` introduced in 7.0.0.
-    // Since Elasticsearch client version 8.10, the ES client comes with a native OTel
-    // instrumentation
-    // that introduced the class `co.elastic.clients.transport.instrumentation.Instrumentation`.
-    // Disabling agent instrumentation for those cases.
-    return hasClassesNamed("org.elasticsearch.client.RestClient$InternalRequest")
-        .and(not(hasClassesNamed("co.elastic.clients.transport.instrumentation.Instrumentation")));
+    return hasClassesNamed("org.elasticsearch.client.RestClient$InternalRequest");
   }
 
   @Override