-
Notifications
You must be signed in to change notification settings - Fork 850
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.
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
Make servlet context path key private #4125
Merged
trask
merged 6 commits into
open-telemetry:main
from
laurit:make-context-path-key-private
Sep 16, 2021
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f89b84c
Make servlet context path key private
laurit 70c683f
remove accidentally added files
laurit a288665
fix servlet2.2
laurit 41a3585
use non capturing lambda
laurit 6bc951e
Update instrumentation/servlet/servlet-common/library/src/main/java/i…
laurit d87ae9a
use method reference
laurit File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,12 +67,8 @@ protected Context customizeContext(Context context, REQUEST request) { | |
return context; | ||
} | ||
|
||
private Context addServletContextPath(Context context, REQUEST request) { | ||
String contextPath = accessor.getRequestContextPath(request); | ||
if (contextPath != null && !contextPath.isEmpty() && !contextPath.equals("/")) { | ||
return context.with(ServletContextPath.CONTEXT_KEY, contextPath); | ||
} | ||
return context; | ||
protected Context addServletContextPath(Context context, REQUEST request) { | ||
return ServletContextPath.init(context, () -> accessor.getRequestContextPath(request)); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can we do non-capturing lambda here similar to #4014? |
||
} | ||
|
||
public Context getServerContext(REQUEST request) { | ||
|
@@ -88,27 +84,13 @@ public void recordException(Context context, Throwable throwable) { | |
AppServerBridge.recordException(context, throwable); | ||
} | ||
|
||
/** | ||
* When server spans are managed by app server instrumentation we need to add context path of | ||
* current request to context if it isn't already added. Servlet instrumentation adds it when it | ||
* starts server span. | ||
*/ | ||
public Context updateContext(Context context, REQUEST request) { | ||
String contextPath = context.get(ServletContextPath.CONTEXT_KEY); | ||
if (contextPath == null) { | ||
context = addServletContextPath(context, request); | ||
} | ||
|
||
return context; | ||
} | ||
|
||
public Context updateContext( | ||
Context context, REQUEST request, MappingResolver mappingResolver, boolean servlet) { | ||
ServerSpanNaming.updateServerSpanName( | ||
context, | ||
servlet ? SERVLET : FILTER, | ||
() -> spanNameProvider.getSpanNameOrNull(mappingResolver, request)); | ||
return updateContext(context, request); | ||
return addServletContextPath(context, request); | ||
} | ||
|
||
/* | ||
|
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need the
ServletContextPath
wrapper object?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using wrapper helps to distinguish context path not yet set from context path empty. I guess I could use
""
to mark empty context path.