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

Muzzle should recognise mismatch on unimplemented abstract methods at runtime (#1357)

This commit is contained in:
Mateusz Rzeszutek 2020-10-10 00:03:32 +02:00 committed by GitHub
parent c79c235fe4
commit 59784a5b77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCreationPredicate.java
View File

@ -12,24 +12,25 @@ package io.opentelemetry.javaagent.tooling.muzzle;
* create references from the method advice and helper classes.
*/
final class ReferenceCreationPredicate {
private static final String REFERENCE_CREATION_PACKAGE = "io.opentelemetry.instrumentation.";
// non-shaded packages
private static final String AUTO_INSTRUMENTATION_PACKAGE =
"io.opentelemetry.instrumentation.auto.";
private static final String JAVA_AGENT_TOOLING_PACKAGE = "io.opentelemetry.javaagent.tooling.";
private static final String AUTO_INSTRUMENTATION_API_PACKAGE =
"io.opentelemetry.instrumentation.auto.api.";
private static final String JAVA_AGENT_PACKAGE = "io.opentelemetry.javaagent.tooling.";
private static final String[] REFERENCE_CREATION_PACKAGE_EXCLUDES = {
"io.opentelemetry.instrumentation.api.", "io.opentelemetry.instrumentation.auto.api."
};
// shaded packages
private static final String LIBRARY_INSTRUMENTATION_PACKAGE = "io.opentelemetry.instrumentation.";
private static final String INSTRUMENTATION_API_PACKAGE = "io.opentelemetry.instrumentation.api.";
static boolean shouldCreateReferenceFor(String className) {
if (!className.startsWith(REFERENCE_CREATION_PACKAGE)) {
return className.startsWith(JAVA_AGENT_PACKAGE);
if (className.startsWith(INSTRUMENTATION_API_PACKAGE)
|| className.startsWith(AUTO_INSTRUMENTATION_API_PACKAGE)) {
return false;
}
for (String exclude : REFERENCE_CREATION_PACKAGE_EXCLUDES) {
if (className.startsWith(exclude)) {
return false;
}
}
return true;
return className.startsWith(AUTO_INSTRUMENTATION_PACKAGE)
|| className.startsWith(JAVA_AGENT_TOOLING_PACKAGE)
|| className.startsWith(LIBRARY_INSTRUMENTATION_PACKAGE);
}
private ReferenceCreationPredicate() {}

7
javaagent-tooling/src/test/groovy/io/opentelemetry/javaagent/tooling/muzzle/ReferenceCreationPredicateTest.groovy
View File

@ -15,9 +15,10 @@ class ReferenceCreationPredicateTest extends Specification {
ReferenceCreationPredicate.shouldCreateReferenceFor(className)
where:
desc | className
"Instrumentation class" | "io.opentelemetry.instrumentation.some_instrumentation.Advice"
"javaagent-tooling class" | "io.opentelemetry.javaagent.tooling.Constants"
desc | className
"auto instrumentation class" | "io.opentelemetry.instrumentation.auto.some_instrumentation.Advice"
"javaagent-tooling class" | "io.opentelemetry.javaagent.tooling.Constants"
"library instrumentation class" | "io.opentelemetry.instrumentation.LibraryClass"
}
@Unroll