open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor an agent usage, and fix logic issue

This commit is contained in:
Brian Devins-Suresh 2020-02-24 13:11:10 -05:00
parent e65177a143
commit 75af71584c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/Instrumenter.java
View File

@ -133,9 +133,10 @@ public interface Instrumenter {
*/ */
final ReferenceMatcher muzzle = getInstrumentationMuzzle(); final ReferenceMatcher muzzle = getInstrumentationMuzzle();
if (null != muzzle) { if (null != muzzle) {
final List<Reference.Mismatch> mismatches = final boolean isMatch = muzzle.matches(classLoader);
muzzle.getMismatchedReferenceSources(classLoader); if (!isMatch) {
if (mismatches.size() > 0) { final List<Reference.Mismatch> mismatches =
muzzle.getMismatchedReferenceSources(classLoader);
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug( log.debug(
"Instrumentation muzzled: {} -- {} on {}", "Instrumentation muzzled: {} -- {} on {}",
@ -153,7 +154,7 @@ public interface Instrumenter {
Instrumenter.Default.this.getClass().getName(), Instrumenter.Default.this.getClass().getName(),
classLoader); classLoader);
} }
return mismatches.size() == 0; return isMatch;
} }
return true; return true;
} }

2
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/muzzle/ReferenceMatcher.java
View File

@ -66,7 +66,7 @@ public class ReferenceMatcher
} }
mismatchCache.put(loader, mismatches); mismatchCache.put(loader, mismatches);
return true; return mismatches.size() == 0;
} }
/** /**