Skip to content

Commit b0e7aaa

Browse files
committed
Merge remote-tracking branch 'origin/master' into feat/span-first-2
2 parents 3da73af + 1476ff0 commit b0e7aaa

File tree

6 files changed

+133
-132
lines changed

6 files changed

+133
-132
lines changed

requirements-linting.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ statsig
1818
UnleashClient
1919
typer
2020
strawberry-graphql
21+
setuptools<82

scripts/populate_tox/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"chalice": {
7575
"package": "chalice",
7676
"deps": {
77-
"*": ["pytest-chalice"],
77+
"*": ["pytest-chalice", "setuptools<82"],
7878
},
7979
"num_versions": 2,
8080
},

scripts/populate_tox/package_dependencies.jsonl

Lines changed: 15 additions & 14 deletions
Large diffs are not rendered by default.

scripts/populate_tox/releases.jsonl

Lines changed: 37 additions & 37 deletions
Large diffs are not rendered by default.

sentry_sdk/integrations/celery/__init__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,11 @@ def _inner(*args: "Any", **kwargs: "Any") -> "Any":
448448
)
449449

450450
with capture_internal_exceptions():
451-
set_on_span(
452-
SPANDATA.MESSAGING_SYSTEM,
453-
task.app.connection().transport.driver_type,
454-
)
451+
with task.app.connection() as conn:
452+
span.set_data(
453+
SPANDATA.MESSAGING_SYSTEM,
454+
conn.transport.driver_type,
455+
)
455456

456457
return f(*args, **kwargs)
457458
except Exception:

0 commit comments

Comments
 (0)