Change the client ID field to represent a Gapic Client

googleapis · Dec 5, 2024 · 876f14a · 876f14a
1 parent 1a7523b
commit 876f14a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/ApplicationDefaultCredentials.php b/src/ApplicationDefaultCredentials.php
@@ -327,6 +327,8 @@ public static function getIdTokenCredentials(
     /**
      * Returns a StdOutLogger instance
      *
+     * @internal
+     *
      * @return null|LoggerInterface
      */
     public static function getDefaultLogger(): null|LoggerInterface

diff --git a/src/HttpHandler/Guzzle6HttpHandler.php b/src/HttpHandler/Guzzle6HttpHandler.php
@@ -67,7 +67,7 @@ public function __invoke(RequestInterface $request, array $options = [])
             $requestEvent->payload = $request->getBody()->getContents();
             $requestEvent->retryAttempt = $options['retryAttempt'] ?? null;
             $requestEvent->serviceName = $options['serviceName'] ?? null;
-            $requestEvent->clientId = spl_object_id($this->client);
+            $requestEvent->clientId = $options['clientId'];
             $requestEvent->requestId = $options['requestId'] ?? spl_object_id($request);
 
             $this->logRequest($requestEvent);
@@ -111,8 +111,8 @@ public function async(RequestInterface $request, array $options = [])
             $requestEvent->payload = $request->getBody()->getContents();
             $requestEvent->retryAttempt = $options['retryAttempt'] ?? null;
             $requestEvent->serviceName = $options['serviceName'] ?? null;
-            $requestEvent->clientId = spl_object_id($this->client);
-            $requestEvent->requestId = spl_object_id($request);
+            $requestEvent->clientId = $options['clientId'];
+            $requestEvent->requestId = $options['requestId'] ?? spl_object_id($request);
 
             $this->logRequest($requestEvent);
         }