Skip to content

[instrumentation/wsgi] fix NonRecordingSpan bug #957

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 6 commits into from
Mar 10, 2022
Merged

[instrumentation/wsgi] fix NonRecordingSpan bug #957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ca49a8
[instrumentation/wsgi] fix NonRecordingSpan bug
Mar 10, 2022
b5f16c8
fix lint
Mar 10, 2022
49ed727
use is_recording
Mar 10, 2022
3aefd4d
fix lint
Mar 10, 2022
8ef96f6
fix lint
Mar 10, 2022
e72a88c
fix lint
Mar 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ion/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ def _create_start_response(span, start_response, response_hook):
@functools.wraps(start_response)
def _start_response(status, response_headers, *args, **kwargs):
add_response_attributes(span, status, response_headers)
if span.kind == trace.SpanKind.SERVER:
if span.is_recording() and span.kind == trace.SpanKind.SERVER:
add_custom_response_headers(span, response_headers)
if response_hook:
response_hook(status, response_headers)
Expand All @@ -336,7 +336,7 @@ def __call__(self, environ, start_response):
context_getter=wsgi_getter,
attributes=collect_request_attributes(environ),
)
if span.kind == trace.SpanKind.SERVER:
if span.is_recording() and span.kind == trace.SpanKind.SERVER:
add_custom_request_headers(span, environ)

if self.request_hook:
Expand Down
23 changes: 23 additions & 0 deletions instrumentation/opentelemetry-instrumentation-wsgi/tests/test_wsgi_middleware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,29 @@ def iterate_response(self, response):
except StopIteration:
break

@mock.patch.dict(
"os.environ",
{
OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST: "Custom-Test-Header-1,Custom-Test-Header-2,Custom-Test-Header-3",
},
)
def test_custom_request_headers_non_recording_span(self):
try:
tracer_provider = trace_api.NoOpTracerProvider()
self.environ.update(
{
"HTTP_CUSTOM_TEST_HEADER_1": "Test Value 2",
"HTTP_CUSTOM_TEST_HEADER_2": "TestValue2,TestValue3",
}
)
app = otel_wsgi.OpenTelemetryMiddleware(
simple_wsgi, tracer_provider=tracer_provider
)
response = app(self.environ, self.start_response)
self.iterate_response(response)
except Exception as exc: # pylint: disable=W0703
self.fail(f"Exception raised with NonRecordingSpan {exc}")

@mock.patch.dict(
"os.environ",
{
Expand Down