Make requests less resilient, but faster

Author: jeromegamez

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Use IP address instead of hostname for the Google Metadata service to avoid slow requests when not on Compute Engine
 * The availability status of the Metadata Service is now cached to save requests
+* Configured the underlying HTTP client to be less resilient, but faster
 
 ## 1.0.1 - 2018-07-28
 

src/GcpMetadata.php

@@ -4,12 +4,9 @@
 
 namespace Kreait;
 
-use function GuzzleHttp\choose_handler;
 use GuzzleHttp\Client;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Middleware;
 use Kreait\GcpMetadata\Error;
 use Psr\Http\Message\ResponseInterface;
 
@@ -31,7 +28,15 @@ class GcpMetadata
 
     public function __construct(ClientInterface $client = null)
     {
-        $this->client = $client;
+        $this->client = $client ?? $this->createClient();
+    }
+
+    private function createClient(): Client
+    {
+        return new Client([
+            'connect_timeout' => 1.0, // Default is 0 = indefinitely
+            'timeout' => 1.0 // Default is 0 = indefinitely
+        ]);
     }
 
     public function isAvailable(): bool
@@ -70,7 +75,7 @@ private function request(string $type, string $property = '', array $params = []
         ];
 
         try {
-            $response = $this->client()->request('GET', $url, $options);
+            $response = $this->client->request('GET', $url, $options);
 
             $this->verifyHttpStatus($response);
             $this->verifyHeaders($response);
@@ -112,23 +117,4 @@ private function parseResponse(ResponseInterface $response)
 
         return $lines;
     }
-
-    private function client(): ClientInterface
-    {
-        if (!$this->client) {
-            $decider = function ($retries) {
-                return $retries < 3;
-            };
-
-            $stack = new HandlerStack(choose_handler());
-            $stack->push(Middleware::redirect(), 'allow_redirects');
-            $stack->push(Middleware::retry($decider));
-
-            $this->client = new Client([
-                'handler' => $stack,
-            ]);
-        }
-
-        return $this->client;
-    }
 }