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

Enable and muzzle jsp instrumentation

This commit is contained in:
Andrew Kent 2018-08-30 15:56:59 -07:00
parent 8034fc2afd
commit b637f9ef91
5 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dd-java-agent/instrumentation/jsp-2.3/jsp-2.3.gradle
View File

@ -1,17 +1,14 @@
apply plugin: 'version-scan'
versionScan {
group = "org.apache.tomcat"
module = "tomcat-jasper"
versions = "[7.0.0,)"
scanDependencies = true
verifyPresent = [
"org.apache.jasper.servlet.JspServletWrapper": null,
]
}
apply from: "${rootDir}/gradle/java.gradle" apply from: "${rootDir}/gradle/java.gradle"
muzzle {
pass {
group = "org.apache.tomcat"
module = "tomcat-jasper"
// range [7.0.0,7.0.19) and version 8.0.9 missing from maven
versions = "[7.0.19,8.0.9),(8.0.9,)"
}
}
apply plugin: 'org.unbroken-dome.test-sets' apply plugin: 'org.unbroken-dome.test-sets'
testSets { testSets {

5
dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java
View File

@ -33,11 +33,6 @@ public final class JSPInstrumentation extends Instrumenter.Default {
super("jsp", "jsp-render"); super("jsp", "jsp-render");
} }
@Override
protected boolean defaultEnabled() {
return false;
}
@Override @Override
public ElementMatcher<TypeDescription> typeMatcher() { public ElementMatcher<TypeDescription> typeMatcher() {
return not(isInterface()).and(safeHasSuperType(named("javax.servlet.jsp.HttpJspPage"))); return not(isInterface()).and(safeHasSuperType(named("javax.servlet.jsp.HttpJspPage")));

11
dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java
View File

@ -1,6 +1,5 @@
package datadog.trace.instrumentation.jsp; package datadog.trace.instrumentation.jsp;
import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
import static io.opentracing.log.Fields.ERROR_OBJECT; import static io.opentracing.log.Fields.ERROR_OBJECT;
import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.isPublic;
import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.named;
@ -29,21 +28,11 @@ public final class JasperJSPCompilationContextInstrumentation extends Instrument
super("jsp", "jsp-compile"); super("jsp", "jsp-compile");
} }
@Override
protected boolean defaultEnabled() {
return false;
}
@Override @Override
public ElementMatcher<TypeDescription> typeMatcher() { public ElementMatcher<TypeDescription> typeMatcher() {
return named("org.apache.jasper.JspCompilationContext"); return named("org.apache.jasper.JspCompilationContext");
} }
@Override
public ElementMatcher<ClassLoader> classLoaderMatcher() {
return classLoaderHasClasses("org.apache.jasper.servlet.JspServletWrapper");
}
@Override @Override
public Map<ElementMatcher, String> transformers() { public Map<ElementMatcher, String> transformers() {
final Map<ElementMatcher, String> transformers = new HashMap<>(); final Map<ElementMatcher, String> transformers = new HashMap<>();

1
dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy
View File

@ -20,7 +20,6 @@ import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
class JSPInstrumentationBasicTests extends AgentTestRunner { class JSPInstrumentationBasicTests extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.jsp.enabled", "true")
// skip jar scanning using environment variables: // skip jar scanning using environment variables:
// http://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html#JAR_Scanning // http://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html#JAR_Scanning
// having this set allows us to test with old versions of the tomcat api since // having this set allows us to test with old versions of the tomcat api since

1
dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy
View File

@ -18,7 +18,6 @@ import static datadog.trace.agent.test.asserts.ListWriterAssert.assertTraces
class JSPInstrumentationForwardTests extends AgentTestRunner { class JSPInstrumentationForwardTests extends AgentTestRunner {
static { static {
System.setProperty("dd.integration.jsp.enabled", "true")
// skip jar scanning using environment variables: // skip jar scanning using environment variables:
// http://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html#JAR_Scanning // http://tomcat.apache.org/tomcat-7.0-doc/config/systemprops.html#JAR_Scanning
// having this set allows us to test with old versions of the tomcat api since // having this set allows us to test with old versions of the tomcat api since