more fixes

Author: sentrivana

sentry_sdk/integrations/asgi.py

@@ -217,6 +217,7 @@ async def _run_app(
                     span_ctx: "ContextManager[Union[Span, StreamedSpan, None]]"
                     if span_streaming:
                         segment: "Optional[StreamedSpan]" = None
+                        sentry_scope.set_custom_sampling_context({"asgi_scope": scope})
                         if ty in ("http", "websocket"):
                             if (
                                 ty == "websocket"

sentry_sdk/integrations/redis/_sync_common.py

@@ -134,16 +134,20 @@ def sentry_patched_execute_command(
             )
         db_span.__enter__()
 
-        set_db_data_fn(db_span, self)
-        _set_client_data(db_span, is_cluster, name, *args)
+        with capture_internal_exceptions():
+            set_db_data_fn(db_span, self)
+            _set_client_data(db_span, is_cluster, name, *args)
 
-        value = old_execute_command(self, name, *args, **kwargs)
+        try:
+            value = old_execute_command(self, name, *args, **kwargs)
+        finally:
+            db_span.__exit__(None, None, None)
 
-        db_span.__exit__(None, None, None)
+            if cache_span:
+                with capture_internal_exceptions():
+                    _set_cache_data(cache_span, self, cache_properties, value)
 
-        if cache_span:
-            _set_cache_data(cache_span, self, cache_properties, value)
-            cache_span.__exit__(None, None, None)
+                cache_span.__exit__(None, None, None)
 
         return value
 

sentry_sdk/integrations/redis/utils.py

@@ -149,13 +149,14 @@ def _set_pipeline_data(
 def _set_client_data(
     span: "Union[Span, StreamedSpan]", is_cluster: bool, name: str, *args: "Any"
 ) -> None:
-    if name:
-        if isinstance(span, StreamedSpan):
-            span.set_attribute("redis.is_cluster", is_cluster)
+    if isinstance(span, StreamedSpan):
+        span.set_attribute("redis.is_cluster", is_cluster)
+        if name:
             span.set_attribute("redis.command", name)
             span.set_attribute(SPANDATA.DB_OPERATION, name)
-        else:
-            span.set_tag("redis.is_cluster", is_cluster)
+    else:
+        span.set_tag("redis.is_cluster", is_cluster)
+        if name:
             span.set_tag("redis.command", name)
             span.set_tag(SPANDATA.DB_OPERATION, name)
 

sentry_sdk/integrations/rust_tracing.py

@@ -218,6 +218,7 @@ def on_new_span(self, attrs: str, span_id: str) -> "TraceState":
                 )
                 sentry_span.set_op("function")
                 sentry_span.set_origin(self.origin)
+                sentry_span.start()
             else:
                 sentry_span = parent_sentry_span.start_child(
                     op="function",
@@ -233,6 +234,7 @@ def on_new_span(self, attrs: str, span_id: str) -> "TraceState":
                 )
                 sentry_span.set_op("function")
                 sentry_span.set_origin(self.origin)
+                sentry_span.start()
             else:
                 sentry_span = sentry_sdk.start_span(
                     op="function",
@@ -260,7 +262,10 @@ def on_close(self, span_id: str, span_state: "TraceState") -> None:
             return
 
         parent_sentry_span, sentry_span = span_state
-        sentry_span.finish()
+        if isinstance(sentry_span, StreamedSpan):
+            sentry_span.end()
+        else:
+            sentry_span.finish()
         sentry_sdk.get_current_scope().span = parent_sentry_span
 
     def on_record(self, span_id: str, values: str, span_state: "TraceState") -> None:

sentry_sdk/integrations/strawberry.py

@@ -315,6 +315,8 @@ async def resolve(
             span = sentry_sdk.traces.start_span(
                 parent_span=self.graphql_span, name=f"resolving {field_path}"
             )
+            span.set_op(OP.GRAPHQL_RESOLVE)
+            span.set_origin(StrawberryIntegration.origin)
             span.set_attribute("graphql.field_name", info.field_name)
             span.set_attribute("graphql.parent_type", info.parent_type.name)
             span.set_attribute("graphql.field_path", field_path)

sentry_sdk/scope.py

@@ -1302,7 +1302,7 @@ def _update_sample_rate_from_segment(self, span: "StreamedSpan") -> None:
         propagation_context = self.get_active_propagation_context()
         baggage = propagation_context.baggage
 
-        if baggage is not None:
+        if baggage is not None and span.sample_rate is not None:
             baggage.sentry_items["sample_rate"] = str(span.sample_rate)
 
     def continue_trace(

sentry_sdk/traces.py

@@ -436,7 +436,7 @@ def _end(
                 self.timestamp = datetime.now(timezone.utc)
 
         if self.segment.sampled:  # XXX this should just use its own sampled
-            sentry_sdk.get_current_scope()._capture_span(self)
+            scope._capture_span(self)
 
         self._finished = True
 
@@ -764,6 +764,13 @@ def set_source(self, source: "Union[str, SegmentSource]") -> None:
     def is_segment(self) -> bool:
         return False
 
+    def to_traceparent(self) -> str:
+        propagation_context = (
+            sentry_sdk.get_current_scope().get_active_propagation_context()
+        )
+
+        return f"{propagation_context.trace_id}-{propagation_context.span_id}-0"
+
     @property
     def span_id(self) -> str:
         return "000000"

sentry_sdk/tracing_utils.py

@@ -816,7 +816,7 @@ def populate_from_segment(cls, segment: "StreamedSpan") -> "Baggage":
         if (
             segment.get_attributes().get("sentry.span.source")
             not in LOW_QUALITY_SEGMENT_SOURCES
-        ):
+        ) and segment._name:
             sentry_items["transaction"] = segment._name
 
         if segment.sample_rate is not None: