-
Notifications
You must be signed in to change notification settings - Fork 626
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
Audit and test opentelemetry-instrumentation-elasticsearch NoOpTracer… #1616
Merged
srikanthccv
merged 11 commits into
open-telemetry:main
from
Akochavi:audit-and-test-opentelemetry-instrumentation-elasticsearch-no-op-tracer
Feb 18, 2023
Merged
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
6aee863
Audit and test opentelemetry-instrumentation-elasticsearch NoOpTracer…
Akochavi 4be4c43
Merge branch 'main' into audit-and-test-opentelemetry-instrumentation…
Akochavi 0a0abe9
wip
Akochavi 0723c69
wip
Akochavi 37578e9
wip
Akochavi c0d98dc
wip
Akochavi c0e3774
wip
Akochavi 34475e1
Merge branch 'main' into audit-and-test-opentelemetry-instrumentation…
Akochavi ae5587b
Merge branch 'main' into audit-and-test-opentelemetry-instrumentation…
shalevr 207b43f
Merge branch 'main' into audit-and-test-opentelemetry-instrumentation…
shalevr 1b59b6c
Merge branch 'main' into audit-and-test-opentelemetry-instrumentation…
srikanthccv 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,6 +24,7 @@ | |
|
||
import opentelemetry.instrumentation.elasticsearch | ||
from opentelemetry import trace | ||
from opentelemetry import trace as trace_api | ||
from opentelemetry.instrumentation.elasticsearch import ( | ||
ElasticsearchInstrumentor, | ||
) | ||
|
@@ -412,3 +413,20 @@ def response_hook(span, response): | |
json.dumps(response_payload), | ||
spans[0].attributes[response_attribute_name], | ||
) | ||
|
||
def test_no_op_tracer_provider(self, request_mock): | ||
ElasticsearchInstrumentor().uninstrument() | ||
ElasticsearchInstrumentor().instrument( | ||
tracer_provider=trace_api.NoOpTracerProvider() | ||
) | ||
|
||
request_mock.return_value = ( | ||
1, | ||
{}, | ||
'{"found": false, "timed_out": true, "took": 7}', | ||
) | ||
es = Elasticsearch() | ||
es.get(index="test-index", doc_type="_doc", id=1) | ||
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. I suggest validating es.get response value -> so we'll know for sure that no spans were created due to NoOpTracerProvider |
||
|
||
spans_list = self.get_finished_spans() | ||
self.assertEqual(len(spans_list), 0) |
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.
trace already imported in the upper line
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.
Done