Move ServletContextPath to servlet-common:bootstrap
#4824
Merged
Conversation
This file contains 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
mateuszrzeszutek
requested review from
anuraaga,
iNikem,
jkwatson,
laurit,
pavolloffay,
trask and
tylerbenson
as code owners
trask
approved these changes
Dec 7, 2021
| @@ -17,14 +17,15 @@ muzzle { | |||
| } | |||
|
|
|||
| configurations.configureEach { | |||
| if (!name.contains("muzzle")) { | |||
| // axis has a dependency on servlet api, get rid of it | |||
| if (name.contains("test")) { | |||
...src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v1_0/RestletSingletons.java
Outdated
Show resolved
Hide resolved
...src/main/java/io/opentelemetry/javaagent/instrumentation/restlet/v2_0/RestletSingletons.java
Outdated
Show resolved
Hide resolved
| @@ -20,6 +20,8 @@ muzzle { | |||
| val versions: Map<String, String> by project | |||
|
|
|||
| dependencies { | |||
| bootstrap(project(":instrumentation:servlet:servlet-common:bootstrap")) | |||
There was a problem hiding this comment.
it's nice to see/understand these dependencies better now
RashmiRam
pushed a commit
to RashmiRam/opentelemetry-auto-instr-java
that referenced
this pull request
May 23, 2022
…ry#4824) * Move ServletContextPath to servlet-common:bootstrap * fix tests * Simplify ServletContextPath calls in restlet instrumentation
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.
Resolves #4317
Changes include:
jaxws"library" instrumentations (which weren't real library instrumentations) were removed and their code moved into their respective javaagent modulejsf-common:librarytojsf-common:javaagentServletContextPathanymore (there's no servlet library instrumentation so it makes no sense to use it there anyway)instrumentation-apistill containsServerSpanNaming, but this particular class should perhaps be refactored into a generalhttp.routeutility in #442