set status

lzchen · Jun 24, 2024 · 67f9282 · 67f9282
1 parent 3239277
commit 67f9282
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 23 deletions.
diff --git a/...ion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py b/...ion/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py
@@ -228,6 +228,7 @@ def client_response_hook(span: Span, scope: dict[str, Any], message: dict[str, A
     _set_http_target,
     _set_http_url,
     _set_http_user_agent,
+    _set_status,
 )
 from opentelemetry.instrumentation.asgi.version import __version__  # noqa
 from opentelemetry.instrumentation.propagators import (
@@ -419,25 +420,31 @@ def get_host_port_url_tuple(scope):
     return server_host, port, http_url
 
 
-def set_status_code(span, status_code):
+def set_status_code(
+    span,
+    status_code,
+    metric_attributes=None,
+    sem_conv_opt_in_mode=_HTTPStabilityMode.DEFAULT,
+):
     """Adds HTTP response attributes to span using the status_code argument."""
     if not span.is_recording():
         return
+    status_code_str = repr(status_code)
+
+    status_code = 0
     try:
         status_code = int(status_code)
     except ValueError:
-        span.set_status(
-            Status(
-                StatusCode.ERROR,
-                "Non-integer HTTP status: " + repr(status_code),
-            )
-        )
-    else:
-        span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
-        span.set_status(
-            Status(http_status_to_status_code(status_code, server_span=True))
-        )
-
+        status_code = -1
+    if metric_attributes is None:
+        metric_attributes = {}
+    _set_status(
+        span,
+        metric_attributes,
+        status_code,
+        status_code_str,
+        sem_conv_opt_in_mode,
+    )
 
 def get_default_span_details(scope: dict) -> Tuple[str, dict]:
     """
@@ -787,18 +794,33 @@ async def otel_send(message: dict[str, Any]):
                 if send_span.is_recording():
                     if message["type"] == "http.response.start":
                         status_code = message["status"]
-                        duration_attrs[SpanAttributes.HTTP_STATUS_CODE] = (
-                            status_code
+                        # We record metrics only once
+                        set_status_code(
+                            server_span,
+                            status_code,
+                            duration_attrs,
+                            self._sem_conv_opt_in_mode,
                         )
-                        duration_attrs[SpanAttributes.HTTP_RESPONSE_STATUS_CODE] = (
-                            status_code
+                        set_status_code(
+                            send_span,
+                            status_code,
+                            None,
+                            self._sem_conv_opt_in_mode,
                         )
-                        set_status_code(server_span, status_code)
-                        set_status_code(send_span, status_code)
                         expecting_trailers = message.get("trailers", False)
                     elif message["type"] == "websocket.send":
-                        set_status_code(server_span, 200)
-                        set_status_code(send_span, 200)
+                        set_status_code(
+                            server_span,
+                            200,
+                            duration_attrs,
+                            self._sem_conv_opt_in_mode,
+                        )
+                        set_status_code(
+                            send_span,
+                            200,
+                            None,
+                            self._sem_conv_opt_in_mode,
+                        )
                     send_span.set_attribute("asgi.event.type", message["type"])
                     if (
                         server_span.is_recording()

diff --git a/...ion/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py b/...ion/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/__init__.py
@@ -494,8 +494,8 @@ def add_response_attributes(
     _set_status(
         span,
         duration_attrs,
-        status_code_str,
         status_code,
+        status_code_str,
         sem_conv_opt_in_mode,
     )
 

diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/_semconv.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/_semconv.py
@@ -354,8 +354,8 @@ def _set_http_flavor_version(result, version, sem_conv_opt_in_mode):
 def _set_status(
     span,
     metrics_attributes,
-    status_code_str,
     status_code,
+    status_code_str,
     sem_conv_opt_in_mode,
 ):
     if status_code < 0: