From 21c22d6985bd9fc6b3fca888aabf3d512c3194b7 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 10 May 2019 10:30:18 -0700 Subject: [PATCH] Fix log message and add ignores Also add CODEOWNERS --- .github/CODEOWNERS | 4 ++++ .../datadog/trace/agent/tooling/AgentInstaller.java | 10 ++++++++++ .../trace/agent/tooling/ClassLoaderMatcher.java | 1 + dd-trace-java.gradle | 1 + .../main/java/datadog/trace/common/writer/DDApi.java | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000000..401d6036fd --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1,4 @@ +# Automatically assign the team as a reviewer. +# https://help.github.com/en/articles/about-code-owners + +* @DataDog/apm-java diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java index ee8250c1b8..ba39b39e5f 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/AgentInstaller.java @@ -121,6 +121,16 @@ public class AgentInstaller { .or(nameStartsWith("com.intellij.rt.debugger.")) .or(nameStartsWith("com.p6spy.")) .or(nameStartsWith("com.newrelic.")) + .or(nameStartsWith("com.dynatrace.")) + .or(nameStartsWith("com.jloadtrace.")) + .or(nameStartsWith("com.appdynamics.")) + .or(nameStartsWith("com.singularity.")) + .or(nameStartsWith("com.jinspired.")) + .or(nameStartsWith("org.jinspired.")) + .or(nameStartsWith("org.apache.log4j.")) + .or(nameStartsWith("org.slf4j.").and(not(named("org.slf4j.MDC")))) + .or(nameContains("$JaxbAccessor")) + .or(nameContains("CGLIB$$")) .or(nameContains("javassist")) .or(nameContains(".asm.")) .or(nameMatches("com\\.mchange\\.v2\\.c3p0\\..*Proxy")) diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ClassLoaderMatcher.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ClassLoaderMatcher.java index 81015fd654..59c05548f9 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ClassLoaderMatcher.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/ClassLoaderMatcher.java @@ -53,6 +53,7 @@ public class ClassLoaderMatcher { classesToSkip.add("sun.reflect.DelegatingClassLoader"); classesToSkip.add("jdk.internal.reflect.DelegatingClassLoader"); classesToSkip.add("clojure.lang.DynamicClassLoader"); + classesToSkip.add("org.apache.cxf.common.util.ASMHelper$TypeHelperClassLoader"); classesToSkip.add(DatadogClassLoader.class.getName()); CLASSLOADER_CLASSES_TO_SKIP = Collections.unmodifiableSet(classesToSkip); } diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle index 974002cf1d..86d9282c91 100644 --- a/dd-trace-java.gradle +++ b/dd-trace-java.gradle @@ -3,6 +3,7 @@ plugins { id 'com.jfrog.artifactory' version '4.8.1' id 'com.jfrog.bintray' version '1.8.4' id 'org.unbroken-dome.test-sets' version '2.1.1' + id 'com.github.ben-manes.versions' version '0.21.0' id 'com.gradle.build-scan' version '2.2.1' // Not applying google java format by default because it gets confused by stray java build diff --git a/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDApi.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDApi.java index 5c42284f5f..553c699b33 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDApi.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/DDApi.java @@ -159,7 +159,7 @@ public class DDApi { } else if (nextAllowedLogTime < System.currentTimeMillis()) { nextAllowedLogTime = System.currentTimeMillis() + MILLISECONDS_BETWEEN_ERROR_LOG; log.warn( - "Error while sending {} of {} traces to the DD agent. Status: {} (going silent for {} minutes)", + "Error while sending {} of {} traces to the DD agent. Status: {} {} (going silent for {} minutes)", traces.size(), representativeCount, response.code(),