Merge pull request #2 from plunkettscott/fix/check-span-isset

plunkettscott · web-flow · commit 64c5b6293908 · 2023-02-25T18:36:42.000-06:00
Ensure span is set before accessing it
diff --git a/src/Concerns/TracesHttpRequests.php b/src/Concerns/TracesHttpRequests.php
@@ -71,6 +71,10 @@ public function createAndActivateRootSpan(bool $continueTrace, Request $request)
 
     public function terminateRootSpan(Request $request, mixed $response): void
     {
+        if (! isset($this->span)) {
+            return;
+        }
+
         if (method_exists($response, 'getStatusCode')) {
             $this->span->setAttribute(TraceAttributes::HTTP_STATUS_CODE, $response->getStatusCode());
         }
@@ -82,7 +86,10 @@ public function terminateRootSpan(Request $request, mixed $response): void
         }
 
         $this->span->end();
-        $this->scope->detach();
+
+        if (isset($this->scope)) {
+            $this->scope->detach();
+        }
     }
 
     private function calculateSpanName(Request $request): string

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,10 @@ public function createAndActivateRootSpan(bool $continueTrace, Request $request)`
`71`	`71`
`72`	`72`	`public function terminateRootSpan(Request $request, mixed $response): void`
`73`	`73`	`{`
	`74`	`+ if (! isset($this->span)) {`
	`75`	`+ return;`
	`76`	`+ }`
	`77`	`+`
`74`	`78`	`if (method_exists($response, 'getStatusCode')) {`
`75`	`79`	`$this->span->setAttribute(TraceAttributes::HTTP_STATUS_CODE, $response->getStatusCode());`
`76`	`80`	`}`
`@@ -82,7 +86,10 @@ public function terminateRootSpan(Request $request, mixed $response): void`
`82`	`86`	`}`
`83`	`87`
`84`	`88`	`$this->span->end();`
`85`		`- $this->scope->detach();`
	`89`	`+`
	`90`	`+ if (isset($this->scope)) {`
	`91`	`+ $this->scope->detach();`
	`92`	`+ }`
`86`	`93`	`}`
`87`	`94`
`88`	`95`	`private function calculateSpanName(Request $request): string`