fix: prevent duplicate spans

Author: servusdei2018

sentry_sdk/integrations/pyreqwest.py

@@ -22,8 +22,6 @@
     from pyreqwest.client import ClientBuilder, SyncClientBuilder  # type: ignore[import-not-found]
     from pyreqwest.request import (  # type: ignore[import-not-found]
         Request,
-        RequestBuilder,
-        SyncRequestBuilder,
         OneOffRequestBuilder,
         SyncOneOffRequestBuilder,
     )
@@ -47,11 +45,7 @@ def _patch_pyreqwest() -> None:
     _patch_builder_method(ClientBuilder, "build", sentry_async_middleware)
     _patch_builder_method(SyncClientBuilder, "build", sentry_sync_middleware)
 
-    # Patch Request Builders (for simple requests and manual request building)
-    _patch_builder_method(RequestBuilder, "build", sentry_async_middleware)
-    _patch_builder_method(RequestBuilder, "build_streamed", sentry_async_middleware)
-    _patch_builder_method(SyncRequestBuilder, "build", sentry_sync_middleware)
-    _patch_builder_method(SyncRequestBuilder, "build_streamed", sentry_sync_middleware)
+    # Patch Request Builders
     _patch_builder_method(OneOffRequestBuilder, "send", sentry_async_middleware)
     _patch_builder_method(SyncOneOffRequestBuilder, "send", sentry_sync_middleware)
 

tests/integrations/pyreqwest/test_pyreqwest.py

@@ -65,6 +65,7 @@ def test_sync_client_spans(sentry_init, capture_events, server_port):
         assert response.status == 200
 
     (event,) = events
+    assert len(event["spans"]) == 1
     span = event["spans"][0]
     assert span["op"] == "http.client"
     assert span["description"] == f"GET {url}"
@@ -85,6 +86,7 @@ async def test_async_client_spans(sentry_init, capture_events, server_port):
             assert response.status == 200
 
     (event,) = events
+    assert len(event["spans"]) == 1
     span = event["spans"][0]
     assert span["op"] == "http.client"
     assert span["description"] == f"GET {url}"
@@ -103,6 +105,7 @@ def test_sync_simple_request_spans(sentry_init, capture_events, server_port):
         assert response.status == 200
 
     (event,) = events
+    assert len(event["spans"]) == 1
     span = event["spans"][0]
     assert span["op"] == "http.client"
     assert span["description"] == f"GET {url}"
@@ -119,6 +122,7 @@ async def test_async_simple_request_spans(sentry_init, capture_events, server_po
         assert response.status == 200
 
     (event,) = events
+    assert len(event["spans"]) == 1
     span = event["spans"][0]
     assert span["op"] == "http.client"
     assert span["description"] == f"GET {url}"