Merge pull request #646 from trask/dd-merge

agent-tooling/src/main/java/io/opentelemetry/auto/tooling/matcher/GlobalIgnoresMatcher.java

@@ -89,6 +89,10 @@ public class GlobalIgnoresMatcher<T extends TypeDescription>
       }
       return true;
     }
+    // clojure
+    if (name.startsWith("clojure.") || name.contains("$fn__")) {
+      return true;
+    }
 
     if (name.startsWith("io.opentelemetry.auto.")) {
       // FIXME: We should remove this once

agent-tooling/src/test/groovy/io/opentelemetry/auto/test/ClassLoaderMatcherTest.groovy

@@ -19,6 +19,7 @@ package io.opentelemetry.auto.test
 import io.opentelemetry.auto.bootstrap.AgentClassLoader
 import io.opentelemetry.auto.tooling.ClassLoaderMatcher
 import io.opentelemetry.auto.tooling.ExporterClassLoader
+import io.opentelemetry.auto.tooling.log.LogContextScopeListener
 import io.opentelemetry.auto.util.test.AgentSpecification
 
 class ClassLoaderMatcherTest extends AgentSpecification {
@@ -60,4 +61,9 @@ class ClassLoaderMatcherTest extends AgentSpecification {
     expect:
     ExporterClassLoader.name == "io.opentelemetry.auto.tooling.ExporterClassLoader"
   }
+
+  def "helper class names are hardcoded in Log Instrumentations"() {
+    expect:
+    LogContextScopeListener.name == "io.opentelemetry.auto.tooling.log.LogContextScopeListener"
+  }
 }

instrumentation/kafka-clients-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkaclients/TextMapExtractAdapter.java

@@ -31,6 +31,10 @@ public class TextMapExtractAdapter implements HttpTextFormat.Getter<Headers> {
     if (header == null) {
       return null;
     }
-    return new String(header.value(), StandardCharsets.UTF_8);
+    byte[] value = header.value();
+    if (value == null) {
+      return null;
+    }
+    return new String(value, StandardCharsets.UTF_8);
   }
 }

instrumentation/kafka-streams-0.11/src/main/java/io/opentelemetry/auto/instrumentation/kafkastreams/TextMapExtractAdapter.java

@@ -31,6 +31,10 @@ public class TextMapExtractAdapter implements HttpTextFormat.Getter<Headers> {
     if (header == null) {
       return null;
     }
-    return new String(header.value(), StandardCharsets.UTF_8);
+    byte[] value = header.value();
+    if (value == null) {
+      return null;
+    }
+    return new String(value, StandardCharsets.UTF_8);
   }
 }

instrumentation/log4j/log4j-1.1/src/main/java/io/opentelemetry/auto/instrumentation/log4j/v1_1/Log4jMDCInstrumentation.java

@@ -22,7 +22,6 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
 
 import io.opentelemetry.auto.config.Config;
 import io.opentelemetry.auto.tooling.Instrumenter;
-import io.opentelemetry.auto.tooling.log.LogContextScopeListener;
 import java.lang.reflect.Method;
 import java.util.Map;
 import net.bytebuddy.asm.Advice;
@@ -55,7 +54,7 @@ public class Log4jMDCInstrumentation extends Instrumenter.Default {
 
   @Override
   public String[] helperClassNames() {
-    return new String[] {LogContextScopeListener.class.getName()};
+    return new String[] {"io.opentelemetry.auto.tooling.log.LogContextScopeListener"};
   }
 
   public static class MDCContextAdvice {

instrumentation/log4j/log4j-1.1/src/test/groovy/Log4jMDCTest.groovy

@@ -38,4 +38,15 @@ class Log4jMDCTest extends LogContextInjectionTestBase {
   def get(String key) {
     return MDC.get(key)
   }
+
+  @Override
+  def remove(String key) {
+    MDC.context
+    return MDC.remove(key)
+  }
+
+  @Override
+  def clear() {
+    return MDC.clear()
+  }
 }

instrumentation/log4j/log4j-2.0/src/test/groovy/Log4jThreadContextTest.groovy

@@ -31,4 +31,14 @@ class Log4jThreadContextTest extends LogContextInjectionTestBase {
   def get(String key) {
     return ThreadContext.get(key)
   }
+
+  @Override
+  def remove(String key) {
+    return ThreadContext.remove(key)
+  }
+
+  @Override
+  def clear() {
+    return ThreadContext.clearAll()
+  }
 }

instrumentation/slf4j-mdc/src/main/java/io/opentelemetry/auto/instrumentation/slf4j/mdc/MDCInjectionInstrumentation.java

@@ -70,7 +70,7 @@ public class MDCInjectionInstrumentation extends Instrumenter.Default {
 
   @Override
   public String[] helperClassNames() {
-    return new String[] {LogContextScopeListener.class.getName()};
+    return new String[] {"io.opentelemetry.auto.tooling.log.LogContextScopeListener"};
   }
 
   public static class MDCAdvice {

instrumentation/slf4j-mdc/src/test/groovy/Slf4jMDCTest.groovy

@@ -12,4 +12,14 @@ class Slf4jMDCTest extends LogContextInjectionTestBase {
   def get(String key) {
     return MDC.get(key)
   }
+
+  @Override
+  def remove(String key) {
+    return MDC.remove(key)
+  }
+
+  @Override
+  def clear() {
+    return MDC.clear()
+  }
 }

testing-common/src/main/groovy/io/opentelemetry/auto/test/log/injection/LogContextInjectionTestBase.groovy

@@ -44,6 +44,13 @@ abstract class LogContextInjectionTestBase extends AgentTestRunner {
    */
   abstract get(String key)
 
+  /**
+   * Remove from the framework-specific context the value at the given key
+   */
+  abstract remove(String key)
+
+  abstract clear()
+
   static {
     ConfigUtils.updateConfig {
       System.setProperty("ota.logs.injection", "true")
@@ -139,4 +146,21 @@ abstract class LogContextInjectionTestBase extends AgentTestRunner {
     mainSpan?.end()
     mainScope?.close()
   }
+
+  def "modify thread context after clear of context map at the beginning of new thread"() {
+    def t1A
+    final Thread thread1 = new Thread() {
+      @Override
+      void run() {
+        clear()
+        put("a", "a thread1")
+        t1A = get("a")
+      }
+    }
+    thread1.start()
+    thread1.join()
+
+    expect:
+    t1A == "a thread1"
+  }
 }