Move servlet-common internal package under servlet.common.internal#18855
Merged
Conversation
Aligns the internal package layout of the servlet-common library module with the module-name <-> package-name convention by relocating io.opentelemetry.instrumentation.servlet.internal to io.opentelemetry.instrumentation.servlet.common.internal. These classes are marked internal (not part of the public API) and are consumed only by other instrumentation modules in this repository, so updating the import sites is sufficient. Also drops the wholesale servlet-common module skip in the package-name checker, since the package layout now satisfies the prefix check via the existing no-base-version allow-list.
Contributor
There was a problem hiding this comment.
Pull request overview
Mechanical rename of the servlet-common library internal package from io.opentelemetry.instrumentation.servlet.internal to io.opentelemetry.instrumentation.servlet.common.internal, aligning it with the module-name/package-name convention (matching the analogous netty-common layout). The package-name checker is updated to drop the wholesale skip of servlet-common and include it in the no-base-version allow-list instead.
Changes:
- Rename package declarations of 10 servlet-common internal classes.
- Update all import sites across servlet, jetty, liberty, and tomcat instrumentation modules.
- Update
.github/scripts/check-package-names.shto remove theservlet-commonskip and add it to the no-base-version allow-list.
Reviewed changes
Copilot reviewed 45 out of 45 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| servlet-common/library/.../internal/*.java (10 files) | Updated package declarations to new servlet.common.internal path |
| servlet-common/javaagent/.../*.java (5 files) | Updated imports to new package |
| servlet-common-javax/.../JavaxServletAccessor.java | Updated import |
| servlet-3.0/library + javaagent/.../*.java (5 files) | Updated imports |
| servlet-5.0/library + javaagent/.../*.java (5 files) | Updated imports |
| servlet-2.2/javaagent/.../*.java (6 files) | Updated imports |
| jetty-common-8.0, jetty-8.0, jetty-11.0 (5 files) | Updated imports |
| liberty-20.0 (4 files) | Updated imports |
| tomcat-common-7.0/.../TomcatInstrumenterFactory.java | Updated imports |
| .github/scripts/check-package-names.sh | Removed servlet-common skip, added to no-base-version allow-list |
laurit
approved these changes
May 28, 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.
Aligns the internal package layout of the
servlet-commonlibrary module with the module-name <-> package-name convention by relocatingio.opentelemetry.instrumentation.servlet.internaltoio.opentelemetry.instrumentation.servlet.common.internal.These classes are marked
internal(not part of the public API) and are consumed only by other instrumentation modules in this repository, so updating the import sites is sufficient.Also drops the wholesale
servlet-commonmodule skip in the package-name checker, since the package layout now satisfies the prefix check via the existing no-base-version allow-list.