From ab9beca6ec96ff27d72238e99ed0a184d4b5b123 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Thu, 13 Nov 2025 13:38:18 -0500 Subject: [PATCH] Replace `groovy.servlet` with `javax.servlet` to reduce dependency on Groovy. --- .../src/test/groovy/TestServlet2.groovy | 4 ++-- .../src/test/groovy/JettyServlet3Test.groovy | 6 +++--- .../instrumentation/servlet3/TestServlet3.groovy | 14 +++++++------- .../src/test/groovy/HttpServletResponseTest.groovy | 4 ++-- .../src/test/groovy/HttpServletTest.groovy | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/TestServlet2.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/TestServlet2.groovy index 06674df52fd..5cde4ac30dd 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/TestServlet2.groovy +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-2.2/src/test/groovy/TestServlet2.groovy @@ -1,7 +1,7 @@ import datadog.appsec.api.blocking.Blocking import datadog.trace.agent.test.base.HttpServerTest -import groovy.servlet.AbstractHttpServlet +import javax.servlet.http.HttpServlet import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse @@ -19,7 +19,7 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.USER_B class TestServlet2 { - static class Sync extends AbstractHttpServlet { + static class Sync extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) { req.getRequestDispatcher() diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServlet3Test.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServlet3Test.groovy index 312caadca48..7b2886e0021 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServlet3Test.groovy +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/test/groovy/JettyServlet3Test.groovy @@ -13,7 +13,6 @@ import datadog.context.Context import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_CONTEXT_ATTRIBUTE -import groovy.servlet.AbstractHttpServlet import org.eclipse.jetty.server.Request import org.eclipse.jetty.server.Server import org.eclipse.jetty.server.handler.ErrorHandler @@ -26,6 +25,7 @@ import javax.servlet.AsyncListener import javax.servlet.Servlet import javax.servlet.ServletException import javax.servlet.annotation.WebServlet +import javax.servlet.http.HttpServlet import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse @@ -423,7 +423,7 @@ class JettyServlet3TestDispatchAsync extends JettyServlet3Test { @WebServlet(asyncSupported = true) -class DispatchTimeoutAsync extends AbstractHttpServlet { +class DispatchTimeoutAsync extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) { def target = req.servletPath.replace("/dispatch", "") @@ -518,7 +518,7 @@ class JettyServlet3TestAsyncDispatchOnAsyncTimeout extends JettyServlet3Test { } @WebServlet(asyncSupported = true) -class ServeFromOnAsyncTimeout extends AbstractHttpServlet { +class ServeFromOnAsyncTimeout extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) { def context = req.startAsync() diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy index 8900bf4df89..4b0b9df85d4 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet3/TestServlet3.groovy @@ -3,11 +3,11 @@ package datadog.trace.instrumentation.servlet3 import datadog.appsec.api.blocking.Blocking import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint -import groovy.servlet.AbstractHttpServlet import javax.servlet.AsyncEvent import javax.servlet.AsyncListener import javax.servlet.annotation.WebServlet +import javax.servlet.http.HttpServlet import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse import java.lang.reflect.Field @@ -49,7 +49,7 @@ class TestServlet3 { } @WebServlet - static class Sync extends AbstractHttpServlet { + static class Sync extends HttpServlet { ServerEndpoint determineEndpoint(HttpServletRequest req) { getEndpoint(req) } @@ -129,7 +129,7 @@ class TestServlet3 { } @WebServlet(asyncSupported = true) - static class Async extends AbstractHttpServlet { + static class Async extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) { HttpServerTest.ServerEndpoint endpoint = getEndpoint(req) @@ -216,7 +216,7 @@ class TestServlet3 { } @WebServlet(asyncSupported = true) - static class FakeAsync extends AbstractHttpServlet { + static class FakeAsync extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) { def context = req.startAsync() @@ -276,7 +276,7 @@ class TestServlet3 { } @WebServlet(asyncSupported = true) - static class DispatchImmediate extends AbstractHttpServlet { + static class DispatchImmediate extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) { def target = req.servletPath.replace("/dispatch", "") @@ -285,7 +285,7 @@ class TestServlet3 { } @WebServlet(asyncSupported = true) - static class DispatchAsync extends AbstractHttpServlet { + static class DispatchAsync extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) { def target = req.servletPath.replace("/dispatch", "") @@ -298,7 +298,7 @@ class TestServlet3 { // TODO: Add tests for this! @WebServlet(asyncSupported = true) - static class DispatchRecursive extends AbstractHttpServlet { + static class DispatchRecursive extends HttpServlet { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) { if (req.servletPath == "/recursive") { diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletResponseTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletResponseTest.groovy index 234cc443471..13ff4f8a3b2 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletResponseTest.groovy +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletResponseTest.groovy @@ -1,11 +1,11 @@ import datadog.trace.agent.test.InstrumentationSpecification -import groovy.servlet.AbstractHttpServlet import javax.servlet.ServletException import javax.servlet.ServletOutputStream import javax.servlet.ServletRequest import javax.servlet.ServletResponse import javax.servlet.http.Cookie +import javax.servlet.http.HttpServlet import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse @@ -21,7 +21,7 @@ class HttpServletResponseTest extends InstrumentationSpecification { } def doService(HttpServletRequest request, TestResponse response, Closure testHandler) { - def servlet = new AbstractHttpServlet() { + def servlet = new HttpServlet() { @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { testHandler(resp) diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletTest.groovy b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletTest.groovy index 2d7cae70751..9742f3339d2 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletTest.groovy +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/test/groovy/HttpServletTest.groovy @@ -1,6 +1,6 @@ import datadog.trace.agent.test.InstrumentationSpecification -import groovy.servlet.AbstractHttpServlet +import javax.servlet.http.HttpServlet import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletResponse @@ -124,7 +124,7 @@ class HttpServletTest extends InstrumentationSpecification { } } - static class TestServlet extends AbstractHttpServlet { + static class TestServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) { }