-
Notifications
You must be signed in to change notification settings - Fork 631
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
Fix to run the Auto instrumentation example in the docs #1435
Merged
Merged
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
c8580b2
Merge pull request #1 from open-telemetry/master
dmarar 207502b
Fix to run the auto-instrumentation example successfully
dmarar 144e85c
reverting the changes in ConsoleSpanExporter, setup.cfg
dmarar 18f3375
Merge pull request #2 from open-telemetry/master
dmarar 5db7f6c
Merge pull request #3 from dmarar/master
dmarar ffb7ae3
changes to include a consolespanexporter and consolemetricsexporter a…
dmarar f60c0be
Change as per review comments to replace **kwargs with service_name
dmarar 7af07ba
moving the service_name as the first parameter in the ConsoleSpanExpo…
dmarar 8039aeb
Merge branch 'master' of https://github.com/open-telemetry/openteleme…
dmarar 374bec9
Merge branch 'master' into auto-instru-example-fix
lzchen 88926f5
changes to add the service_name to the exported span
dmarar acd9ad1
Merge branch 'master' into auto-instru-example-fix
lzchen 698b6fb
Merge branch 'master' into auto-instru-example-fix
lzchen 6063a13
pass the service name to the exported span
dmarar a85f9f1
Merge pull request #4 from dmarar/new_test
dmarar 6c47b67
update the setup.cfg to the correct path of ConsoleMetricsExporter
dmarar aa41b03
Merge pull request #5 from dmarar/new_test
dmarar 3b0e945
Merge pull request #6 from open-telemetry/master
dmarar 715c08e
Merge pull request #7 from open-telemetry/master
dmarar 2ed540e
Merge pull request #8 from dmarar/master
dmarar 6619a37
revert the changes to add the service_name to the exported span.
dmarar 62d7ed0
Merge pull request #9 from open-telemetry/master
dmarar 9482378
Merge branch 'master' into auto-instru-example-fix
lzchen 6496413
Merge branch 'master' into auto-instru-example-fix
lzchen 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
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.
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.
@lzchen , this change is not done by me. it comes from the init_tracing code in components.py :
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.
The outputs should be the same for auto-instrumented and manually instrumented. Since you removed
service_name
from appearing in the console export, it shouldn't appear for either example.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.
@lzchen , there was mistake in that output snapshot in previous comment, the service.name was coming irrespective of my change.
The change I made adds an additional "service_name" to the output (please see the output) ( which i removed as per your suggestion)
The code in the init_tracing hasnt been touched by me for any of the changes I did.
My apologies that i realised it very late that output in the previous comment was incorrect.
Please note that "service.name" is not added in the server output if server_instrument.py is run.