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

Record exception on context manager exit (#1162)

Browse Source
This commit is contained in:
Owais Lone
2020-10-07 10:22:40 +05:30
committed by alrex
parent 30557ac077
commit c34e53413a
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py
View File

@ -50,7 +50,11 @@ from opentelemetry.instrumentation.metric import (
from opentelemetry.instrumentation.requests.version import __version__ from opentelemetry.instrumentation.requests.version import __version__
from opentelemetry.instrumentation.utils import http_status_to_canonical_code from opentelemetry.instrumentation.utils import http_status_to_canonical_code
from opentelemetry.trace import SpanKind, get_tracer from opentelemetry.trace import SpanKind, get_tracer
from opentelemetry.trace.status import Status, StatusCanonicalCode from opentelemetry.trace.status import (
EXCEPTION_STATUS_FIELD,
Status,
StatusCanonicalCode,
)
# A key to a context variable to avoid creating duplicate spans when instrumenting # A key to a context variable to avoid creating duplicate spans when instrumenting
# both, Session.request and Session.send, since Session.request calls into Session.send # both, Session.request and Session.send, since Session.request calls into Session.send
@ -121,8 +125,6 @@ def _instrument(tracer_provider=None, span_callback=None):
method = method.upper() method = method.upper()
span_name = "HTTP {}".format(method) span_name = "HTTP {}".format(method)
exception = None
recorder = RequestsInstrumentor().metric_recorder recorder = RequestsInstrumentor().metric_recorder
labels = {} labels = {}
@ -132,6 +134,7 @@ def _instrument(tracer_provider=None, span_callback=None):
with get_tracer( with get_tracer(
__name__, __version__, tracer_provider __name__, __version__, tracer_provider
).start_as_current_span(span_name, kind=SpanKind.CLIENT) as span: ).start_as_current_span(span_name, kind=SpanKind.CLIENT) as span:
exception = None
with recorder.record_duration(labels): with recorder.record_duration(labels):
if span.is_recording(): if span.is_recording():
span.set_attribute("component", "http") span.set_attribute("component", "http")
@ -150,16 +153,15 @@ def _instrument(tracer_provider=None, span_callback=None):
result = call_wrapped() # *** PROCEED result = call_wrapped() # *** PROCEED
except Exception as exc: # pylint: disable=W0703 except Exception as exc: # pylint: disable=W0703
exception = exc exception = exc
setattr(
exception,
EXCEPTION_STATUS_FIELD,
_exception_to_canonical_code(exception),
)
result = getattr(exc, "response", None) result = getattr(exc, "response", None)
finally: finally:
context.detach(token) context.detach(token)
if exception is not None and span.is_recording():
span.set_status(
Status(_exception_to_canonical_code(exception))
)
span.record_exception(exception)
if result is not None: if result is not None:
if span.is_recording(): if span.is_recording():
span.set_attribute( span.set_attribute(