Skip to content

opentelemetry-instrumentation-asgi: always set status code on duration attributes #2627

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jul 12, 2024
Merged

opentelemetry-instrumentation-asgi: always set status code on duration attributes #2627

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8138988
always set status code on duration_attrs
danielhochman Jun 20, 2024
f391a9d
update tests
danielhochman Jun 20, 2024
1abb600
lint
danielhochman Jun 20, 2024
49ed834
CHANGELOG
danielhochman Jun 20, 2024
6c65c4a
Merge branch 'main' of github.com:open-telemetry/opentelemetry-python…
danielhochman Jun 24, 2024
2f24e08
lint fixes
danielhochman Jun 25, 2024
9f34e8f
refactor for clarity
danielhochman Jun 28, 2024
392a03b
Merge branch 'main' into middleware-always-set-status-code-on-duratio…
lzchen Jul 2, 2024
fd7f9c4
Merge branch 'main' into middleware-always-set-status-code-on-duratio…
lzchen Jul 3, 2024
95c008f
Update CHANGELOG.md
lzchen Jul 3, 2024
a1a7250
Update __init__.py
lzchen Jul 3, 2024
02ba4f9
Update __init__.py
lzchen Jul 11, 2024
28814fd
Update __init__.py
lzchen Jul 11, 2024
c75e732
Update is_recording for set_status
lzchen Jul 11, 2024
06fffb1
Update _semconv.py
lzchen Jul 11, 2024
e4eedab
Update _semconv.py
lzchen Jul 11, 2024
75544b2
test
lzchen Jul 11, 2024
d781e36
Merge branch 'main' into middleware-always-set-status-code-on-duratio…
lzchen Jul 11, 2024
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
Prev Previous commit
Next Next commit
Update is_recording for set_status
  • Loading branch information
@lzchen
lzchen authored Jul 11, 2024
commit c75e732ac435354c2e1f24d8c98e99a8d4fa8c97
12 changes: 8 additions & 4 deletions opentelemetry-instrumentation/src/opentelemetry/instrumentation/_semconv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@ def _set_status(
):
if status_code < 0:
if _report_new(sem_conv_opt_in_mode):
span.set_attribute(ERROR_TYPE, status_code_str)
if span.is_recording():
span.set_attribute(ERROR_TYPE, status_code_str)
metrics_attributes[ERROR_TYPE] = status_code_str

span.set_status(
Expand All @@ -369,13 +370,16 @@ def _set_status(
status = http_status_to_status_code(status_code, server_span=True)

if _report_old(sem_conv_opt_in_mode):
span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
if span.is_recording():
span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
metrics_attributes[SpanAttributes.HTTP_STATUS_CODE] = status_code
if _report_new(sem_conv_opt_in_mode):
span.set_attribute(HTTP_RESPONSE_STATUS_CODE, status_code)
if span.is_recording():
span.set_attribute(HTTP_RESPONSE_STATUS_CODE, status_code)
metrics_attributes[HTTP_RESPONSE_STATUS_CODE] = status_code
if status == StatusCode.ERROR:
span.set_attribute(ERROR_TYPE, status_code_str)
if span.is_recording():
span.set_attribute(ERROR_TYPE, status_code_str)
metrics_attributes[ERROR_TYPE] = status_code_str
span.set_status(Status(status))

Expand Down
Loading