Fix status related tests again

Author: sl0thentr0py

tests/integrations/opentelemetry/test_propagator.py

@@ -1,6 +1,5 @@
 import pytest
 
-from unittest import mock
 from unittest.mock import MagicMock
 
 from opentelemetry.trace.propagation import get_current_span
@@ -12,8 +11,6 @@
     SENTRY_TRACE_KEY,
 )
 from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
-from sentry_sdk.integrations.opentelemetry.span_processor import SentrySpanProcessor
-from sentry_sdk.tracing_utils import Baggage
 
 
 @pytest.mark.forked
@@ -23,7 +20,7 @@ def test_extract_no_context_no_sentry_trace_header():
     Extract should return empty context.
     """
     carrier = None
-    context = None
+    context = {}
     getter = MagicMock()
     getter.get.return_value = None
 
@@ -144,8 +141,8 @@ def test_inject_continue_trace(sentry_init, SortedBaggage):
     with sentry_sdk.continue_trace(incoming_headers):
         with sentry_sdk.start_span(name="foo") as span:
             SentryPropagator().inject(carrier, setter=setter)
-            assert(carrier["sentry-trace"]) == f"{trace_id}-{span.span_id}-1"
-            assert(carrier["baggage"]) == SortedBaggage(baggage)
+            assert (carrier["sentry-trace"]) == f"{trace_id}-{span.span_id}-1"
+            assert (carrier["baggage"]) == SortedBaggage(baggage)
 
 
 def test_inject_head_sdk(sentry_init, SortedBaggage):
@@ -156,7 +153,7 @@ def test_inject_head_sdk(sentry_init, SortedBaggage):
 
     with sentry_sdk.start_span(name="foo") as span:
         SentryPropagator().inject(carrier, setter=setter)
-        assert(carrier["sentry-trace"]) == f"{span.trace_id}-{span.span_id}-1"
-        assert(carrier["baggage"]) == SortedBaggage(
+        assert (carrier["sentry-trace"]) == f"{span.trace_id}-{span.span_id}-1"
+        assert (carrier["baggage"]) == SortedBaggage(
             f"sentry-transaction=foo,sentry-release=release,sentry-environment=production,sentry-trace_id={span.trace_id},sentry-sample_rate=1.0,sentry-sampled=true"
         )

tests/test_api.py

@@ -91,8 +91,8 @@ def test_baggage_with_tracing_disabled(sentry_init, SortedBaggage):
 @pytest.mark.forked
 def test_baggage_with_tracing_enabled(sentry_init, SortedBaggage):
     sentry_init(traces_sample_rate=1.0, release="1.0.0", environment="dev")
-    with start_span() as span:
-        expected_baggage = "sentry-trace_id={},sentry-environment=dev,sentry-release=1.0.0,sentry-sample_rate=1.0,sentry-sampled={}".format(
+    with start_span(name="foo") as span:
+        expected_baggage = "sentry-transaction=foo,sentry-trace_id={},sentry-environment=dev,sentry-release=1.0.0,sentry-sample_rate=1.0,sentry-sampled={}".format(
             span.trace_id, "true" if span.sampled else "false"
         )
         assert get_baggage() == SortedBaggage(expected_baggage)

tests/tracing/test_integration_tests.py

@@ -39,7 +39,7 @@ def test_basic(sentry_init, capture_events, sample_rate):
         assert span1["status"] == "internal_error"
         assert span1["op"] == "foo"
         assert span1["description"] == "foodesc"
-        assert "status" not in span2.get("tags", {})
+        assert span2["tags"]["status"] == "ok"
         assert span2["op"] == "bar"
         assert span2["description"] == "bardesc"
         assert parent_span["transaction"] == "hi"