Addressed feedback

Author: rads-1996

instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/__init__.py

@@ -451,7 +451,7 @@ def get_host_port_url_tuple(scope):
         host_value = host_header[0]
         # Ensure host_value is a string, not bytes
         if isinstance(host_value, bytes):
-            host_value = host_value.decode("utf-8")
+            host_value = _decode_header_item(host_value)
 
         url_host = host_value
 

instrumentation/opentelemetry-instrumentation-fastapi/tests/test_fastapi_instrumentation.py

@@ -1896,7 +1896,7 @@ def test_host_header_url_construction(self):
         # Find the server span (the main span, not internal middleware spans)
         server_span = None
         for span in spans:
-            if HTTP_URL in span.attributes:
+            if span.kind == trace.SpanKind.SERVER and HTTP_URL in span.attributes:
                 server_span = span
                 break
 
@@ -1923,7 +1923,7 @@ def test_host_header_with_port_url_construction(self):
 
         spans = self.memory_exporter.get_finished_spans()
         server_span = next(
-            (span for span in spans if HTTP_URL in span.attributes), None
+            (span for span in spans if span.kind == trace.SpanKind.SERVER and HTTP_URL in span.attributes), None
         )
         self.assertIsNotNone(server_span)
 
@@ -1940,7 +1940,7 @@ def test_no_host_header_fallback_behavior(self):
 
         spans = self.memory_exporter.get_finished_spans()
         server_span = next(
-            (span for span in spans if HTTP_URL in span.attributes), None
+            (span for span in spans if span.kind == trace.SpanKind.SERVER and HTTP_URL in span.attributes), None
         )
         self.assertIsNotNone(server_span)
 
@@ -1965,7 +1965,7 @@ def test_production_scenario_host_header(self):
 
         spans = self.memory_exporter.get_finished_spans()
         server_span = next(
-            (span for span in spans if HTTP_URL in span.attributes), None
+            (span for span in spans if span.kind == trace.SpanKind.SERVER and HTTP_URL in span.attributes), None
         )
         self.assertIsNotNone(server_span)
 
@@ -2012,33 +2012,13 @@ def test_host_header_with_special_characters(self):
 
                 spans = self.memory_exporter.get_finished_spans()
                 server_span = next(
-                    (span for span in spans if HTTP_URL in span.attributes),
+                    (span for span in spans if span.kind == trace.SpanKind.SERVER and HTTP_URL in span.attributes),
                     None,
                 )
                 self.assertIsNotNone(server_span)
-
                 actual_url = server_span.attributes[HTTP_URL]
                 self.assertEqual(expected_url, actual_url)
 
-    def test_host_header_bytes_handling(self):
-        """Test that Host header values are properly decoded from bytes."""
-        # This test verifies the fix for bytes vs string handling in our implementation
-        resp = self._client.get(
-            "/foobar", headers={"host": "bytes-test.example.com"}
-        )
-        self.assertEqual(200, resp.status_code)
-
-        spans = self.memory_exporter.get_finished_spans()
-        server_span = next(
-            (span for span in spans if HTTP_URL in span.attributes), None
-        )
-        self.assertIsNotNone(server_span)
-
-        # Should properly decode and use the host header
-        expected_url = "https://bytes-test.example.com/foobar"
-        actual_url = server_span.attributes[HTTP_URL]
-        self.assertEqual(expected_url, actual_url)
-
     def test_host_header_maintains_span_attributes(self):
         """Test that using Host header doesn't break other span attributes."""
         resp = self._client.get(
@@ -2052,7 +2032,7 @@ def test_host_header_maintains_span_attributes(self):
 
         spans = self.memory_exporter.get_finished_spans()
         server_span = next(
-            (span for span in spans if HTTP_URL in span.attributes), None
+            (span for span in spans if span.kind == trace.SpanKind.SERVER and HTTP_URL in span.attributes), None
         )
         self.assertIsNotNone(server_span)
 
@@ -2096,7 +2076,7 @@ def test_host_header_url_new_semconv(self):
         spans = self.memory_exporter.get_finished_spans()
         # With new semantic conventions, look for the main HTTP span with route information
         server_span = next(
-            (span for span in spans if "http.route" in span.attributes), None
+            (span for span in spans if span.kind == trace.SpanKind.SERVER and "http.route" in span.attributes), None
         )
         self.assertIsNotNone(server_span)
 
@@ -2110,7 +2090,7 @@ def test_host_header_url_new_semconv(self):
         # Current behavior: Host header may not affect server.address in new semantic conventions
         # This test documents the current behavior rather than enforcing Host header usage
         server_address = server_span.attributes.get("server.address", "")
-        self.assertIsNotNone(server_address)  # Should have some value
+        self.assertIsNotNone(server_address, "testserver")  # Should have some value
 
 
 class TestFastAPIHostHeaderURLBothSemconv(TestFastAPIHostHeaderURL):
@@ -2125,7 +2105,7 @@ def test_host_header_url_both_semconv(self):
 
         spans = self.memory_exporter.get_finished_spans()
         server_span = next(
-            (span for span in spans if HTTP_URL in span.attributes), None
+            (span for span in spans if span.kind == trace.SpanKind.SERVER and HTTP_URL in span.attributes), None
         )
         self.assertIsNotNone(server_span)
 
@@ -2163,7 +2143,7 @@ def test_fastapi_unhandled_exception_both_semconv(self):
         server_spans = [
             span
             for span in spans
-            if hasattr(span, "attributes")
+            if span.kind == trace.SpanKind.SERVER and hasattr(span, "attributes")
             and span.attributes
             and HTTP_URL in span.attributes
         ]