From f7b09c090bab61ab2a5ba3ada9d7d102e930c352 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 19 May 2026 15:23:34 +0200
Subject: [PATCH 1/2] Fix subspan ending main request span

---
 src/Utopia/Bus/Bus.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Utopia/Bus/Bus.php b/src/Utopia/Bus/Bus.php
index bef39f0481..d0a6d213a7 100644
--- a/src/Utopia/Bus/Bus.php
+++ b/src/Utopia/Bus/Bus.php
@@ -37,14 +37,19 @@ class Bus
 
         foreach ($listeners as $listener) {
             $deps = array_map($resolver, $listener->getInjections());
-            Span::init('listener.' . $listener::getName());
-            Span::add('bus.event', $event::class);
+
+            Span::current()?->add('listener.' . $listener::getName() . '.event', $event::class);
+            
             try {
                 ($listener->getCallback())($event, ...$deps);
+                Span::current()?->add('listener.' . $listener::getName() . '.success', true);
             } catch (\Throwable $e) {
-                Span::error($e);
-            } finally {
-                Span::current()?->finish();
+                Span::current()?->add('listener.' . $listener::getName() . '.success', false);
+                Span::current()?->add('listener.' . $listener::getName() . '.error.code', $e->getCode());
+                Span::current()?->add('listener.' . $listener::getName() . '.error.message', $e->getMessage());
+                Span::current()?->add('listener.' . $listener::getName() . '.error.line', $e->getLine());
+                Span::current()?->add('listener.' . $listener::getName() . '.error.file', $e->getFile());
+                Span::current()?->add('listener.' . $listener::getName() . '.error.trace', $e->getTraceAsString());
             }
         }
     }

From 90df8efe0ac8b99c1bee9a78fa7dec594a003a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Tue, 19 May 2026 15:50:48 +0200
Subject: [PATCH 2/2] Formatting fix

---
 src/Utopia/Bus/Bus.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Utopia/Bus/Bus.php b/src/Utopia/Bus/Bus.php
index d0a6d213a7..2debb22f98 100644
--- a/src/Utopia/Bus/Bus.php
+++ b/src/Utopia/Bus/Bus.php
@@ -39,7 +39,7 @@ class Bus
             $deps = array_map($resolver, $listener->getInjections());
 
             Span::current()?->add('listener.' . $listener::getName() . '.event', $event::class);
-            
+
             try {
                 ($listener->getCallback())($event, ...$deps);
                 Span::current()?->add('listener.' . $listener::getName() . '.success', true);