Skip to content

ref(deletions): Use the same transaction prefix #102661

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2025
+8 −2
Merged

ref(deletions): Use the same transaction prefix #102661

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f8fef8
Same transaction name
armenzg Oct 29, 2025
3c4ce06
Use a prefix instead
armenzg Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/sentry/runner/commands/cleanup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@

logger = logging.getLogger(__name__)

TRANSACTION_PREFIX = "cleanup"

if TYPE_CHECKING:
from sentry.db.models.base import BaseModel

Expand Down Expand Up @@ -119,7 +121,9 @@ def multiprocess_worker(task_queue: _WorkQueue) -> None:
return

try:
with sentry_sdk.start_transaction(op="cleanup", name="multiprocess_worker"):
with sentry_sdk.start_transaction(
op="cleanup", name=f"{TRANSACTION_PREFIX}.multiprocess_worker"
):
model = import_string(model_name)
task = deletions.get(
model=model,
Expand Down Expand Up @@ -222,7 +226,9 @@ def _cleanup(
# Start transaction AFTER creating the multiprocessing pool to avoid
# transaction context issues in child processes. This ensures only the
# main process tracks the overall cleanup operation performance.
with sentry_sdk.start_transaction(op="cleanup", name="cleanup") as transaction:
with sentry_sdk.start_transaction(
op="cleanup", name=f"{TRANSACTION_PREFIX}.main"
) as transaction:
try:
# Check if cleanup should be aborted before starting
if options.get("cleanup.abort_execution"):
Expand Down
Loading