Skip to content

Add servlet integrations for request and response dispatch back in.#1165

Merged
tylerbenson merged 3 commits into
masterfrom
tyler/servlet
Jan 13, 2020
Merged

Add servlet integrations for request and response dispatch back in.#1165
tylerbenson merged 3 commits into
masterfrom
tyler/servlet

Conversation

@tylerbenson
Copy link
Copy Markdown
Contributor

This PR adds back instrumentation that was previously reverted and enables some by default that are less likely to change the trace size significantly.

Original PR: #1050
Revert PR: #1085

I also adjusted the instrumentation for servlet forward/include to remove the span from the request so the resource name doesn't get stomped on by subsequent child calls.

…ault.

Change config for Servlet Filter and Service and JDBC DataSource instrumentation so it must be explicitly enabled (won't be enabled by accident if all of servlet is enabled).
@tylerbenson tylerbenson requested a review from a team as a code owner January 10, 2020 21:54
propagate().inject(span, request, SETTER);

// temporarily remove from request to avoid spring resource name bubbling up:
request.removeAttribute(DD_SPAN_ATTRIBUTE);
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change fixed the resource naming issue with the sample hybris application.

servlet-service is off by default, so we can't rely on it being called there.
@tylerbenson tylerbenson added this to the 0.41.0 milestone Jan 13, 2020
@tylerbenson tylerbenson merged commit a52a142 into master Jan 13, 2020
@tylerbenson tylerbenson deleted the tyler/servlet branch January 13, 2020 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants