From a322d8f65bc866137c59842d02295fb99a5e5fde Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Wed, 9 Feb 2022 19:33:06 +0100 Subject: [PATCH 1/2] remove request/response value objects from log context --- src/LoggerPlugin.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/LoggerPlugin.php b/src/LoggerPlugin.php index ce2ee44..6085b8d 100644 --- a/src/LoggerPlugin.php +++ b/src/LoggerPlugin.php @@ -40,8 +40,6 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca $this->logger->info( sprintf("Received response:\n%s", $this->formatter->formatResponse($response)), [ - 'request' => $request, - 'response' => $response, 'milliseconds' => $milliseconds, 'uid' => $uid, ] @@ -54,8 +52,6 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca $this->logger->error( sprintf("Error:\n%s\nwith response:\n%s", $exception->getMessage(), $this->formatter->formatResponse($exception->getResponse())), [ - 'request' => $request, - 'response' => $exception->getResponse(), 'exception' => $exception, 'milliseconds' => $milliseconds, 'uid' => $uid, @@ -65,7 +61,6 @@ protected function doHandleRequest(RequestInterface $request, callable $next, ca $this->logger->error( sprintf("Error:\n%s\nwhen sending request:\n%s", $exception->getMessage(), $this->formatter->formatRequest($request)), [ - 'request' => $request, 'exception' => $exception, 'milliseconds' => $milliseconds, 'uid' => $uid, From 26e6d2839e75e52443b5da14c05bc070abbec22d Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Wed, 9 Feb 2022 19:34:44 +0100 Subject: [PATCH 2/2] ye --- spec/LoggerPluginSpec.php | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/spec/LoggerPluginSpec.php b/spec/LoggerPluginSpec.php index 75ac6cb..9143a23 100644 --- a/spec/LoggerPluginSpec.php +++ b/spec/LoggerPluginSpec.php @@ -45,20 +45,16 @@ function it_logs_request_and_response( $logger->info( "Sending request:\nGET / 1.1", Argument::that( - function(array $context) use ($request) { - return $context['request'] === $request->getWrappedObject() - && is_string($context['uid']) - ; + function(array $context) { + return is_string($context['uid']); } ) )->shouldBeCalled(); $logger->info( "Received response:\n200 OK 1.1", Argument::that( - function(array $context) use ($request, $response) { - return $context['request'] === $request->getWrappedObject() - && $context['response'] === $response->getWrappedObject() - && is_int($context['milliseconds']) + function(array $context) { + return is_int($context['milliseconds']) && is_string($context['uid']) ; } @@ -81,19 +77,16 @@ function it_logs_exception(LoggerInterface $logger, Formatter $formatter, Reques $logger->info( "Sending request:\nGET / 1.1", Argument::that( - function(array $context) use ($request) { - return $context['request'] === $request->getWrappedObject() - && is_string($context['uid']) - ; + function(array $context) { + return is_string($context['uid']); } ) )->shouldBeCalled(); $logger->error( "Error:\nCannot connect\nwhen sending request:\nGET / 1.1", Argument::that( - function(array $context) use ($request, $exception) { - return $context['request'] === $request->getWrappedObject() - && $context['exception'] === $exception + function(array $context) use ($exception) { + return $context['exception'] === $exception && is_int($context['milliseconds']) && is_string($context['uid']) ; @@ -122,20 +115,16 @@ function it_logs_response_within_exception( $logger->info( "Sending request:\nGET / 1.1", Argument::that( - function(array $context) use ($request) { - return $context['request'] === $request->getWrappedObject() - && is_string($context['uid']) - ; + function(array $context) { + return is_string($context['uid']); } ) )->shouldBeCalled(); $logger->error( "Error:\nForbidden\nwith response:\n403 Forbidden 1.1", Argument::that( - function(array $context) use ($request, $response, $exception) { - return $context['request'] === $request->getWrappedObject() - && $context['response'] === $response->getWrappedObject() - && $context['exception'] === $exception + function(array $context) use ($exception) { + return $context['exception'] === $exception && is_int($context['milliseconds']) && is_string($context['uid']) ;