From 46e7036701b0263105cc843a4ce7a921fde5819a Mon Sep 17 00:00:00 2001 From: Gary Huang Date: Mon, 25 Jun 2018 14:09:12 -0400 Subject: [PATCH] fix version scan and test versions --- .../{jsp/jsp.gradle => jsp-2.3/jsp-2.3.gradle} | 15 +++++++++------ .../instrumentation/jsp/JSPInstrumentation.java | 0 ...sperJSPCompilationContextInstrumentation.java | 10 +++++++--- .../groovy/JSPInstrumentationBasicTests.groovy | 16 ++++++---------- .../groovy/JSPInstrumentationForwardTests.groovy | 16 ++++++---------- .../resources/webapps/jsptest/common/hello.html | 0 .../webapps/jsptest/common/javaLoopH2.jsp | 0 .../resources/webapps/jsptest/common/loop.jsp | 0 .../resources/webapps/jsptest/compileError.jsp | 0 .../jsptest/forwards/forwardToCompileError.jsp | 0 .../webapps/jsptest/forwards/forwardToHtml.jsp | 0 .../jsptest/forwards/forwardToIncludeMulti.jsp | 0 .../jsptest/forwards/forwardToJspForward.jsp | 0 .../jsptest/forwards/forwardToNoJavaJsp.jsp | 0 .../jsptest/forwards/forwardToNonExistent.jsp | 0 .../jsptest/forwards/forwardToSimpleJava.jsp | 0 .../jsptest/forwards/forwardWithCompileError.jsp | 0 .../test/resources/webapps/jsptest/getQuery.jsp | 0 .../webapps/jsptest/includes/includeHtml.jsp | 0 .../webapps/jsptest/includes/includeMulti.jsp | 0 .../resources/webapps/jsptest/invalidMarkup.jsp | 0 .../resources/webapps/jsptest/invalidWrite.jsp | 0 .../test/resources/webapps/jsptest/nojava.jsp | 0 .../src/test/resources/webapps/jsptest/post.jsp | 0 .../resources/webapps/jsptest/runtimeError.jsp | 0 settings.gradle | 2 +- 26 files changed, 29 insertions(+), 30 deletions(-) rename dd-java-agent/instrumentation/{jsp/jsp.gradle => jsp-2.3/jsp-2.3.gradle} (73%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java (90%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/groovy/JSPInstrumentationBasicTests.groovy (97%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/groovy/JSPInstrumentationForwardTests.groovy (98%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/common/hello.html (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/common/javaLoopH2.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/common/loop.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/compileError.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/forwards/forwardToCompileError.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/forwards/forwardToHtml.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/forwards/forwardToIncludeMulti.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/forwards/forwardToJspForward.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/forwards/forwardToNoJavaJsp.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/forwards/forwardToNonExistent.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/forwards/forwardToSimpleJava.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/forwards/forwardWithCompileError.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/getQuery.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/includes/includeHtml.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/includes/includeMulti.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/invalidMarkup.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/invalidWrite.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/nojava.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/post.jsp (100%) rename dd-java-agent/instrumentation/{jsp => jsp-2.3}/src/test/resources/webapps/jsptest/runtimeError.jsp (100%) diff --git a/dd-java-agent/instrumentation/jsp/jsp.gradle b/dd-java-agent/instrumentation/jsp-2.3/jsp-2.3.gradle similarity index 73% rename from dd-java-agent/instrumentation/jsp/jsp.gradle rename to dd-java-agent/instrumentation/jsp-2.3/jsp-2.3.gradle index a6f899b766..09f8523942 100644 --- a/dd-java-agent/instrumentation/jsp/jsp.gradle +++ b/dd-java-agent/instrumentation/jsp-2.3/jsp-2.3.gradle @@ -3,7 +3,7 @@ apply plugin: 'version-scan' versionScan { group = "org.apache.tomcat" module = "tomcat-jasper" - versions = "[8.0.1,)" + versions = "[7.0.0,)" scanDependencies = true verifyPresent = [ "org.apache.jasper.servlet.JspServletWrapper": null, @@ -21,7 +21,8 @@ testSets { } dependencies { - compileOnly group: 'org.apache.tomcat', name: 'tomcat-jasper', version: '7.0.42' + // compiling against tomcat 7.0.20 because there seems to be some issues with Tomcat's dependency < 7.0.20 + compileOnly group: 'org.apache.tomcat', name: 'tomcat-jasper', version: '7.0.20' compileOnly group: 'javax.servlet.jsp', name: 'javax.servlet.jsp-api', version: '2.3.0' compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0' @@ -35,10 +36,11 @@ dependencies { testCompile project(':dd-java-agent:testing') testCompile project(':dd-java-agent:instrumentation:servlet-3') - testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.42' - testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.42' - testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '7.0.42' - testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.42' + // using tomcat 7.0.37 because there seems to be some issues with Tomcat's jar scanning in versions < 7.0.37 + // https://stackoverflow.com/questions/23484098/org-apache-tomcat-util-bcel-classfile-classformatexception-invalid-byte-tag-in + testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '7.0.37' + testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '7.0.37' + testCompile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '7.0.37' testCompile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.10.0' } @@ -49,5 +51,6 @@ configurations.latestDepTestCompile { force group: 'javax.servlet', name: 'javax.servlet-api', version: '+' force group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: '+' force group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version: '+' + force group: 'org.apache.tomcat.embed', name: 'tomcat-embed-logging-juli', version: '+' } } diff --git a/dd-java-agent/instrumentation/jsp/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java rename to dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java diff --git a/dd-java-agent/instrumentation/jsp/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java similarity index 90% rename from dd-java-agent/instrumentation/jsp/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java rename to dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java index b492c9f483..6c94c61ca2 100644 --- a/dd-java-agent/instrumentation/jsp/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java @@ -56,11 +56,12 @@ public final class JasperJSPCompilationContextInstrumentation extends Instrument .buildSpan("jsp.compile") .withTag(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_SERVER) .withTag(DDTags.SPAN_TYPE, DDSpanTypes.WEB_SERVLET) - .withTag( - "servlet.context", jspCompilationContext.getServletContext().getContextPath()) .startActive(true); final Span span = scope.span(); + if (jspCompilationContext.getServletContext() != null) { + span.setTag("servlet.context", jspCompilationContext.getServletContext().getContextPath()); + } span.setTag(DDTags.RESOURCE_NAME, jspCompilationContext.getJspFile()); Tags.COMPONENT.set(span, "jsp-http-servlet"); return scope; @@ -74,13 +75,16 @@ public final class JasperJSPCompilationContextInstrumentation extends Instrument final Span span = scope.span(); if (jspCompilationContext != null) { - span.setTag("jsp.compiler", jspCompilationContext.getCompiler().getClass().getName()); + if (jspCompilationContext.getCompiler() != null) { + span.setTag("jsp.compiler", jspCompilationContext.getCompiler().getClass().getName()); + } span.setTag("jsp.classFQCN", jspCompilationContext.getFQCN()); if (throwable != null) { span.setTag("jsp.javaFile", jspCompilationContext.getServletJavaFileName()); span.setTag("jsp.classpath", jspCompilationContext.getClassPath()); } } + if (throwable != null) { Tags.ERROR.set(span, Boolean.TRUE); span.log(Collections.singletonMap(ERROR_OBJECT, throwable)); diff --git a/dd-java-agent/instrumentation/jsp/src/test/groovy/JSPInstrumentationBasicTests.groovy b/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy similarity index 97% rename from dd-java-agent/instrumentation/jsp/src/test/groovy/JSPInstrumentationBasicTests.groovy rename to dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy index 3f5ff7def4..6c8d07d5b9 100644 --- a/dd-java-agent/instrumentation/jsp/src/test/groovy/JSPInstrumentationBasicTests.groovy +++ b/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationBasicTests.groovy @@ -11,8 +11,6 @@ import okhttp3.Response import org.apache.catalina.Context import org.apache.catalina.startup.Tomcat import org.apache.jasper.JasperException -//import org.apache.tomcat.JarScanFilter -//import org.apache.tomcat.JarScanType import spock.lang.Unroll import static datadog.trace.agent.test.ListWriterAssert.assertTraces @@ -21,6 +19,12 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { static { System.setProperty("dd.integration.jsp.enabled", "true") + // skip jar scanning using environment variables: + // 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 + // JarScanFilter did not exist in the tomcat 7 api + System.setProperty("org.apache.catalina.startup.ContextConfig.jarsToSkip", "*") + System.setProperty("org.apache.catalina.startup.TldConfig.jarsToSkip", "*") } static final int PORT = TestUtils.randomOpenPort() @@ -54,14 +58,6 @@ class JSPInstrumentationBasicTests extends AgentTestRunner { appContext = tomcatServer.addWebapp("/$JSP_WEBAPP_CONTEXT", JSPInstrumentationBasicTests.getResource("/webapps/jsptest").getPath()) - // Speed up startup by disabling jar scanning: -// appContext.getJarScanner().setJarScanFilter(new JarScanFilter() { -// @Override -// boolean check(JarScanType jarScanType, String jarName) { -// return false -// } -// }) - tomcatServer.start() System.out.println( "Tomcat server: http://" + tomcatServer.getHost().getName() + ":" + PORT + "/") diff --git a/dd-java-agent/instrumentation/jsp/src/test/groovy/JSPInstrumentationForwardTests.groovy b/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy similarity index 98% rename from dd-java-agent/instrumentation/jsp/src/test/groovy/JSPInstrumentationForwardTests.groovy rename to dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy index 124c3d483b..5c01d96eb8 100644 --- a/dd-java-agent/instrumentation/jsp/src/test/groovy/JSPInstrumentationForwardTests.groovy +++ b/dd-java-agent/instrumentation/jsp-2.3/src/test/groovy/JSPInstrumentationForwardTests.groovy @@ -7,8 +7,6 @@ import okhttp3.* import org.apache.catalina.Context import org.apache.catalina.startup.Tomcat import org.apache.jasper.JasperException -//import org.apache.tomcat.JarScanFilter -//import org.apache.tomcat.JarScanType import spock.lang.Unroll import static datadog.trace.agent.test.ListWriterAssert.assertTraces @@ -17,6 +15,12 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { static { System.setProperty("dd.integration.jsp.enabled", "true") + // skip jar scanning using environment variables: + // 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 + // JarScanFilter did not exist in the tomcat 7 api + System.setProperty("org.apache.catalina.startup.ContextConfig.jarsToSkip", "*") + System.setProperty("org.apache.catalina.startup.TldConfig.jarsToSkip", "*") } static final int PORT = TestUtils.randomOpenPort() @@ -50,14 +54,6 @@ class JSPInstrumentationForwardTests extends AgentTestRunner { appContext = tomcatServer.addWebapp("/$JSP_WEBAPP_CONTEXT", JSPInstrumentationForwardTests.getResource("/webapps/jsptest").getPath()) - // Speed up startup by disabling jar scanning: -// appContext.getJarScanner().setJarScanFilter(new JarScanFilter() { -// @Override -// boolean check(JarScanType jarScanType, String jarName) { -// return false -// } -// }) - tomcatServer.start() System.out.println( "Tomcat server: http://" + tomcatServer.getHost().getName() + ":" + PORT + "/") diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/common/hello.html b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/common/hello.html similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/common/hello.html rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/common/hello.html diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/common/javaLoopH2.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/common/javaLoopH2.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/common/javaLoopH2.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/common/javaLoopH2.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/common/loop.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/common/loop.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/common/loop.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/common/loop.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/compileError.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/compileError.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/compileError.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/compileError.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToCompileError.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToCompileError.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToCompileError.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToCompileError.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToHtml.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToHtml.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToHtml.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToHtml.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToIncludeMulti.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToIncludeMulti.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToIncludeMulti.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToIncludeMulti.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToJspForward.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToJspForward.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToJspForward.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToJspForward.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToNoJavaJsp.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToNoJavaJsp.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToNoJavaJsp.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToNoJavaJsp.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToNonExistent.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToNonExistent.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToNonExistent.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToNonExistent.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToSimpleJava.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToSimpleJava.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardToSimpleJava.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardToSimpleJava.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardWithCompileError.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardWithCompileError.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/forwards/forwardWithCompileError.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/forwards/forwardWithCompileError.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/getQuery.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/getQuery.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/getQuery.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/getQuery.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/includes/includeHtml.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/includes/includeHtml.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/includes/includeHtml.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/includes/includeHtml.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/includes/includeMulti.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/includes/includeMulti.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/includes/includeMulti.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/includes/includeMulti.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/invalidMarkup.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/invalidMarkup.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/invalidMarkup.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/invalidMarkup.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/invalidWrite.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/invalidWrite.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/invalidWrite.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/invalidWrite.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/nojava.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/nojava.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/nojava.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/nojava.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/post.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/post.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/post.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/post.jsp diff --git a/dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/runtimeError.jsp b/dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/runtimeError.jsp similarity index 100% rename from dd-java-agent/instrumentation/jsp/src/test/resources/webapps/jsptest/runtimeError.jsp rename to dd-java-agent/instrumentation/jsp-2.3/src/test/resources/webapps/jsptest/runtimeError.jsp diff --git a/settings.gradle b/settings.gradle index 9887b4b12c..eab8e57289 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,7 +32,7 @@ include ':dd-java-agent:instrumentation:jedis-1.4' include ':dd-java-agent:instrumentation:jetty-8' include ':dd-java-agent:instrumentation:jms-1' include ':dd-java-agent:instrumentation:jms-2' -include ':dd-java-agent:instrumentation:jsp' +include ':dd-java-agent:instrumentation:jsp-2.3' include ':dd-java-agent:instrumentation:kafka-clients-0.11' include ':dd-java-agent:instrumentation:kafka-streams-0.11' include ':dd-java-agent:instrumentation:lettuce-5'