fix bug with correlation id with executors

apacheborys · apacheborys · commit 03f7a2ce2aa0 · 2023-01-22T10:13:57.000+01:00
diff --git a/src/BasicExecutor/CommandExecutor.php b/src/BasicExecutor/CommandExecutor.php
@@ -103,7 +103,7 @@ public function getCorrelationId(Throwable $exception, Config $config): string
         $id = getenv(self::ALIAS_FOR_CORRELATION_ID);
 
         if (!$id) {
-            $config->getTransport()->getNextId($exception, $config);
+            $id = $config->getTransport()->getNextId($exception, $config);
         }
 
         return (string) $id;
diff --git a/src/BasicExecutor/HttpExecutor.php b/src/BasicExecutor/HttpExecutor.php
@@ -97,7 +97,7 @@ public function getCorrelationId(\Throwable $exception, Config $config): string
         $id = $_SERVER['HTTP_' . self::CID] ?? apache_request_headers()[self::CID] ?? null;
 
         if (!$id) {
-            $config->getTransport()->getNextId($exception, $config);
+            $id = $config->getTransport()->getNextId($exception, $config);
         }
 
         return (string) $id;

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function getCorrelationId(Throwable $exception, Config $config): string`
`103`	`103`	`$id = getenv(self::ALIAS_FOR_CORRELATION_ID);`
`104`	`104`
`105`	`105`	`if (!$id) {`
`106`		`- $config->getTransport()->getNextId($exception, $config);`
	`106`	`+ $id = $config->getTransport()->getNextId($exception, $config);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`return (string) $id;`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function getCorrelationId(\Throwable $exception, Config $config): string`
`97`	`97`	`$id = $_SERVER['HTTP_' . self::CID] ?? apache_request_headers()[self::CID] ?? null;`
`98`	`98`
`99`	`99`	`if (!$id) {`
`100`		`- $config->getTransport()->getNextId($exception, $config);`
	`100`	`+ $id = $config->getTransport()->getNextId($exception, $config);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`return (string) $id;`