fix conflicts with main

Signed-off-by: emdneto <[email protected]>

Author: emdneto

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

@@ -210,7 +210,6 @@ def client_response_hook(span: Span, scope: dict[str, Any], message: dict[str, A
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.metrics import MeterProvider, get_meter
 from opentelemetry.semconv.attributes.http_attributes import HTTP_ROUTE
-from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import TracerProvider, get_tracer
 from opentelemetry.util.http import (
     get_excluded_urls,

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

@@ -263,10 +263,10 @@ def test_fastapi_unhandled_exception(self):
         self.assertEqual(len(spans), 3)
         span = spans[0]
         assert span.name == "GET /error http send"
-        assert span.attributes[SpanAttributes.HTTP_STATUS_CODE] == 500
+        assert span.attributes[HTTP_STATUS_CODE] == 500
         span = spans[2]
         assert span.name == "GET /error"
-        assert span.attributes[SpanAttributes.HTTP_TARGET] == "/error"
+        assert span.attributes[HTTP_TARGET] == "/error"
 
     def test_sub_app_fastapi_call(self):
         """