use servlet annotations for ja{vax,karta} compat

Author: SylvainJuge

instrumentation/jmx-metrics/testing-webapp/build.gradle.kts

@@ -7,5 +7,7 @@ plugins {
 description = "JMX metrics - test web application"
 
 dependencies {
+  // using both servlet APIs to provide compatibility with most containers pre/post jarkarta renaming
   compileOnly("jakarta.servlet:jakarta.servlet-api:5.0.0")
+  compileOnly("javax.servlet:javax.servlet-api:4.0.1")
 }

…mentation/jmx/testapp/SimpleServlet.java …on/jmx/testapp/JakartaSimpleServlet.javainstrumentation/jmx-metrics/testing-webapp/src/main/java/io/opentelemetry/instrumentation/jmx/testapp/SimpleServlet.java renamed to instrumentation/jmx-metrics/testing-webapp/src/main/java/io/opentelemetry/instrumentation/jmx/testapp/JakartaSimpleServlet.java instrumentation/jmx-metrics/testing-webapp/src/main/java/io/opentelemetry/instrumentation/jmx/testapp/SimpleServlet.java renamed to instrumentation/jmx-metrics/testing-webapp/src/main/java/io/opentelemetry/instrumentation/jmx/testapp/JakartaSimpleServlet.java

@@ -5,13 +5,16 @@
 
 package io.opentelemetry.instrumentation.jmx.testapp;
 
+import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.PrintWriter;
 
-public class SimpleServlet extends HttpServlet {
+// servlet that will be used for jakarta servlet containers
+@WebServlet(urlPatterns = "/jakarta/*", name = "jakartaServlet")
+public class JakartaSimpleServlet extends HttpServlet {
 
   private static final long serialVersionUID = 3726145372238690099L;
 

instrumentation/jmx-metrics/testing-webapp/src/main/java/io/opentelemetry/instrumentation/jmx/testapp/JavaxSimpleServlet.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.instrumentation.jmx.testapp;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+// servlet that will be used for javax servlet containers
+@WebServlet(urlPatterns = "/javax/*", name = "javaxServlet")
+public class JavaxSimpleServlet extends HttpServlet {
+
+  private static final long serialVersionUID = 3726145372238690099L;
+
+  @Override
+  protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+    try (PrintWriter out = resp.getWriter()) {
+      out.write("hello!");
+    }
+  }
+}