fixes from warden review

Author: sentrivana

sentry_sdk/integrations/celery/__init__.py

@@ -389,11 +389,7 @@ def _wrap_task_call(task: "Any", f: "F") -> "F":
     # Need to wrap task call because the exception is caught before we get to
     # see it. Also celery's reported stacktrace is untrustworthy.
 
-    # functools.wraps is important here because celery-once looks at this
-    # method's name. @ensure_integration_enabled internally calls functools.wraps,
-    # but if we ever remove the @ensure_integration_enabled decorator, we need
-    # to add @functools.wraps(f) here.
-    # https://github.com/getsentry/sentry-python/issues/421
+    @wraps(f)
     def _inner(*args: "Any", **kwargs: "Any") -> "Any":
         client = sentry_sdk.get_client()
         if client.get_integration(CeleryIntegration) is None:

sentry_sdk/traces.py

@@ -416,7 +416,10 @@ def _end(
             return
 
         if self.sampled is None:
-            logger.warning("Discarding transaction without sampling decision.")
+            logger.warning("Discarding span without sampling decision.")
+            if client.transport and has_tracing_enabled(client.options):
+                client.transport.record_lost_event("sample_rate", data_category="span")
+            return
 
         if self._finished is True:
             # This span is already finished, ignore.

tests/tracing/test_span_streaming.py

@@ -497,7 +497,7 @@ def test_sibling_segments(sentry_init, capture_envelopes):
     assert segment2["is_segment"] is True
     assert segment2["parent_span_id"] is None
 
-    assert segment1["trace_id"] == segment1["trace_id"]
+    assert segment1["trace_id"] == segment2["trace_id"]
 
 
 def test_sibling_segments_new_trace(sentry_init, capture_envelopes):