Move the logic to the middleware

src/Middleware/InitializeTenancy.php

@@ -3,6 +3,7 @@
 namespace Stancl\Tenancy\Middleware;
 
 use Closure;
+use Laravel\Telescope\Telescope;
 
 class InitializeTenancy
 {
@@ -28,6 +29,19 @@ class InitializeTenancy
             ($this->onFail)($e);
         }
 
+        if (class_exists(Telescope::class)) {
+            $original_callback = Telescope::tagUsing;
+
+            Telescope::tag(function (\Laravel\Telescope\IncomingEntry $entry) use ($original_callback) {
+                $tags = [];
+                if (tenancy()->initialized) {
+                    $tags = ['tenant:' . tenant('uuid')];
+                }
+
+                return array_merge($original_callback($entry), $tags);
+            });
+        }
+
         return $next($request);
     }
 }