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

Remove outdated muzzle condition (#2906) 

* Remove outdated muzzle condition

* Remove outdated test
This commit is contained in:
Trask Stalnaker 2021-05-05 00:33:28 -07:00 committed by GitHub
parent 70c164216d
commit 690e3bdd16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/matcher/ReferenceMatcher.java
View File

@ -119,10 +119,6 @@ public final class ReferenceMatcher {
} }
// helper classes get their own check: whether they implement all abstract methods // helper classes get their own check: whether they implement all abstract methods
return checkHelperClassMatch(reference, typePool); return checkHelperClassMatch(reference, typePool);
} else if (helperClassNames.contains(reference.getClassName())) {
// skip muzzle check for those helper classes that are not in instrumentation packages; e.g.
// some instrumentations inject guava types as helper classes
return emptyList();
} else { } else {
TypePool.Resolution resolution = typePool.describe(reference.getClassName()); TypePool.Resolution resolution = typePool.describe(reference.getClassName());
if (!resolution.isResolved()) { if (!resolution.isResolved()) {

14
testing-common/src/test/groovy/muzzle/ReferenceMatcherTest.groovy
View File

@ -167,20 +167,6 @@ class ReferenceMatcherTest extends Specification {
"staticB" | Type.getType(MethodBodyAdvice.B).getDescriptor() | [STATIC, PROTECTED_OR_HIGHER] | MethodBodyAdvice.A | [] | "match static field" "staticB" | Type.getType(MethodBodyAdvice.B).getDescriptor() | [STATIC, PROTECTED_OR_HIGHER] | MethodBodyAdvice.A | [] | "match static field"
} }
def "should ignore helper classes from third-party packages"() {
given:
def emptyClassLoader = new URLClassLoader(new URL[0], (ClassLoader) null)
def reference = new Reference.Builder("com.google.common.base.Strings")
.build()
when:
def mismatches = createMatcher([reference], [reference.className])
.getMismatchedReferenceSources(emptyClassLoader)
then:
mismatches.empty
}
def "should not check abstract #desc helper classes"() { def "should not check abstract #desc helper classes"() {
given: given:
def reference = new Reference.Builder(className) def reference = new Reference.Builder(className)