From 486d9271ac7e8458078b6b9d8e913e13c7770a05 Mon Sep 17 00:00:00 2001 From: loks0n <22452787+loks0n@users.noreply.github.com> Date: Mon, 1 Jun 2026 13:36:27 +0100 Subject: [PATCH] chore: centralize project.id span; drop superfluous worker spans The project resource setter is the canonical owner of project.id (cloud already adds it there for every worker span). Add it to the OSS worker project resource too, and drop the redundant project.id from the database worker. Also drop queue.pid/queue.name/message.timestamp: queue.name duplicates the span action (worker.databases) and none were part of the logging this PR replaced. Co-Authored-By: Claude Opus 4.8 (1M context) --- app/init/worker/message.php | 7 ++++++- .../Platform/Modules/Databases/Workers/Databases.php | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/init/worker/message.php b/app/init/worker/message.php index ea6ba13aec..7cbfe19b0f 100644 --- a/app/init/worker/message.php +++ b/app/init/worker/message.php @@ -18,6 +18,7 @@ use Utopia\Logger\Log; use Utopia\Pools\Group; use Utopia\Queue\Publisher; use Utopia\Registry\Registry; +use Utopia\Span\Span; use Utopia\Storage\Device\Telemetry as TelemetryDevice; use Utopia\System\System; use Utopia\Telemetry\Adapter as Telemetry; @@ -55,7 +56,11 @@ return function (Container $container): void { return $project; } - return $dbForPlatform->getDocument('projects', $project->getId()); + $project = $dbForPlatform->getDocument('projects', $project->getId()); + + Span::add('project.id', $project->getId()); + + return $project; }, ['message', 'dbForPlatform']); $container->set('dbForProject', fn (DatabaseFactory $databaseFactory, Document $project, Database $dbForPlatform) => $project->isEmpty() || $project->getId() === 'console' diff --git a/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php b/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php index a763a62778..333af87493 100644 --- a/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php +++ b/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php @@ -61,11 +61,6 @@ class Databases extends Action throw new Exception('Missing payload'); } - Span::add('project.id', $project->getId()); - Span::add('queue.pid', $message->getPid()); - Span::add('queue.name', $message->getQueue()); - Span::add('message.timestamp', (string) $message->getTimestamp()); - $databaseMessage = DatabaseMessage::fromArray($payload); $type = $databaseMessage->type;