Change the httpHandler requestId fallback to a hash

googleapis · Dec 10, 2024 · 7d3a494 · 7d3a494
1 parent 7869f8c
commit 7d3a494
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/HttpHandler/Guzzle6HttpHandler.php b/src/HttpHandler/Guzzle6HttpHandler.php
@@ -68,7 +68,7 @@ public function __invoke(RequestInterface $request, array $options = [])
             $requestEvent->retryAttempt = $options['retryAttempt'] ?? null;
             $requestEvent->serviceName = $options['serviceName'] ?? null;
             $requestEvent->processId = getmypid();
-            $requestEvent->requestId = $options['requestId'] ?? spl_object_id($request);
+            $requestEvent->requestId = $options['requestId'] ?? crc32((string) spl_object_id($request) . getmypid());
 
             $this->logRequest($requestEvent);
         }
@@ -112,7 +112,7 @@ public function async(RequestInterface $request, array $options = [])
             $requestEvent->retryAttempt = $options['retryAttempt'] ?? null;
             $requestEvent->serviceName = $options['serviceName'] ?? null;
             $requestEvent->processId = getmypid();
-            $requestEvent->requestId = $options['requestId'] ?? spl_object_id($request);
+            $requestEvent->requestId = $options['requestId'] ?? crc32((string) spl_object_id($request) . getmypid());
 
             $this->logRequest($requestEvent);
         }

diff --git a/src/Logging/LoggingTrait.php b/src/Logging/LoggingTrait.php
@@ -74,7 +74,7 @@ private function logResponse(RpcLogEvent $event): void
         $debugEvent = [
             'timestamp' => $event->timestamp,
             'severity' => strtoupper(LogLevel::DEBUG),
-            'processId' => $event->processId,
+            'processId' => $event->processId ?? null,
             'requestId' => $event->requestId ?? null,
             'jsonPayload' => [
                 'response.headers' => $event->headers,