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

Add jsp to test matrix application (#1825) 

* Add jsp to test matrix application

* Trying to fix sudden muzzle failure
This commit is contained in:
Nikita Salnikov-Tarnovski 2020-12-03 19:40:31 +02:00 committed by GitHub
parent fff6eb7004
commit 54e3df3cd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/jaxrs-client/jaxrs-client-2.0/jaxrs-client-2.0-jersey-2.0/javaagent/jaxrs-client-2.0-jersey-2.0-javaagent.gradle
View File

@ -4,7 +4,7 @@ muzzle {
pass {
group = "org.glassfish.jersey.core"
module = "jersey-client"
versions = "[2.0,)"
versions = "[2.0,3.0.0)"
}
}

2
instrumentation/jaxrs/jaxrs-2.0/jaxrs-2.0-jersey-2.0/javaagent/jaxrs-2.0-jersey-2.0-javaagent.gradle
View File

@ -6,7 +6,7 @@ muzzle {
pass {
group = "org.glassfish.jersey.core"
module = "jersey-server"
versions = "[2.0,]"
versions = "[2.0,3.0.0)"
}
}

24
smoke-tests/matrix/src/main/java/com/splunk/opentelemetry/appservers/javaee/JspServlet.java Normal file
View File

@ -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);
}
}

8
smoke-tests/matrix/src/main/webapp/WEB-INF/web.xml
View File

@ -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>

10
smoke-tests/matrix/src/main/webapp/test.jsp Normal file
View File

@ -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>