From 54e3df3cd4fe9795cdb43868b7012c918d53c611 Mon Sep 17 00:00:00 2001
From: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
Date: Thu, 3 Dec 2020 19:40:31 +0200
Subject: [PATCH] Add jsp to test matrix application (#1825)

* Add jsp to test matrix application

* Trying to fix sudden muzzle failure
---
 ...xrs-client-2.0-jersey-2.0-javaagent.gradle |  2 +-
 .../jaxrs-2.0-jersey-2.0-javaagent.gradle     |  2 +-
 .../appservers/javaee/JspServlet.java         | 24 +++++++++++++++++++
 .../matrix/src/main/webapp/WEB-INF/web.xml    |  8 +++++++
 smoke-tests/matrix/src/main/webapp/test.jsp   | 10 ++++++++
 5 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 smoke-tests/matrix/src/main/java/com/splunk/opentelemetry/appservers/javaee/JspServlet.java
 create mode 100644 smoke-tests/matrix/src/main/webapp/test.jsp

diff --git a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle
index 921cbaa811..634f76355c 100644
--- a/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle
+++ b/instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle
@@ -4,7 +4,7 @@ muzzle {
   pass {
     group = "org.glassfish.jersey.core"
     module = "jersey-client"
-    versions = "[2.0,)"
+    versions = "[2.0,3.0.0)"
   }
 }
 
diff --git a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle
index 439aff65f2..ab1a806664 100644
--- a/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle
+++ b/instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle
@@ -6,7 +6,7 @@ muzzle {
   pass {
     group = "org.glassfish.jersey.core"
     module = "jersey-server"
-    versions = "[2.0,]"
+    versions = "[2.0,3.0.0)"
   }
 }
 
diff --git a/smoke-tests/matrix/src/main/java/com/splunk/opentelemetry/appservers/javaee/JspServlet.java b/smoke-tests/matrix/src/main/java/com/splunk/opentelemetry/appservers/javaee/JspServlet.java
new file mode 100644
index 0000000000..435758d843
--- /dev/null
+++ b/smoke-tests/matrix/src/main/java/com/splunk/opentelemetry/appservers/javaee/JspServlet.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.splunk.opentelemetry.appservers.javaee;
+
+import java.io.IOException;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class JspServlet extends HttpServlet {
+
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+      throws IOException, ServletException {
+    RequestDispatcher resultView = req.getRequestDispatcher("test.jsp");
+    resultView.forward(req, resp);
+  }
+
+}
diff --git a/smoke-tests/matrix/src/main/webapp/WEB-INF/web.xml b/smoke-tests/matrix/src/main/webapp/WEB-INF/web.xml
index aa0a0754e6..4dfd704c5f 100644
--- a/smoke-tests/matrix/src/main/webapp/WEB-INF/web.xml
+++ b/smoke-tests/matrix/src/main/webapp/WEB-INF/web.xml
@@ -11,6 +11,10 @@
         <servlet-name>Greeting</servlet-name>
         <servlet-class>com.splunk.opentelemetry.appservers.javaee.GreetingServlet</servlet-class>
     </servlet>
+    <servlet>
+        <servlet-name>Jsp</servlet-name>
+        <servlet-class>com.splunk.opentelemetry.appservers.javaee.JspServlet</servlet-class>
+    </servlet>
     <servlet-mapping>
         <servlet-name>Headers</servlet-name>
         <url-pattern>/headers</url-pattern>
@@ -19,4 +23,8 @@
         <servlet-name>Greeting</servlet-name>
         <url-pattern>/greeting</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Jsp</servlet-name>
+        <url-pattern>/jsp</url-pattern>
+    </servlet-mapping>
 </web-app>
\ No newline at end of file
diff --git a/smoke-tests/matrix/src/main/webapp/test.jsp b/smoke-tests/matrix/src/main/webapp/test.jsp
new file mode 100644
index 0000000000..bc2bb7ae28
--- /dev/null
+++ b/smoke-tests/matrix/src/main/webapp/test.jsp
@@ -0,0 +1,10 @@
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+  <head>
+    <title>Successful JSP test</title>
+  </head>
+  <body>
+    This JSP demonstrates that Otel instrumentation agent does not break JSP compilation and loading.
+  </body>
+</html>