Laravel: end span post Command::execute hook.

open-telemetry · Sep 19, 2023 · 22dd5b0 · 22dd5b0
1 parent 2c18066
commit 22dd5b0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Instrumentation/Laravel/src/ConsoleInstrumentation.php b/src/Instrumentation/Laravel/src/ConsoleInstrumentation.php
@@ -31,6 +31,7 @@ public static function register(CachedInstrumentation $instrumentation): void
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
                     ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
                     ->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
+
                 $parent = Context::getCurrent();
                 $span = $builder->startSpan();
                 Context::storage()->attach($span->storeInContext($parent));
@@ -42,6 +43,7 @@ public static function register(CachedInstrumentation $instrumentation): void
                 if (!$scope) {
                     return;
                 }
+
                 $scope->detach();
                 $span = Span::fromContext($scope->context());
                 if ($exception) {
@@ -68,8 +70,8 @@ public static function register(CachedInstrumentation $instrumentation): void
                     ->setAttribute(TraceAttributes::CODE_NAMESPACE, $class)
                     ->setAttribute(TraceAttributes::CODE_FILEPATH, $filename)
                     ->setAttribute(TraceAttributes::CODE_LINENO, $lineno);
-                $parent = Context::getCurrent();
 
+                $parent = Context::getCurrent();
                 $span = $builder->startSpan();
                 Context::storage()->attach($span->storeInContext($parent));
 
@@ -80,6 +82,7 @@ public static function register(CachedInstrumentation $instrumentation): void
                 if (!$scope) {
                     return;
                 }
+
                 $scope->detach();
                 $span = Span::fromContext($scope->context());
                 $span->addEvent('command finished', [
@@ -90,6 +93,8 @@ public static function register(CachedInstrumentation $instrumentation): void
                     $span->recordException($exception, [TraceAttributes::EXCEPTION_ESCAPED => true]);
                     $span->setStatus(StatusCode::STATUS_ERROR, $exception->getMessage());
                 }
+
+                $span->end();
             }
         );
     }