PW-7129: Remove full request/response logging (#1712)

* PW-7129: Remove full request/response logging Add new log processors to help with troubleshooting. * PW-7129: Use context placeholders
Adyen · Sep 15, 2022 · a5f3ee2 · a5f3ee2
1 parent 784ae80
commit a5f3ee2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -1496,8 +1496,6 @@ public function initializeAdyenClient($storeId = null, $apiKey = null, $motoMerc
             $client->setEnvironment(\Adyen\Environment::LIVE, $this->getLiveEndpointPrefix($storeId));
         }
 
-        $client->setLogger($this->adyenLogger);
-
         return $client;
     }
 

diff --git a/Helper/Webhook.php b/Helper/Webhook.php
@@ -162,7 +162,7 @@ public function processNotification(Notification $notification): bool
             $currentState = $this->getCurrentState($this->order->getState());
             if (!$currentState) {
                 $this->logger->addAdyenNotification(
-                    sprintf("ERROR: Unhandled order state '%s'.", $this->order->getState()),
+                    "ERROR: Unhandled order state '{orderState}'",
                     $this->logger->getOrderContext($this->order)
                 );
                 return false;

diff --git a/Helper/Webhook/CaptureWebhookHandler.php b/Helper/Webhook/CaptureWebhookHandler.php
@@ -105,7 +105,7 @@ public function handleWebhook(MagentoOrder $order, Notification $notification, s
 
             $magentoInvoice = $this->magentoInvoiceFactory->create()->load($adyenInvoice->getInvoiceId(), MagentoInvoice::ENTITY_ID);
             $this->adyenLogger->addAdyenNotification(
-                sprintf('Notification %s updated invoice %s.', $notification->getEntityId(), $magentoInvoice->getEntityid()),
+                sprintf('Notification %s updated invoice {invoiceId}', $notification->getEntityId()),
                 $this->adyenLogger->getInvoiceContext($magentoInvoice)
             );
 

diff --git a/Observer/InvoiceObserver.php b/Observer/InvoiceObserver.php
@@ -104,7 +104,7 @@ public function execute(Observer $observer)
 
 
         $this->logger->addAdyenDebug(
-            sprintf('Event sales_order_invoice_save_after for invoice %s will be handled', $invoice->getEntityId()),
+            'Event sales_order_invoice_save_after for invoice {invoiceId} will be handled',
             array_merge($this->logger->getInvoiceContext($invoice), $this->logger->getOrderContext($order))
         );
 
@@ -134,7 +134,7 @@ public function execute(Observer $observer)
         $order->setStatus($status);
 
         $this->logger->addAdyenDebug(
-            sprintf('Event sales_order_invoice_save_after for invoice %s was handled', $invoice->getEntityId()),
+            'Event sales_order_invoice_save_after for invoice {invoiceId} was handled',
             array_merge($this->logger->getInvoiceContext($invoice), $this->logger->getOrderContext($order))
         );
     }

diff --git a/etc/di.xml b/etc/di.xml
@@ -958,6 +958,10 @@
                 <item name="adyenError" xsi:type="object">Adyen\Payment\Logger\Handler\AdyenError</item>
                 <item name="adyenWarning" xsi:type="object">Adyen\Payment\Logger\Handler\AdyenWarning</item>
             </argument>
+            <argument name="processors" xsi:type="array">
+                <item name="uid" xsi:type="object">Monolog\Processor\UidProcessor</item>
+                <item name="psr3" xsi:type="object">Monolog\Processor\PsrLogMessageProcessor</item>
+            </argument>
         </arguments>
     </type>
     <type name="Adyen\Payment\Model\Config\Reader">