open-telemetry
/
opentelemetry-python-contrib
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build

This commit is contained in:
Leighton 2020-11-09 10:14:44 -05:00
parent a10e2c68d1
commit dad94d434d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ _SUPPRESS_REQUESTS_INSTRUMENTATION_KEY = "suppress_requests_instrumentation"
# pylint: disable=unused-argument # pylint: disable=unused-argument
# pylint: disable=R0915 # pylint: disable=R0915
def _instrument(tracer_provider=None, span_callback=None, name_callback=get_default_span_name): def _instrument(tracer_provider=None, span_callback=None, name_callback=None):
"""Enables tracing of all requests calls that go through """Enables tracing of all requests calls that go through
:code:`requests.session.Session.request` (this includes :code:`requests.session.Session.request` (this includes
:code:`requests.get`, etc.).""" :code:`requests.get`, etc.)."""
@ -124,7 +124,11 @@ def _instrument(tracer_provider=None, span_callback=None, name_callback=get_defa
# See # See
# https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/http.md#http-client # https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/http.md#http-client
method = method.upper() method = method.upper()
span_name = name_callback(method, url) span_name = ""
if name_callback:
span_name = name_callback()
if not span_name:
span_name = get_default_span_name(method)
recorder = RequestsInstrumentor().metric_recorder recorder = RequestsInstrumentor().metric_recorder
@ -217,10 +221,9 @@ def _uninstrument_from(instr_root, restore_as_bound_func=False):
setattr(instr_root, instr_func_name, original) setattr(instr_root, instr_func_name, original)
# pylint: disable=unused-argument def get_default_span_name(method):
def get_default_span_name(method_name, url):
"""Default implementation for name_callback, returns HTTP {method_name}.""" """Default implementation for name_callback, returns HTTP {method_name}."""
return "HTTP {}".format(method_name).strip() return "HTTP {}".format(method).strip()
class RequestsInstrumentor(BaseInstrumentor, MetricMixin): class RequestsInstrumentor(BaseInstrumentor, MetricMixin):

2
instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py
View File

@ -110,6 +110,7 @@ class RequestsIntegrationTestBase(abc.ABC):
def test_name_callback(self): def test_name_callback(self):
def name_callback(): def name_callback():
return "test_name" return "test_name"
RequestsInstrumentor().uninstrument() RequestsInstrumentor().uninstrument()
RequestsInstrumentor().instrument(name_callback=name_callback) RequestsInstrumentor().instrument(name_callback=name_callback)
result = self.perform_request(self.URL) result = self.perform_request(self.URL)
@ -121,6 +122,7 @@ class RequestsIntegrationTestBase(abc.ABC):
def test_name_callback_default(self): def test_name_callback_default(self):
def name_callback(): def name_callback():
return 123 return 123
RequestsInstrumentor().uninstrument() RequestsInstrumentor().uninstrument()
RequestsInstrumentor().instrument(name_callback=name_callback) RequestsInstrumentor().instrument(name_callback=name_callback)
result = self.perform_request(self.URL) result = self.perform_request(self.URL)