From 07bdb82bdf94e73691cb96795e37a6496d2729db Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Fri, 28 Mar 2025 11:56:16 +0100
Subject: [PATCH 1/2] Update Celery tests

---
 tests/integrations/celery/test_celery.py       | 12 ++++++++----
 .../celery/test_update_celery_task_headers.py  | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/tests/integrations/celery/test_celery.py b/tests/integrations/celery/test_celery.py
index 241c79dc9d..821a3bd10e 100644
--- a/tests/integrations/celery/test_celery.py
+++ b/tests/integrations/celery/test_celery.py
@@ -228,7 +228,14 @@ def dummy_task(x, y):
     )
     assert submission_event["spans"] == [
         {
-            "data": ApproxDict(),
+            "data": {
+                "sentry.name": "dummy_task",
+                "sentry.op": "queue.submit.celery",
+                "sentry.origin": "auto.queue.celery",
+                "sentry.source": "custom",
+                "thread.id": mock.ANY,
+                "thread.name": mock.ANY,
+            },
             "description": "dummy_task",
             "op": "queue.submit.celery",
             "origin": "auto.queue.celery",
@@ -238,9 +245,6 @@ def dummy_task(x, y):
             "timestamp": submission_event["spans"][0]["timestamp"],
             "trace_id": str(root_span.trace_id),
             "status": "ok",
-            "tags": {
-                "status": "ok",
-            },
         }
     ]
 
diff --git a/tests/integrations/celery/test_update_celery_task_headers.py b/tests/integrations/celery/test_update_celery_task_headers.py
index 3eb9bd7e88..5b76bee076 100644
--- a/tests/integrations/celery/test_update_celery_task_headers.py
+++ b/tests/integrations/celery/test_update_celery_task_headers.py
@@ -7,6 +7,7 @@
 from sentry_sdk.integrations.celery import _update_celery_task_headers
 import sentry_sdk
 from sentry_sdk.tracing_utils import Baggage
+from tests.conftest import SortedBaggage
 
 
 BAGGAGE_VALUE = (
@@ -83,10 +84,11 @@ def test_span_with_transaction(sentry_init):
 
             assert outgoing_headers["sentry-trace"] == span.to_traceparent()
             assert outgoing_headers["headers"]["sentry-trace"] == span.to_traceparent()
-            assert outgoing_headers["baggage"] == transaction.get_baggage().serialize()
-            assert (
-                outgoing_headers["headers"]["baggage"]
-                == transaction.get_baggage().serialize()
+            assert outgoing_headers["baggage"] == SortedBaggage(
+                transaction.get_baggage().serialize()
+            )
+            assert outgoing_headers["headers"]["baggage"] == SortedBaggage(
+                transaction.get_baggage().serialize()
             )
 
 
@@ -117,11 +119,11 @@ def test_span_with_transaction_custom_headers(sentry_init):
                     if x is not None and x != ""
                 ]
             )
-            assert outgoing_headers["baggage"] == combined_baggage.serialize(
-                include_third_party=True
+            assert outgoing_headers["baggage"] == SortedBaggage(
+                combined_baggage.serialize(include_third_party=True)
             )
-            assert outgoing_headers["headers"]["baggage"] == combined_baggage.serialize(
-                include_third_party=True
+            assert outgoing_headers["headers"]["baggage"] == SortedBaggage(
+                combined_baggage.serialize(include_third_party=True)
             )
 
 

From d695651c550b2f1ef925d77eadd40b270eb5fb91 Mon Sep 17 00:00:00 2001
From: Anton Pirker <anton.pirker@sentry.io>
Date: Fri, 28 Mar 2025 13:54:55 +0100
Subject: [PATCH 2/2] Remove Python 3.7 from Celery tests

---
 scripts/populate_tox/config.py |  2 +-
 tox.ini                        | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/scripts/populate_tox/config.py b/scripts/populate_tox/config.py
index a233886c23..79e13d3fbb 100644
--- a/scripts/populate_tox/config.py
+++ b/scripts/populate_tox/config.py
@@ -23,8 +23,8 @@
         "package": "celery",
         "deps": {
             "*": ["newrelic", "redis"],
-            "py3.7": ["importlib-metadata<5.0"],
         },
+        "python": ">=3.8",
     },
     "clickhouse_driver": {
         "package": "clickhouse-driver",
diff --git a/tox.ini b/tox.ini
index 643fa19759..c6f6a73924 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,7 @@
 # The file (and all resulting CI YAMLs) then need to be regenerated via
 # "scripts/generate-test-files.sh".
 #
-# Last generated: 2025-03-27T10:11:24.425788+00:00
+# Last generated: 2025-03-28T12:52:29.636426+00:00
 
 [tox]
 requires =
@@ -179,7 +179,7 @@ envlist =
     {py3.7}-sqlalchemy-v1.3.9
     {py3.7,py3.11,py3.12}-sqlalchemy-v1.4.54
     {py3.7,py3.10,py3.11}-sqlalchemy-v2.0.9
-    {py3.7,py3.12,py3.13}-sqlalchemy-v2.0.39
+    {py3.7,py3.12,py3.13}-sqlalchemy-v2.0.40
 
 
     # ~~~ Flags ~~~
@@ -226,8 +226,8 @@ envlist =
 
 
     # ~~~ Tasks ~~~
-    {py3.7,py3.8}-celery-v4.4.7
-    {py3.7,py3.8}-celery-v5.0.5
+    {py3.8}-celery-v4.4.7
+    {py3.8}-celery-v5.0.5
     {py3.8,py3.11,py3.12}-celery-v5.4.0
     {py3.8,py3.12,py3.13}-celery-v5.5.0rc5
 
@@ -557,7 +557,7 @@ deps =
     sqlalchemy-v1.3.9: sqlalchemy==1.3.9
     sqlalchemy-v1.4.54: sqlalchemy==1.4.54
     sqlalchemy-v2.0.9: sqlalchemy==2.0.9
-    sqlalchemy-v2.0.39: sqlalchemy==2.0.39
+    sqlalchemy-v2.0.40: sqlalchemy==2.0.40
 
 
     # ~~~ Flags ~~~
@@ -624,7 +624,6 @@ deps =
     celery-v5.5.0rc5: celery==5.5.0rc5
     celery: newrelic
     celery: redis
-    py3.7-celery: importlib-metadata<5.0
 
     dramatiq-v1.9.0: dramatiq==1.9.0
     dramatiq-v1.12.3: dramatiq==1.12.3