Update tests. Forgot to add matching checks in other client

Author: ericapisani

sentry_sdk/integrations/httpx.py

@@ -74,8 +74,10 @@ def send(self: "Client", request: "Request", **kwargs: "Any") -> "Response":
 
                 if parsed_url is not None:
                     attributes["url.full"] = parsed_url.url
-                    attributes["url.query"] = parsed_url.query
-                    attributes["url.fragment"] = parsed_url.fragment
+                    if parsed_url.query:
+                        attributes["url.query"] = parsed_url.query
+                    if parsed_url.fragment:
+                        attributes["url.fragment"] = parsed_url.fragment
 
                 if should_propagate_trace(client, str(request.url)):
                     for (

tests/integrations/httpx/test_httpx.py

@@ -1,11 +1,9 @@
 import os
-import datetime
 import asyncio
 from unittest import mock
 
 import httpx
 import pytest
-from contextlib import contextmanager
 
 import sentry_sdk
 from sentry_sdk import capture_message, start_transaction
@@ -604,31 +602,19 @@ def test_no_request_source_if_duration_too_short_legacy(
         integrations=[HttpxIntegration()],
         traces_sample_rate=1.0,
         enable_http_request_source=True,
-        http_request_source_threshold_ms=100,
+        # Threshold so high no real request will ever exceed it
+        http_request_source_threshold_ms=9999999,
     )
 
     events = capture_events()
 
     url = "http://example.com/"
 
     with start_transaction(name="test_transaction"):
-
-        @contextmanager
-        def fake_start_span(*args, **kwargs):
-            with sentry_sdk.start_span(*args, **kwargs) as span:
-                pass
-            span.start_timestamp = datetime.datetime(2024, 1, 1, microsecond=0)
-            span.timestamp = datetime.datetime(2024, 1, 1, microsecond=99999)
-            yield span
-
-        with mock.patch(
-            "sentry_sdk.integrations.httpx.legacy_start_span",
-            fake_start_span,
-        ):
-            if asyncio.iscoroutinefunction(httpx_client.get):
-                asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
-            else:
-                httpx_client.get(url)
+        if asyncio.iscoroutinefunction(httpx_client.get):
+            asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
+        else:
+            httpx_client.get(url)
 
     (event,) = events
 
@@ -656,31 +642,19 @@ def test_request_source_if_duration_over_threshold_legacy(
         integrations=[HttpxIntegration()],
         traces_sample_rate=1.0,
         enable_http_request_source=True,
-        http_request_source_threshold_ms=100,
+        # Threshold is low so any request will exceed it
+        http_request_source_threshold_ms=0,
     )
 
     events = capture_events()
 
     url = "http://example.com/"
 
     with start_transaction(name="test_transaction"):
-
-        @contextmanager
-        def fake_start_span(*args, **kwargs):
-            with sentry_sdk.start_span(*args, **kwargs) as span:
-                pass
-            span.start_timestamp = datetime.datetime(2024, 1, 1, microsecond=0)
-            span.timestamp = datetime.datetime(2024, 1, 1, microsecond=100001)
-            yield span
-
-        with mock.patch(
-            "sentry_sdk.integrations.httpx.legacy_start_span",
-            fake_start_span,
-        ):
-            if asyncio.iscoroutinefunction(httpx_client.get):
-                asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
-            else:
-                httpx_client.get(url)
+        if asyncio.iscoroutinefunction(httpx_client.get):
+            asyncio.get_event_loop().run_until_complete(httpx_client.get(url))
+        else:
+            httpx_client.get(url)
 
     (event,) = events