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 display name for smoke test webapp (#6500) 

* Add display name for smoke test webapp

* remove unused ExceptionRequestListener
This commit is contained in:
Lauri Tulmin 2022-08-24 10:13:54 +03:00 committed by GitHub
parent 4cbfd7da8b
commit 55a8308b85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 2 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java
View File

@ -1,26 +0,0 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.matrix;
import javax.servlet.ServletRequestEvent;
import javax.servlet.ServletRequestListener;
public class ExceptionRequestListener implements ServletRequestListener {
@Override
public void requestDestroyed(ServletRequestEvent sre) {
if ("true".equals(sre.getServletRequest().getParameter("throwOnRequestDestroyed"))) {
throw new IllegalStateException("This is expected");
}
}
@Override
public void requestInitialized(ServletRequestEvent sre) {
if ("true".equals(sre.getServletRequest().getParameter("throwOnRequestInitialized"))) {
throw new IllegalStateException("This is expected");
}
}
}

22
smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java
View File

@ -1,22 +0,0 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.matrix;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public class ForwardServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getRequestDispatcher("/hello.txt").forward(req, resp);
}
}

22
smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java
View File

@ -1,22 +0,0 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.matrix;
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
public class IncludeServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getRequestDispatcher("/hello.txt").include(req, resp);
}
}

20
smoke-tests/images/servlet/servlet-3.0/src/main/webapp/WEB-INF/web.xml
View File

@ -3,9 +3,7 @@
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
<listener>
<listener-class>io.opentelemetry.smoketest.matrix.ExceptionRequestListener</listener-class>
</listener>
<display-name>smoke-test-app</display-name>
<servlet>
<servlet-name>Headers</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.HeaderDumpingServlet</servlet-class>
@ -23,14 +21,6 @@
<servlet-name>Exception</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.ExceptionServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>Forward</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.ForwardServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>Include</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.IncludeServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>Jsp</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.JspServlet</servlet-class>
@ -51,14 +41,6 @@
<servlet-name>Exception</servlet-name>
<url-pattern>/exception</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>Forward</servlet-name>
<url-pattern>/forward</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>Include</servlet-name>
<url-pattern>/include</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>Jsp</servlet-name>
<url-pattern>/jsp</url-pattern>

26
smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java
View File

@ -1,26 +0,0 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.matrix;
import jakarta.servlet.ServletRequestEvent;
import jakarta.servlet.ServletRequestListener;
public class ExceptionRequestListener implements ServletRequestListener {
@Override
public void requestDestroyed(ServletRequestEvent sre) {
if ("true".equals(sre.getServletRequest().getParameter("throwOnRequestDestroyed"))) {
throw new IllegalStateException("This is expected");
}
}
@Override
public void requestInitialized(ServletRequestEvent sre) {
if ("true".equals(sre.getServletRequest().getParameter("throwOnRequestInitialized"))) {
throw new IllegalStateException("This is expected");
}
}
}

22
smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java
View File

@ -1,22 +0,0 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.matrix;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
public class ForwardServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getRequestDispatcher("/hello.txt").forward(req, resp);
}
}

22
smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java
View File

@ -1,22 +0,0 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.smoketest.matrix;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
public class IncludeServlet extends HttpServlet {
private static final long serialVersionUID = 1L;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException {
req.getRequestDispatcher("/hello.txt").include(req, resp);
}
}

20
smoke-tests/images/servlet/servlet-5.0/src/main/webapp/WEB-INF/web.xml
View File

@ -3,9 +3,7 @@
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
version="5.0">
<listener>
<listener-class>io.opentelemetry.smoketest.matrix.ExceptionRequestListener</listener-class>
</listener>
<display-name>smoke-test-app</display-name>
<servlet>
<servlet-name>Headers</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.HeaderDumpingServlet</servlet-class>
@ -23,14 +21,6 @@
<servlet-name>Exception</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.ExceptionServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>Forward</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.ForwardServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>Include</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.IncludeServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>Jsp</servlet-name>
<servlet-class>io.opentelemetry.smoketest.matrix.JspServlet</servlet-class>
@ -51,14 +41,6 @@
<servlet-name>Exception</servlet-name>
<url-pattern>/exception</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>Forward</servlet-name>
<url-pattern>/forward</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>Include</servlet-name>
<url-pattern>/include</url-pattern>
</servlet-mapping>
<servlet-mapping>
<servlet-name>Jsp</servlet-name>
<url-pattern>/jsp</url-pattern>