From c1c9ffa571ca82c8fc2ac52d2f23583b3809a4e1 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Thu, 5 Mar 2020 07:15:14 -0500 Subject: [PATCH] Fix couchbase ignores --- .../matcher/AdditionalLibraryIgnoresMatcher.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/AdditionalLibraryIgnoresMatcher.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/AdditionalLibraryIgnoresMatcher.java index b97dfcf680..a0bb524de9 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/AdditionalLibraryIgnoresMatcher.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/AdditionalLibraryIgnoresMatcher.java @@ -29,7 +29,6 @@ public class AdditionalLibraryIgnoresMatcher if (name.startsWith("com.beust.jcommander.") || name.startsWith("com.carrotsearch.hppc.") - || name.startsWith("com.couchbase.client.deps.") || name.startsWith("com.fasterxml.classmate.") || name.startsWith("com.fasterxml.jackson.") || name.startsWith("com.github.mustachejava.") @@ -189,6 +188,17 @@ public class AdditionalLibraryIgnoresMatcher return true; } + if (name.startsWith("com.couchbase.client.deps.")) { + // Couchbase library includes some packaged dependencies, unfortunately some of them are + // instrumented by java-concurrent instrumentation + if (name.startsWith("com.couchbase.client.deps.io.netty.") + || name.startsWith("com.couchbase.client.deps.org.LatencyUtils.") + || name.startsWith("com.couchbase.client.deps.com.lmax.disruptor.")) { + return false; + } + return true; + } + if (name.startsWith("com.google.cloud.") || name.startsWith("com.google.instrumentation.") || name.startsWith("com.google.j2objc.")