Merge branch 'potel-base' into potel-base-run-all-tests

Author: sl0thentr0py

tests/conftest.py

@@ -660,16 +660,12 @@ def __ne__(self, other):
         return not self.__eq__(other)
 
 
-@pytest.fixture(name="SortedBaggage")
-def sorted_baggage_matcher():
-    class SortedBaggage:
-        def __init__(self, baggage):
-            self.baggage = baggage
+class SortedBaggage:
+    def __init__(self, baggage):
+        self.baggage = baggage
 
-        def __eq__(self, other):
-            return sorted(self.baggage.split(",")) == sorted(other.split(","))
-
-        def __ne__(self, other):
-            return not self.__eq__(other)
+    def __eq__(self, other):
+        return sorted(self.baggage.split(",")) == sorted(other.split(","))
 
-    return SortedBaggage
+    def __ne__(self, other):
+        return not self.__eq__(other)

tests/integrations/httpx/test_httpx.py

@@ -9,7 +9,7 @@
 from sentry_sdk import capture_message, start_span
 from sentry_sdk.consts import MATCH_ALL, SPANDATA
 from sentry_sdk.integrations.httpx import HttpxIntegration
-from tests.conftest import ApproxDict
+from tests.conftest import ApproxDict, SortedBaggage
 
 
 @pytest.mark.parametrize(
@@ -75,7 +75,7 @@ def test_outgoing_trace_headers(sentry_init, httpx_client, capture_envelopes):
     with start_span(
         name="/interactions/other-dogs/new-dog",
         op="greeting.sniff",
-    ) as span:
+    ):
         if asyncio.iscoroutinefunction(httpx_client.get):
             response = asyncio.get_event_loop().run_until_complete(
                 httpx_client.get(url)
@@ -104,7 +104,6 @@ def test_outgoing_trace_headers_append_to_baggage(
     sentry_init,
     httpx_client,
     capture_envelopes,
-    SortedBaggage,  # noqa: N803
 ):
     sentry_init(
         traces_sample_rate=1.0,
@@ -141,7 +140,7 @@ def test_outgoing_trace_headers_append_to_baggage(
         sampled=1,
     )
     assert response.request.headers["baggage"] == SortedBaggage(
-        f"custom=data,sentry-trace_id={trace_id},sentry-environment=production,sentry-release=d08ebdb9309e1b004c6f52202de58a09c2268e42,sentry-transaction=/interactions/other-dogs/new-dog,sentry-sample_rate=1.0,sentry-sampled=true"
+        f"custom=data,sentry-trace_id={trace_id},sentry-environment=production,sentry-release=d08ebdb9309e1b004c6f52202de58a09c2268e42,sentry-transaction=/interactions/other-dogs/new-dog,sentry-sample_rate=1.0,sentry-sampled=true"  # noqa: E231
     )
 
 

tests/integrations/opentelemetry/test_propagator.py

@@ -11,6 +11,7 @@
     SENTRY_TRACE_KEY,
 )
 from sentry_sdk.integrations.opentelemetry.propagator import SentryPropagator
+from tests.conftest import SortedBaggage
 
 
 @pytest.mark.forked
@@ -116,7 +117,7 @@ def test_extract_context_sentry_trace_header_baggage():
     assert span_context.trace_id == int("1234567890abcdef1234567890abcdef", 16)
 
 
-def test_inject_continue_trace(sentry_init, SortedBaggage):
+def test_inject_continue_trace(sentry_init):
     sentry_init(traces_sample_rate=1.0)
 
     carrier = {}
@@ -145,7 +146,7 @@ def test_inject_continue_trace(sentry_init, SortedBaggage):
             assert (carrier["baggage"]) == SortedBaggage(baggage)
 
 
-def test_inject_head_sdk(sentry_init, SortedBaggage):
+def test_inject_head_sdk(sentry_init):
     sentry_init(traces_sample_rate=1.0, release="release")
 
     carrier = {}
@@ -155,5 +156,5 @@ def test_inject_head_sdk(sentry_init, SortedBaggage):
         SentryPropagator().inject(carrier, setter=setter)
         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"
+            f"sentry-transaction=foo,sentry-release=release,sentry-environment=production,sentry-trace_id={span.trace_id},sentry-sample_rate=1.0,sentry-sampled=true"  # noqa: E231
         )

tests/integrations/rq/test_rq.py

@@ -150,7 +150,7 @@ def test_error_has_trace_context_if_tracing_disabled(
     assert error_event["contexts"]["trace"]
 
 
-def test_tracing_enabled(sentry_init, capture_events, DictionaryContaining):
+def test_tracing_enabled(sentry_init, capture_events, DictionaryContaining):  # noqa: N803
     sentry_init(integrations=[RqIntegration()], traces_sample_rate=1.0)
     events = capture_events()
 

tests/integrations/rust_tracing/test_rust_tracing.py

@@ -121,7 +121,6 @@ def test_nested_on_new_span_on_close(sentry_init, capture_events):
 
         rust_tracing.new_span(RustTracingLevel.Info, 3, index_arg=10)
         sentry_first_rust_span = sentry_sdk.get_current_span()
-        rust_first_rust_span = rust_tracing.spans[3]
 
         # Use a different `index_arg` value for the inner span to help
         # distinguish the two at the end of the test

tests/integrations/stdlib/test_httplib.py

@@ -8,10 +8,9 @@
 
 from sentry_sdk import capture_message, start_span, continue_trace, isolation_scope
 from sentry_sdk.consts import MATCH_ALL, SPANDATA
-from sentry_sdk.tracing import Transaction
 from sentry_sdk.integrations.stdlib import StdlibIntegration
 
-from tests.conftest import ApproxDict, create_mock_http_server
+from tests.conftest import ApproxDict, SortedBaggage, create_mock_http_server
 
 PORT = create_mock_http_server()
 
@@ -157,7 +156,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
 
 
 def test_outgoing_trace_headers(
-    sentry_init, capture_envelopes, capture_request_headers, SortedBaggage
+    sentry_init, capture_envelopes, capture_request_headers
 ):
     sentry_init(traces_sample_rate=1.0)
     envelopes = capture_envelopes()
@@ -202,7 +201,7 @@ def test_outgoing_trace_headers(
 
 
 def test_outgoing_trace_headers_head_sdk(
-    sentry_init, monkeypatch, capture_request_headers, capture_envelopes, SortedBaggage
+    sentry_init, monkeypatch, capture_request_headers, capture_envelopes
 ):
     # make sure transaction is always sampled
     monkeypatch.setattr(random, "random", lambda: 0.1)
@@ -230,7 +229,7 @@ def test_outgoing_trace_headers_head_sdk(
     assert request_headers["sentry-trace"] == expected_sentry_trace
 
     expected_outgoing_baggage = (
-        f"sentry-trace_id={root_span.trace_id},"
+        f"sentry-trace_id={root_span.trace_id},"  # noqa: E231
         "sentry-environment=production,"
         "sentry-release=foo,"
         "sentry-sample_rate=0.5,"
@@ -372,4 +371,4 @@ def test_http_timeout(monkeypatch, sentry_init, capture_envelopes):
 
     span = transaction["spans"][0]
     assert span["op"] == "http.client"
-    assert span["description"] == f"GET http://localhost:{PORT}/top-chasers"
+    assert span["description"] == f"GET http://localhost:{PORT}/top-chasers"  # noqa: E231

tests/test_api.py

@@ -17,6 +17,7 @@
 )
 
 from sentry_sdk.client import Client, NonRecordingClient
+from tests.conftest import SortedBaggage
 
 
 @pytest.mark.forked
@@ -77,7 +78,7 @@ def test_traceparent_with_tracing_disabled(sentry_init):
 
 
 @pytest.mark.forked
-def test_baggage_with_tracing_disabled(sentry_init, SortedBaggage):
+def test_baggage_with_tracing_disabled(sentry_init):
     sentry_init(release="1.0.0", environment="dev")
     propagation_context = get_isolation_scope()._propagation_context
     expected_baggage = (
@@ -89,7 +90,7 @@ def test_baggage_with_tracing_disabled(sentry_init, SortedBaggage):
 
 
 @pytest.mark.forked
-def test_baggage_with_tracing_enabled(sentry_init, SortedBaggage):
+def test_baggage_with_tracing_enabled(sentry_init):
     sentry_init(traces_sample_rate=1.0, release="1.0.0", environment="dev")
     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(

tests/tracing/test_integration_tests.py

@@ -10,6 +10,7 @@
 )
 from sentry_sdk.consts import SPANSTATUS
 from sentry_sdk.transport import Transport
+from tests.conftest import SortedBaggage
 
 
 @pytest.mark.parametrize("sample_rate", [0.0, 1.0])
@@ -51,7 +52,7 @@ def test_basic(sentry_init, capture_events, sample_rate):
 
 @pytest.mark.parametrize("sample_rate", [0.0, 1.0])
 def test_continue_trace(
-    sentry_init, capture_envelopes, sample_rate, SortedBaggage
+    sentry_init, capture_envelopes, sample_rate
 ):  # noqa:N803
     """
     Ensure data is actually passed along via headers, and that they are read
@@ -137,7 +138,6 @@ def test_dynamic_sampling_head_sdk_creates_dsc(
     capture_envelopes,
     sample_rate,
     monkeypatch,
-    SortedBaggage,  # noqa: N803
 ):
     sentry_init(traces_sample_rate=sample_rate, release="foo")
     envelopes = capture_envelopes()