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

Converted TextMap propagator getter to a class and added keys method (#1196) 

Co-authored-by: alrex <aboten@lightstep.com>
This commit is contained in:
Prajilesh N 2020-11-02 09:42:47 +05:30 committed by GitHub
parent c158505157
commit c8de3547ef
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py
View File

@ -29,23 +29,33 @@ from asgiref.compatibility import guarantee_single_callable
from opentelemetry import context, propagators, trace from opentelemetry import context, propagators, trace
from opentelemetry.instrumentation.asgi.version import __version__ # noqa from opentelemetry.instrumentation.asgi.version import __version__ # noqa
from opentelemetry.instrumentation.utils import http_status_to_status_code from opentelemetry.instrumentation.utils import http_status_to_status_code
from opentelemetry.trace.propagation.textmap import DictGetter
from opentelemetry.trace.status import Status, StatusCode from opentelemetry.trace.status import Status, StatusCode
def get_header_from_scope(scope: dict, header_name: str) -> typing.List[str]: class CarrierGetter(DictGetter):
"""Retrieve a HTTP header value from the ASGI scope. def get(self, carrier: dict, key: str) -> typing.List[str]:
"""Getter implementation to retrieve a HTTP header value from the ASGI
scope.
Args:
carrier: ASGI scope object
key: header name in scope
Returns: Returns:
A list with a single string with the header value if it exists, else an empty list. A list with a single string with the header value if it exists,
else an empty list.
""" """
headers = scope.get("headers") headers = carrier.get("headers")
return [ return [
value.decode("utf8") _value.decode("utf8")
for (key, value) in headers for (_key, _value) in headers
if key.decode("utf8") == header_name if _key.decode("utf8") == key
] ]
carrier_getter = CarrierGetter()
def collect_request_attributes(scope): def collect_request_attributes(scope):
"""Collects HTTP request attributes from the ASGI scope and returns a """Collects HTTP request attributes from the ASGI scope and returns a
dictionary to be used as span creation attributes.""" dictionary to be used as span creation attributes."""
@ -72,10 +82,10 @@ def collect_request_attributes(scope):
http_method = scope.get("method") http_method = scope.get("method")
if http_method: if http_method:
result["http.method"] = http_method result["http.method"] = http_method
http_host_value = ",".join(get_header_from_scope(scope, "host")) http_host_value = ",".join(carrier_getter.get(scope, "host"))
if http_host_value: if http_host_value:
result["http.server_name"] = http_host_value result["http.server_name"] = http_host_value
http_user_agent = get_header_from_scope(scope, "user-agent") http_user_agent = carrier_getter.get(scope, "user-agent")
if len(http_user_agent) > 0: if len(http_user_agent) > 0:
result["http.user_agent"] = http_user_agent[0] result["http.user_agent"] = http_user_agent[0]
@ -154,9 +164,7 @@ class OpenTelemetryMiddleware:
if scope["type"] not in ("http", "websocket"): if scope["type"] not in ("http", "websocket"):
return await self.app(scope, receive, send) return await self.app(scope, receive, send)
token = context.attach( token = context.attach(propagators.extract(carrier_getter, scope))
propagators.extract(get_header_from_scope, scope)
)
span_name, additional_attributes = self.span_details_callback(scope) span_name, additional_attributes = self.span_details_callback(scope)
try: try: