Skip to content

Test async RUM timer propagation as application code #12502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Sep 18, 2026
Merged

Test async RUM timer propagation as application code #12502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...mentation/servlet5/AsyncRumServlet.groovy → ...oovy/test/servlet5/AsyncRumServlet.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package datadog.trace.instrumentation.servlet5
package test.servlet5

import jakarta.servlet.AsyncContext
import jakarta.servlet.ServletException
Expand Down
8 changes: 2 additions & 6 deletions ...agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/groovy/TomcatServletTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import datadog.trace.agent.test.base.HttpServer
import datadog.trace.api.ProcessTags
import datadog.trace.instrumentation.servlet5.HtmlAsyncRumServlet
import datadog.trace.instrumentation.servlet5.HtmlRumServlet
import datadog.trace.instrumentation.servlet5.TestServlet5
import datadog.trace.instrumentation.servlet5.XmlAsyncRumServlet
import datadog.trace.instrumentation.servlet5.XmlRumServlet
import jakarta.servlet.Filter
import jakarta.servlet.Servlet
Expand All @@ -20,6 +18,8 @@ import org.apache.tomcat.util.descriptor.web.ContextEnvironment
import org.apache.tomcat.util.descriptor.web.FilterDef
import org.apache.tomcat.util.descriptor.web.FilterMap
import spock.lang.IgnoreIf
import test.servlet5.HtmlAsyncRumServlet
import test.servlet5.XmlAsyncRumServlet

import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION
import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION
Expand Down Expand Up @@ -320,7 +320,3 @@ class TomcatAsyncRumInjectionForkedTest extends TomcatRumInjectionForkedTest {
addServlet(context, "/gimme-xml", XmlAsyncRumServlet)
}
}




Loading