Change logic for disabling logging

src/HttpHandler/HttpHandlerFactory.php

@@ -30,15 +30,14 @@ class HttpHandlerFactory
      * Builds out a default http handler for the installed version of guzzle.
      *
      * @param ClientInterface $client
-     * @param LoggerInterface $logger
+     * @param null|false|LoggerInterface $logger
      * @param bool $loggerDisabled
      * @return Guzzle6HttpHandler|Guzzle7HttpHandler
      * @throws \Exception
      */
     public static function build(
         ClientInterface $client = null,
-        LoggerInterface $logger = null,
-        bool $loggerDisabled = false
+        null|false|LoggerInterface $logger = null,
     )
     {
         if (is_null($client)) {
@@ -53,7 +52,7 @@ public static function build(
             $client = new Client(['handler' => $stack]);
         }
 
-        if (!$loggerDisabled) {
+        if ($logger !== false) {
             $logger = $logger ?? ApplicationDefaultCredentials::getDefaultLogger();
         }
 

src/Logging/LoggingTrait.php

@@ -27,21 +27,19 @@ private function logRequest(LogEvent $event): void
             'timestamp' => $event->timestamp,
             'severity' => strtoupper(LogLevel::DEBUG),
             'clientId' => $event->clientId,
-            'requestId' => $event->requestId,
+            'requestId' => $event->requestId ?? null,
         ];
 
         $jsonPayload = [
             'request.method' => $event->method,
             'request.url' => $event->url,
             'request.headers' => $event->headers,
             'request.payload' => $event->payload,
-            'request.jwt' => $this->getJwtToken($event->headers),
+            'request.jwt' => $this->getJwtToken($event->headers ?? []),
             'retryAttempt' => $event->retryAttempt
         ];
 
-        // Filter out the falsey values
-        $jsonPayload = array_filter($jsonPayload);
-        $debugEvent['jsonPayload'] = $jsonPayload;
+        $debugEvent['jsonPayload'] = array_filter($jsonPayload);
 
         $this->logger->debug((string) json_encode($debugEvent));
     }
@@ -52,26 +50,28 @@ private function logResponse(LogEvent $event): void
             'timestamp' => $event->timestamp,
             'severity' => strtoupper(LogLevel::DEBUG),
             'clientId' => $event->clientId,
-            'requestId' => $event->requestId,
+            'requestId' => $event->requestId ?? null,
             'jsonPayload' => [
                 'response.headers' => $event->headers,
                 'response.payload' => $event->payload,
                 'latency' => $event->latency,
             ]
         ];
 
+        $debugEvent['jsonPayload'] = array_filter($debugEvent['jsonPayload']);
         $this->logger->debug((string) json_encode($debugEvent));
 
         $infoEvent = [
             'timestamp' => $event->timestamp,
             'severity' => LogLevel::INFO,
             'clientId' => $event->clientId,
-            'requestId' => $event->requestId,
+            'requestId' => $event->requestId ?? null,
             'jsonPayload' => [
                 'response.status' => $event->status
             ]
         ];
 
+        $infoEvent['jsonPayload'] = array_filter($infoEvent['jsonPayload']);
         $this->logger->info((string) json_encode($infoEvent));
     }
 
@@ -80,6 +80,10 @@ private function logResponse(LogEvent $event): void
      */
     private function getJwtToken(array $headers): null|array
     {
+        if (empty($headers)) {
+            return null;
+        }
+
         $tokenHeader = $headers['Authorization'] ?? '';
         $token = str_replace('Bearer ', '', $tokenHeader);