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

Use is_recording flag in asgi, pyramid, aiohttp instrumentation (#1142)

This commit is contained in:
Leighton Chen 2020-09-22 10:30:39 -07:00 committed by alrex
parent e568eeaa35
commit 847418f397
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,15 +156,16 @@ class OpenTelemetryMiddleware:
propagators.extract(get_header_from_scope, 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)
attributes = collect_request_attributes(scope)
attributes.update(additional_attributes)
try: try:
with self.tracer.start_as_current_span( with self.tracer.start_as_current_span(
span_name + " asgi", span_name + " asgi", kind=trace.SpanKind.SERVER,
kind=trace.SpanKind.SERVER, ) as span:
attributes=attributes, if span.is_recording():
): attributes = collect_request_attributes(scope)
attributes.update(additional_attributes)
for key, value in attributes.items():
span.set_attribute(key, value)
@wraps(receive) @wraps(receive)
async def wrapped_receive(): async def wrapped_receive():
@ -172,9 +173,10 @@ class OpenTelemetryMiddleware:
span_name + " asgi." + scope["type"] + ".receive" span_name + " asgi." + scope["type"] + ".receive"
) as receive_span: ) as receive_span:
message = await receive() message = await receive()
if message["type"] == "websocket.receive": if receive_span.is_recording():
set_status_code(receive_span, 200) if message["type"] == "websocket.receive":
receive_span.set_attribute("type", message["type"]) set_status_code(receive_span, 200)
receive_span.set_attribute("type", message["type"])
return message return message
@wraps(send) @wraps(send)
@ -182,12 +184,13 @@ class OpenTelemetryMiddleware:
with self.tracer.start_as_current_span( with self.tracer.start_as_current_span(
span_name + " asgi." + scope["type"] + ".send" span_name + " asgi." + scope["type"] + ".send"
) as send_span: ) as send_span:
if message["type"] == "http.response.start": if send_span.is_recording():
status_code = message["status"] if message["type"] == "http.response.start":
set_status_code(send_span, status_code) status_code = message["status"]
elif message["type"] == "websocket.send": set_status_code(send_span, status_code)
set_status_code(send_span, 200) elif message["type"] == "websocket.send":
send_span.set_attribute("type", message["type"]) set_status_code(send_span, 200)
send_span.set_attribute("type", message["type"])
await send(message) await send(message)
await self.app(scope, wrapped_receive, wrapped_send) await self.app(scope, wrapped_receive, wrapped_send)

17
instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_middleware.py
View File

@ -164,6 +164,23 @@ class TestAsgiApplication(AsgiTestBase):
outputs = self.get_all_output() outputs = self.get_all_output()
self.validate_outputs(outputs) self.validate_outputs(outputs)
def test_wsgi_not_recording(self):
mock_tracer = mock.Mock()
mock_span = mock.Mock()
mock_span.is_recording.return_value = False
mock_tracer.start_as_current_span.return_value = mock_span
mock_tracer.start_as_current_span.return_value.__enter__ = mock_span
mock_tracer.start_as_current_span.return_value.__exit__ = mock_span
with mock.patch("opentelemetry.trace.get_tracer") as tracer:
tracer.return_value = mock_tracer
app = otel_asgi.OpenTelemetryMiddleware(simple_asgi)
self.seed_app(app)
self.send_default_request()
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)
def test_asgi_exc_info(self): def test_asgi_exc_info(self):
"""Test that exception information is emitted as expected.""" """Test that exception information is emitted as expected."""
app = otel_asgi.OpenTelemetryMiddleware(error_asgi) app = otel_asgi.OpenTelemetryMiddleware(error_asgi)