From 55a8308b85efc827f843518152b3374800f2cc83 Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Wed, 24 Aug 2022 10:13:54 +0300 Subject: [PATCH] Add display name for smoke test webapp (#6500) * Add display name for smoke test webapp * remove unused ExceptionRequestListener --- .../matrix/ExceptionRequestListener.java | 26 ------------------- .../smoketest/matrix/ForwardServlet.java | 22 ---------------- .../smoketest/matrix/IncludeServlet.java | 22 ---------------- .../src/main/webapp/WEB-INF/web.xml | 20 +------------- .../matrix/ExceptionRequestListener.java | 26 ------------------- .../smoketest/matrix/ForwardServlet.java | 22 ---------------- .../smoketest/matrix/IncludeServlet.java | 22 ---------------- .../src/main/webapp/WEB-INF/web.xml | 20 +------------- 8 files changed, 2 insertions(+), 178 deletions(-) delete mode 100644 smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java delete mode 100644 smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java delete mode 100644 smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java delete mode 100644 smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java delete mode 100644 smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java delete mode 100644 smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java diff --git a/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java b/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java deleted file mode 100644 index 3bcae8af0c..0000000000 --- a/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java +++ /dev/null @@ -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"); - } - } -} diff --git a/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java b/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java deleted file mode 100644 index 21fdac7dad..0000000000 --- a/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java +++ /dev/null @@ -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); - } -} diff --git a/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java b/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java deleted file mode 100644 index 46ef545395..0000000000 --- a/smoke-tests/images/servlet/servlet-3.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java +++ /dev/null @@ -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); - } -} diff --git a/smoke-tests/images/servlet/servlet-3.0/src/main/webapp/WEB-INF/web.xml b/smoke-tests/images/servlet/servlet-3.0/src/main/webapp/WEB-INF/web.xml index 845e30374b..0575ce17db 100644 --- a/smoke-tests/images/servlet/servlet-3.0/src/main/webapp/WEB-INF/web.xml +++ b/smoke-tests/images/servlet/servlet-3.0/src/main/webapp/WEB-INF/web.xml @@ -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"> - - io.opentelemetry.smoketest.matrix.ExceptionRequestListener - + smoke-test-app Headers io.opentelemetry.smoketest.matrix.HeaderDumpingServlet @@ -23,14 +21,6 @@ Exception io.opentelemetry.smoketest.matrix.ExceptionServlet - - Forward - io.opentelemetry.smoketest.matrix.ForwardServlet - - - Include - io.opentelemetry.smoketest.matrix.IncludeServlet - Jsp io.opentelemetry.smoketest.matrix.JspServlet @@ -51,14 +41,6 @@ Exception /exception - - Forward - /forward - - - Include - /include - Jsp /jsp diff --git a/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java b/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java deleted file mode 100644 index b048ad79dd..0000000000 --- a/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ExceptionRequestListener.java +++ /dev/null @@ -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"); - } - } -} diff --git a/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java b/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java deleted file mode 100644 index b3022f7d06..0000000000 --- a/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/ForwardServlet.java +++ /dev/null @@ -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); - } -} diff --git a/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java b/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java deleted file mode 100644 index b0b7a61e2e..0000000000 --- a/smoke-tests/images/servlet/servlet-5.0/src/main/java/io/opentelemetry/smoketest/matrix/IncludeServlet.java +++ /dev/null @@ -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); - } -} diff --git a/smoke-tests/images/servlet/servlet-5.0/src/main/webapp/WEB-INF/web.xml b/smoke-tests/images/servlet/servlet-5.0/src/main/webapp/WEB-INF/web.xml index 4ee1f5472f..28f6e1bde8 100644 --- a/smoke-tests/images/servlet/servlet-5.0/src/main/webapp/WEB-INF/web.xml +++ b/smoke-tests/images/servlet/servlet-5.0/src/main/webapp/WEB-INF/web.xml @@ -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"> - - io.opentelemetry.smoketest.matrix.ExceptionRequestListener - + smoke-test-app Headers io.opentelemetry.smoketest.matrix.HeaderDumpingServlet @@ -23,14 +21,6 @@ Exception io.opentelemetry.smoketest.matrix.ExceptionServlet - - Forward - io.opentelemetry.smoketest.matrix.ForwardServlet - - - Include - io.opentelemetry.smoketest.matrix.IncludeServlet - Jsp io.opentelemetry.smoketest.matrix.JspServlet @@ -51,14 +41,6 @@ Exception /exception - - Forward - /forward - - - Include - /include - Jsp /jsp