Rename servlet common root package#18778
Merged
trask merged 1 commit intoMay 18, 2026
Merged
Conversation
trask
force-pushed
the
package-name-cleanup-servlet-common-root
branch
from
6859a37 to
5c48244
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Part of the broader effort (#18428) to align package and module names. This PR moves servlet-common javaagent helper classes from the io.opentelemetry.javaagent.instrumentation.servlet package into the io.opentelemetry.javaagent.instrumentation.servlet.common subpackage, matching the module name servlet-common, and updates all importers (servlet 2.2/3.0/5.0, jetty, tomcat, liberty, jfinal) accordingly.
Changes:
- Rename package of 7 servlet-common helper classes to
...servlet.common. - Update all imports in dependent javaagent modules to the new package.
- Update the JFinal hard-coded attribute-name string used by
JsonRender.addExcludedAttrsto track the new fully-qualified class name.
Reviewed changes
Copilot reviewed 25 out of 25 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| instrumentation/servlet/servlet-common/javaagent/.../common/{AgentServletInstrumenterBuilder,AsyncRequestCompletionListener,AsyncRunnableWrapper,BaseServletHelper,ServletFilterMappingResolverFactory,ServletHelper,ServletMappingResolverFactory,ServletSpanNameProvider}.java | Move classes into .common subpackage. |
| instrumentation/servlet/servlet-2.2/javaagent/.../v2_2/{Servlet2Helper,Servlet2Singletons}.java | Update imports to new package. |
| instrumentation/servlet/servlet-3.0/javaagent/.../v3_0/{Servlet3Singletons,Servlet3MappingResolverFactory,Servlet3FilterMappingResolverFactory,AsyncDispatchAdvice}.java | Update imports/static import to new package. |
| instrumentation/servlet/servlet-5.0/javaagent/.../v5_0/{Servlet5Singletons,service/JakartaServletMappingResolverFactory,service/JakartaServletFilterMappingResolverFactory,async/AsyncDispatchAdvice}.java | Update imports/static import to new package. |
| instrumentation/liberty/liberty-20.0/javaagent/.../v20_0/{LibertyHelper,LibertySingletons}.java | Update imports to new package. |
| instrumentation/jetty/jetty-common/javaagent/.../common/JettyHelper.java | Update import to new package. |
| instrumentation/jetty/jetty-8.0/javaagent/.../v8_0/Jetty8Singletons.java | Update import to new package. |
| instrumentation/jetty/jetty-11.0/javaagent/.../v11_0/Jetty11Singletons.java | Update import to new package. |
| instrumentation/tomcat/tomcat-common/javaagent/.../common/TomcatHelper.java | Update import to new package. |
| instrumentation/jfinal-3.2/javaagent/.../v3_2/JFinalSingletons.java | Update excluded-attribute string to new FQ class name. |
steverao
approved these changes
May 18, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Part of