opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-07-31 22:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use is_recording flag in jinja, celery, esearch, falcon instrumentations (#1241)

Browse Source
This commit is contained in:
Leighton Chen
2020-10-14 15:07:23 -04:00
committed by alrex
parent 5aef8ac04c
commit c440250a7c
2 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/__init__.py
View File

@ -110,6 +110,7 @@ class ElasticsearchInstrumentor(BaseInstrumentor):
def _wrap_perform_request(tracer, span_name_prefix): def _wrap_perform_request(tracer, span_name_prefix):
# pylint: disable=R0912
def wrapper(wrapped, _, args, kwargs): def wrapper(wrapped, _, args, kwargs):
method = url = None method = url = None
try: try:
@ -125,26 +126,27 @@ def _wrap_perform_request(tracer, span_name_prefix):
params = kwargs.get("params", {}) params = kwargs.get("params", {})
body = kwargs.get("body", None) body = kwargs.get("body", None)
attributes = {
"component": "elasticsearch-py",
"db.type": "elasticsearch",
}
if url:
attributes["elasticsearch.url"] = url
if method:
attributes["elasticsearch.method"] = method
if body:
attributes["db.statement"] = str(body)
if params:
attributes["elasticsearch.params"] = str(params)
with tracer.start_as_current_span( with tracer.start_as_current_span(
op_name, kind=SpanKind.CLIENT, attributes=attributes op_name, kind=SpanKind.CLIENT,
) as span: ) as span:
if span.is_recording():
attributes = {
"component": "elasticsearch-py",
"db.type": "elasticsearch",
}
if url:
attributes["elasticsearch.url"] = url
if method:
attributes["elasticsearch.method"] = method
if body:
attributes["db.statement"] = str(body)
if params:
attributes["elasticsearch.params"] = str(params)
for key, value in attributes.items():
span.set_attribute(key, value)
try: try:
rv = wrapped(*args, **kwargs) rv = wrapped(*args, **kwargs)
if isinstance(rv, dict): if isinstance(rv, dict) and span.is_recording():
for member in _ATTRIBUTES_FROM_RESULT: for member in _ATTRIBUTES_FROM_RESULT:
if member in rv: if member in rv:
span.set_attribute( span.set_attribute(
@ -153,11 +155,12 @@ def _wrap_perform_request(tracer, span_name_prefix):
) )
return rv return rv
except Exception as ex: # pylint: disable=broad-except except Exception as ex: # pylint: disable=broad-except
if isinstance(ex, elasticsearch.exceptions.NotFoundError): if span.is_recording():
status = StatusCanonicalCode.NOT_FOUND if isinstance(ex, elasticsearch.exceptions.NotFoundError):
else: status = StatusCanonicalCode.NOT_FOUND
status = StatusCanonicalCode.UNKNOWN else:
span.set_status(Status(status, str(ex))) status = StatusCanonicalCode.UNKNOWN
span.set_status(Status(status, str(ex)))
raise ex raise ex
return wrapper return wrapper

18
instrumentation/opentelemetry-instrumentation-elasticsearch/tests/test_elasticsearch.py
View File

@ -88,6 +88,24 @@ class TestElasticsearchIntegration(TestBase):
spans_list = self.get_ordered_finished_spans() spans_list = self.get_ordered_finished_spans()
self.assertEqual(len(spans_list), 1) self.assertEqual(len(spans_list), 1)
def test_span_not_recording(self, request_mock):
request_mock.return_value = (1, {}, {})
mock_tracer = mock.Mock()
mock_span = mock.Mock()
mock_span.is_recording.return_value = False
mock_tracer.start_span.return_value = mock_span
mock_tracer.use_span.return_value.__enter__ = mock_span
mock_tracer.use_span.return_value.__exit__ = mock_span
with mock.patch("opentelemetry.trace.get_tracer") as tracer:
tracer.return_value = mock_tracer
Elasticsearch()
self.assertFalse(mock_span.is_recording())
self.assertTrue(mock_span.is_recording.called)
self.assertFalse(mock_span.set_attribute.called)
self.assertFalse(mock_span.set_status.called)
ElasticsearchInstrumentor().uninstrument()
def test_prefix_arg(self, request_mock): def test_prefix_arg(self, request_mock):
prefix = "prefix-from-env" prefix = "prefix-from-env"
ElasticsearchInstrumentor().uninstrument() ElasticsearchInstrumentor().uninstrument()