From 7e233ac3c7d3f06d28a0f240861c0fb31d896a3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Gr=C3=B8ndal?= Date: Thu, 8 Mar 2018 08:11:03 +0100 Subject: [PATCH] feat: find oldest supported spark, update version, make tests run --- .../instrumentation/jetty-8/jetty-8.gradle | 2 +- .../sparkjava-2.3.gradle} | 9 +++-- .../sparkjava/RoutesInstrumentation.java | 2 +- .../src/test/groovy/SparkJavaBasedTest.groovy | 0 .../test/java/TestSparkJavaApplication.java | 17 +++++++++ .../test/java/TestSparkJavaApplication.java | 37 ------------------- settings.gradle | 2 +- 7 files changed, 26 insertions(+), 43 deletions(-) rename dd-java-agent/instrumentation/{sparkjava-2.5/sparkjava-2.5.gradle => sparkjava-2.3/sparkjava-2.3.gradle} (87%) rename dd-java-agent/instrumentation/{sparkjava-2.5 => sparkjava-2.3}/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java (97%) rename dd-java-agent/instrumentation/{sparkjava-2.5 => sparkjava-2.3}/src/test/groovy/SparkJavaBasedTest.groovy (100%) create mode 100644 dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java delete mode 100644 dd-java-agent/instrumentation/sparkjava-2.5/src/test/java/TestSparkJavaApplication.java diff --git a/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle b/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle index 09288fb38b..95715c2061 100644 --- a/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle +++ b/dd-java-agent/instrumentation/jetty-8/jetty-8.gradle @@ -3,7 +3,7 @@ apply plugin: 'version-scan' versionScan { group = "org.eclipse.jetty.server" module = 'org.eclipse.jetty.server-Handler' - versions = "[3.0,)" + versions = "[8.0.0.v20110901,)" verifyPresent = [ "javax.servlet.AsyncEvent" : null, "javax.servlet.AsyncListener": null, diff --git a/dd-java-agent/instrumentation/sparkjava-2.5/sparkjava-2.5.gradle b/dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle similarity index 87% rename from dd-java-agent/instrumentation/sparkjava-2.5/sparkjava-2.5.gradle rename to dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle index ca5a33ed5c..e3c23e32e1 100644 --- a/dd-java-agent/instrumentation/sparkjava-2.5/sparkjava-2.5.gradle +++ b/dd-java-agent/instrumentation/sparkjava-2.3/sparkjava-2.3.gradle @@ -2,8 +2,8 @@ apply plugin: 'version-scan' versionScan { group = "spark" - module = 'spark.routes-Routes' - versions = "[3.0,)" + module = 'spark' + versions = "[2.3,)" verifyPresent = [ "spark.embeddedserver.jetty.EmbeddedJettyServer" : null ] @@ -18,6 +18,9 @@ if (JavaVersion.current().isJava8Compatible()) { // Sparkjava is not compatible with < Java 8 exclude '**/SparkJavaBasedTest.groovy' } + java { + exclude '**/TestSparkJavaApplication.java' + } } } } @@ -28,7 +31,7 @@ dependencies { compile deps.bytebuddy compile deps.opentracing compile deps.autoservice - compile group: 'com.sparkjava', name: 'spark-core', version: '2.5' + compile group: 'com.sparkjava', name: 'spark-core', version: '2.3' testCompile project(':dd-java-agent:instrumentation:jetty-8') testCompile project(':dd-java-agent:testing') diff --git a/dd-java-agent/instrumentation/sparkjava-2.5/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java b/dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java similarity index 97% rename from dd-java-agent/instrumentation/sparkjava-2.5/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java rename to dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java index d53609e0cd..e9e9ce3df7 100644 --- a/dd-java-agent/instrumentation/sparkjava-2.5/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java +++ b/dd-java-agent/instrumentation/sparkjava-2.3/src/main/java/datadog/trace/instrumentation/sparkjava/RoutesInstrumentation.java @@ -16,7 +16,7 @@ import spark.routematch.RouteMatch; public class RoutesInstrumentation extends Instrumenter.Configurable { public RoutesInstrumentation() { - super("sparkjava", "sparkjava-2"); + super("sparkjava", "sparkjava-2.3"); } @Override diff --git a/dd-java-agent/instrumentation/sparkjava-2.5/src/test/groovy/SparkJavaBasedTest.groovy b/dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy similarity index 100% rename from dd-java-agent/instrumentation/sparkjava-2.5/src/test/groovy/SparkJavaBasedTest.groovy rename to dd-java-agent/instrumentation/sparkjava-2.3/src/test/groovy/SparkJavaBasedTest.groovy diff --git a/dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java b/dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java new file mode 100644 index 0000000000..eb7941e19c --- /dev/null +++ b/dd-java-agent/instrumentation/sparkjava-2.3/src/test/java/TestSparkJavaApplication.java @@ -0,0 +1,17 @@ +import spark.Spark; + +public class TestSparkJavaApplication { + + public static void main(final String[] args) { + + Spark.get("/", (req, res) -> "Hello World"); + + Spark.get("/param/:param", (req, res) -> "Hello " + req.params("param")); + + Spark.get( + "/exception/:param", + (req, res) -> { + throw new RuntimeException(req.params("param")); + }); + } +} diff --git a/dd-java-agent/instrumentation/sparkjava-2.5/src/test/java/TestSparkJavaApplication.java b/dd-java-agent/instrumentation/sparkjava-2.5/src/test/java/TestSparkJavaApplication.java deleted file mode 100644 index 92b105900c..0000000000 --- a/dd-java-agent/instrumentation/sparkjava-2.5/src/test/java/TestSparkJavaApplication.java +++ /dev/null @@ -1,37 +0,0 @@ -import spark.Request; -import spark.Response; -import spark.Route; -import spark.Spark; - -public class TestSparkJavaApplication { - - public static void main(final String[] args) { - - Spark.get( - "/", - new Route() { - @Override - public Object handle(Request request, Response response) throws Exception { - return "Hello World"; - } - }); - - Spark.get( - "/param/:param", - new Route() { - @Override - public Object handle(Request request, Response response) throws Exception { - return "Hello " + request.params("param"); - } - }); - - Spark.get( - "/exception/:param", - new Route() { - @Override - public Object handle(Request request, Response response) throws Exception { - throw new RuntimeException(request.params("param")); - } - }); - } -} diff --git a/settings.gradle b/settings.gradle index d21bbf5396..83a5c49d67 100644 --- a/settings.gradle +++ b/settings.gradle @@ -35,7 +35,7 @@ include ':dd-java-agent:instrumentation:play-2.4:play-2.6-testing' include ':dd-java-agent:instrumentation:ratpack-1.4' include ':dd-java-agent:instrumentation:servlet-2' include ':dd-java-agent:instrumentation:servlet-3' -include ':dd-java-agent:instrumentation:sparkjava-2.5' +include ':dd-java-agent:instrumentation:sparkjava-2.3' include ':dd-java-agent:instrumentation:spring-web' include ':dd-java-agent:instrumentation:trace-annotation'