Merge pull request #857 from DataDog/tyler/misc

Fix log message and add ignores
This commit is contained in:
Tyler Benson 2019-05-24 14:23:01 -07:00 committed by GitHub
commit 0ea2d74744
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 1 deletions

4
.github/CODEOWNERS vendored Normal file
View File

@ -0,0 +1,4 @@
# Automatically assign the team as a reviewer.
# https://help.github.com/en/articles/about-code-owners
* @DataDog/apm-java

View File

@ -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"))

View File

@ -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);
}

View File

@ -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

View File

@ -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(),