Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Jetty server span handling #2029

Merged
merged 4 commits into from
Jan 14, 2021
Merged

Jetty server span handling #2029

merged 4 commits into from
Jan 14, 2021

Conversation

laurit
Copy link
Contributor

@laurit laurit commented Jan 12, 2021

  • update server span name from servlet integration as is done on tomcat and other server
  • add exception to server span only once from jetty integration (disable adding exception from servlet integration)

trask
trask approved these changes Jan 14, 2021
View reviewed changes
Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

nice 👍

...entation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/AppServerBridge.java Outdated Show resolved Hide resolved
...entation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/AppServerBridge.java Outdated Show resolved Hide resolved
...entation-api/src/main/java/io/opentelemetry/instrumentation/api/servlet/AppServerBridge.java Show resolved Hide resolved
smoke-tests/src/test/groovy/io/opentelemetry/smoketest/JettySmokeTest.groovy
where:
[appServer, jdk] << getTestParams()
}

Copy link
Member

Choose a reason for hiding this comment

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

test consistency ftw!

@laurit @trask
Update instrumentation-api/src/main/java/io/opentelemetry/instrumenta…
b3e38ff 
…tion/api/servlet/AppServerBridge.java

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
@trask trask merged commit 11ad122 into open-telemetry:master Jan 14, 2021
@laurit laurit deleted the jetty-server-span branch February 4, 2021 20:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mateuszrzeszutek mateuszrzeszutek mateuszrzeszutek approved these changes

@anuraaga anuraaga anuraaga approved these changes

@trask trask trask approved these changes

@iNikem iNikem Awaiting requested review from iNikem

@jkwatson jkwatson Awaiting requested review from jkwatson

@tylerbenson tylerbenson Awaiting requested review from tylerbenson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@laurit @anuraaga @trask @mateuszrzeszutek