Revert some stuff

Author: sl0thentr0py

sentry_sdk/integrations/opentelemetry/utils.py

@@ -130,6 +130,30 @@ def extract_span_data(span):
     if db_query:
         return span_data_for_db_query(span)
 
+    rpc_service = span.attributes.get(SpanAttributes.RPC_SERVICE)
+    if rpc_service:
+        return (
+            span.attributes.get(SentrySpanAttribute.OP) or "rpc",
+            description,
+            status,
+            http_status,
+            origin,
+        )
+
+    messaging_system = span.attributes.get(SpanAttributes.MESSAGING_SYSTEM)
+    if messaging_system:
+        return (
+            span.attributes.get(SentrySpanAttribute.OP) or "message",
+            description,
+            status,
+            http_status,
+            origin,
+        )
+
+    faas_trigger = span.attributes.get(SpanAttributes.FAAS_TRIGGER)
+    if faas_trigger:
+        return (str(faas_trigger), description, status, http_status, origin)
+
     return (op, description, status, http_status, origin)
 
 

sentry_sdk/tracing.py

@@ -1653,9 +1653,6 @@ def is_success(self):
 
     def finish(self, end_timestamp=None):
         # type: (Optional[Union[float, datetime]]) -> Optional[str]
-        if self.status is None:
-            self.set_status(SPANSTATUS.OK)
-
         if end_timestamp is not None:
             from sentry_sdk.integrations.opentelemetry.utils import (
                 convert_to_otel_timestamp,

tests/integrations/celery/test_celery.py

@@ -221,11 +221,16 @@ def dummy_task(x, y):
         assert execution_event["contexts"]["trace"]["status"] == "ok"
 
     assert len(execution_event["spans"]) == 1
-    assert execution_event["spans"][0] == ApproxDict({
-        "trace_id": str(root_span.trace_id),
-        "op": "queue.process",
-        "description": "dummy_task",
-    })
+    assert (
+        execution_event["spans"][0].items()
+        >= {
+            "trace_id": str(transaction.trace_id),
+            "same_process_as_parent": True,
+            "op": "queue.process",
+            "description": "dummy_task",
+            "data": ApproxDict(),
+        }.items()
+    )
     assert submission_event["spans"] == [
         {
             "data": ApproxDict(),
@@ -444,7 +449,7 @@ def walk_dogs(x, y):
         walk_dogs, [["Maisey", "Charlie", "Bodhi", "Cory"], "Dog park round trip"], 1
     )
 
-    sampling_context = traces_sampler.call_args_list[0][0][0]
+    sampling_context = traces_sampler.call_args_list[1][0][0]
     assert sampling_context["celery.job.task"] == "dog_walk"
     for i, arg in enumerate(args_kwargs["args"]):
         assert sampling_context[f"celery.job.args.{i}"] == str(arg)