Merge branch 'master' into fix/openai-choices-none

Author: cla7aye15I4nd

sentry_sdk/_compat.py

@@ -54,7 +54,7 @@ def enabled(option: str) -> bool:
             except Exception:
                 pass
 
-        return value and str(value).lower() not in FALSE_VALUES
+        return value and str(value).lower() not in FALSE_VALUES  # type: ignore[return-value]
 
     # When `threads` is passed in as a uwsgi option,
     # `enable-threads` is implied on.

sentry_sdk/_span_batcher.py

@@ -168,8 +168,8 @@ def _to_transport_format(item: "StreamedSpan") -> "Any":
             "start_timestamp": item._start_timestamp.timestamp(),
         }
 
-        if item._timestamp:
-            res["end_timestamp"] = item._timestamp.timestamp()
+        if item._end_timestamp:
+            res["end_timestamp"] = item._end_timestamp.timestamp()
 
         if item._parent_span_id:
             res["parent_span_id"] = item._parent_span_id

sentry_sdk/client.py

@@ -864,7 +864,7 @@ def capture_event(
 
         :returns: An event ID. May be `None` if there is no DSN set or of if the SDK decided to discard the event for other reasons. In such situations setting `debug=True` on `init()` may help.
         """
-        hint: "Hint" = dict(hint or ())
+        hint = dict(hint or ())
 
         if not self._should_capture(event, hint, scope):
             return None
@@ -948,7 +948,7 @@ def _capture_telemetry(
         if ty == "log":
             before_send = get_before_send_log(self.options)
         elif ty == "metric":
-            before_send = get_before_send_metric(self.options)  # type: ignore
+            before_send = get_before_send_metric(self.options)
 
         if before_send is not None:
             telemetry = before_send(telemetry, {})  # type: ignore
@@ -960,9 +960,9 @@ def _capture_telemetry(
         if ty == "log":
             batcher = self.log_batcher
         elif ty == "metric":
-            batcher = self.metrics_batcher  # type: ignore
+            batcher = self.metrics_batcher
         elif ty == "span":
-            batcher = self.span_batcher  # type: ignore
+            batcher = self.span_batcher
 
         if batcher is not None:
             batcher.add(telemetry)  # type: ignore

sentry_sdk/crons/api.py

@@ -18,7 +18,7 @@ def _create_check_in_event(
     monitor_config: "Optional[MonitorConfig]" = None,
 ) -> "Event":
     options = sentry_sdk.get_client().options
-    check_in_id: str = check_in_id or uuid.uuid4().hex
+    check_in_id = check_in_id or uuid.uuid4().hex
 
     check_in: "Event" = {
         "type": "check_in",

sentry_sdk/feature_flags.py

@@ -2,6 +2,7 @@
 import sentry_sdk
 from sentry_sdk._lru_cache import LRUCache
 from sentry_sdk.tracing import Span
+from sentry_sdk.tracing_utils import has_span_streaming_enabled
 from threading import Lock
 
 from typing import TYPE_CHECKING, Any
@@ -58,9 +59,17 @@ def add_feature_flag(flag: str, result: bool) -> None:
     Records a flag and its value to be sent on subsequent error events.
     We recommend you do this on flag evaluations. Flags are buffered per Sentry scope.
     """
+    client = sentry_sdk.get_client()
+
     flags = sentry_sdk.get_isolation_scope().flags
     flags.set(flag, result)
 
-    span = sentry_sdk.get_current_span()
-    if span and isinstance(span, Span):
-        span.set_flag(f"flag.evaluation.{flag}", result)
+    if has_span_streaming_enabled(client.options):
+        span = sentry_sdk.traces._get_current_streamed_span()
+        if span and isinstance(span, sentry_sdk.traces.StreamedSpan):
+            span.set_attribute(f"flag.evaluation.{flag}", result)
+
+    else:
+        span = sentry_sdk.get_current_span()
+        if span and isinstance(span, Span):
+            span.set_flag(f"flag.evaluation.{flag}", result)

sentry_sdk/hub.py

@@ -146,7 +146,7 @@ def __init__(
                 scope = get_isolation_scope().fork()
                 current_scope = get_current_scope().fork()
         else:
-            client = client_or_hub  # type: ignore
+            client = client_or_hub
             get_global_scope().set_client(client)
 
         if scope is None:  # so there is no Hub cloning going on

sentry_sdk/integrations/_wsgi_common.py

@@ -9,8 +9,11 @@
 
 try:
     from django.http.request import RawPostDataException
+
+    _RAW_DATA_EXCEPTIONS = (RawPostDataException, ValueError)
 except ImportError:
     RawPostDataException = None
+    _RAW_DATA_EXCEPTIONS = (ValueError,)
 
 from typing import TYPE_CHECKING
 
@@ -110,7 +113,7 @@ def extract_into_event(self, event: "Event") -> None:
             raw_data = None
             try:
                 raw_data = self.raw_data()
-            except (RawPostDataException, ValueError):
+            except _RAW_DATA_EXCEPTIONS:
                 # If DjangoRestFramework is used it already read the body for us
                 # so reading it here will fail. We can ignore this.
                 pass
@@ -175,7 +178,7 @@ def json(self) -> "Optional[Any]":
 
             try:
                 raw_data = self.raw_data()
-            except (RawPostDataException, ValueError):
+            except _RAW_DATA_EXCEPTIONS:
                 # The body might have already been read, in which case this will
                 # fail
                 raw_data = None

sentry_sdk/integrations/aiohttp.py

@@ -184,6 +184,7 @@ async def sentry_app_handle(
                                 **client_address_attributes,
                                 **header_attributes,
                             },
+                            parent_span=None,
                         )
                     else:
                         transaction = continue_trace(

sentry_sdk/integrations/asgi.py

@@ -263,7 +263,9 @@ async def _run_app(
 
                                 attributes["sentry.op"] = f"{ty}.server"
                                 segment = sentry_sdk.traces.start_span(
-                                    name=transaction_name, attributes=attributes
+                                    name=transaction_name,
+                                    attributes=attributes,
+                                    parent_span=None,
                                 )
                         else:
                             sentry_sdk.traces.new_trace()
@@ -274,7 +276,9 @@ async def _run_app(
 
                             attributes["sentry.op"] = OP.HTTP_SERVER
                             segment = sentry_sdk.traces.start_span(
-                                name=transaction_name, attributes=attributes
+                                name=transaction_name,
+                                attributes=attributes,
+                                parent_span=None,
                             )
 
                         span_ctx = segment or nullcontext()

sentry_sdk/integrations/cloud_resource_context.py

@@ -176,6 +176,7 @@ def _get_gcp_context(cls) -> "Dict[str, str]":
             "cloud.platform": CLOUD_PLATFORM.GCP_COMPUTE_ENGINE,
         }
 
+        gcp_metadata = cls.gcp_metadata
         try:
             if cls.gcp_metadata is None:
                 r = cls.http.request(
@@ -187,30 +188,29 @@ def _get_gcp_context(cls) -> "Dict[str, str]":
                 if r.status != 200:
                     return ctx
 
-                cls.gcp_metadata = json.loads(r.data.decode("utf-8"))
+                gcp_metadata = json.loads(r.data.decode("utf-8"))
+                cls.gcp_metadata = gcp_metadata
 
             try:
-                ctx["cloud.account.id"] = cls.gcp_metadata["project"]["projectId"]
+                ctx["cloud.account.id"] = gcp_metadata["project"]["projectId"]
             except Exception:
                 pass
 
             try:
-                ctx["cloud.availability_zone"] = cls.gcp_metadata["instance"][
-                    "zone"
-                ].split("/")[-1]
+                ctx["cloud.availability_zone"] = gcp_metadata["instance"]["zone"].split(
+                    "/"
+                )[-1]
             except Exception:
                 pass
 
             try:
                 # only populated in google cloud run
-                ctx["cloud.region"] = cls.gcp_metadata["instance"]["region"].split("/")[
-                    -1
-                ]
+                ctx["cloud.region"] = gcp_metadata["instance"]["region"].split("/")[-1]
             except Exception:
                 pass
 
             try:
-                ctx["host.id"] = cls.gcp_metadata["instance"]["id"]
+                ctx["host.id"] = gcp_metadata["instance"]["id"]
             except Exception:
                 pass