Merge pull request #2854 from stobrien89/tracemiddleware-patch

bugfix: trace middleware

Author: yenfryherrerafeliz

.changes/nextrelease/tracemiddleware-patch.json

@@ -0,0 +1,7 @@
+[
+  {
+    "type": "bugfix",
+    "category": "",
+    "description": "Updates trace middleware such that it does not always expect a request."
+  }
+]

src/TraceMiddleware.php

@@ -18,7 +18,6 @@ class TraceMiddleware
     private $prevOutput;
     private $prevInput;
     private $config;
-
     /** @var Service */
     private $service;
 
@@ -85,7 +84,7 @@ public function __invoke($step, $name)
         return function (callable $next) use ($step, $name) {
             return function (
                 CommandInterface $command,
-                RequestInterface $request = null
+                $request = null
             ) use ($next, $step, $name) {
                 $this->createHttpDebug($command);
                 $start = microtime(true);
@@ -164,17 +163,19 @@ private function commandArray(CommandInterface $cmd)
         ];
     }
 
-    private function requestArray(RequestInterface $request = null)
+    private function requestArray($request = null)
     {
-        return !$request ? [] : array_filter([
-            'instance' => spl_object_hash($request),
-            'method'   => $request->getMethod(),
-            'headers'  => $this->redactHeaders($request->getHeaders()),
-            'body'     => $this->streamStr($request->getBody()),
-            'scheme'   => $request->getUri()->getScheme(),
-            'port'     => $request->getUri()->getPort(),
-            'path'     => $request->getUri()->getPath(),
-            'query'    => $request->getUri()->getQuery(),
+        return !$request instanceof RequestInterface
+            ? []
+            : array_filter([
+                'instance' => spl_object_hash($request),
+                'method'   => $request->getMethod(),
+                'headers'  => $this->redactHeaders($request->getHeaders()),
+                'body'     => $this->streamStr($request->getBody()),
+                'scheme'   => $request->getUri()->getScheme(),
+                'port'     => $request->getUri()->getPort(),
+                'path'     => $request->getUri()->getPath(),
+                'query'    => $request->getUri()->getQuery(),
         ]);
     }
 

tests/TraceMiddlewareTest.php

@@ -4,8 +4,10 @@
 use Aws\Api\Service;
 use Aws\AwsClient;
 use Aws\Command;
+use Aws\EventBridge\EventBridgeClient;
 use Aws\Exception\AwsException;
 use Aws\HandlerList;
+use Aws\MockHandler;
 use Aws\Result;
 use Aws\TraceMiddleware;
 use GuzzleHttp\Promise\RejectedPromise;
@@ -216,6 +218,27 @@ public function testRedactsSensitiveTraits()
         $this->assertStringNotContainsString("SensitiveArray contents also redacted", $str);
     }
 
+    public function testEmitsForMiddlewareThatDoesNotReturnRequest()
+    {
+
+        $str = '';
+        $logfn = function ($value) use (&$str) { $str .= $value; };
+        $handler = new MockHandler();
+        $handler->append(new Result(['success']));
+        $client = new EventBridgeClient([
+            'region' => 'us-west-2',
+            'handler' => $handler,
+            'debug' => [
+                'logfn' => $logfn
+            ]
+
+        ]);
+        $result = $client->listRules();
+
+        $this->assertStringContainsString("Leaving step build, name 'endpoint-resolution'", $str);
+        $this->assertEquals('success', $result[0]);
+    }
+
     public function authStringProvider()
     {
         return [