Meta exception logging access token tweak (#505)

* Modifying persistLogToMeta function to take in accessToken param and use that for API call if present. Updates exception log handler to pass in this value.

* Adding necessary use statement.

---------

Co-authored-by: Noah Ostrowski <[email protected]>

Author: nrostrow-meta

app/code/Meta/BusinessExtension/Helper/FBEHelper.php

@@ -268,15 +268,17 @@ public function log($info, array $context = [])
             return;
         }
 
+        $extraData = ['timestamp' => time()];
+
         if (isset($context['store_id'])) {
+            $extraData['store_id'] = $context['store_id'];
             $context['commerce_merchant_settings_id'] = $this->systemConfig->getCommerceAccountId($context['store_id']);
         }
 
-        $timestamp = ['timestamp' => time()];
         if (isset($context['extra_data'])) {
-            $context['extra_data'] = array_merge($context['extra_data'], $timestamp);
+            $context['extra_data'] = array_merge($context['extra_data'], $extraData);
         } else {
-            $context['extra_data'] = $timestamp;
+            $context['extra_data'] = $extraData;
         }
         $this->logger->info($info, $context);
     }
@@ -313,19 +315,19 @@ public function logException(Throwable $e, array $context = [])
         $context['exception_message'] = $errorMessage;
         $context['exception_code'] = $e->getCode();
         $context['exception_trace'] = $exceptionTrace;
+        $context['seller_platform_app_version'] = $this->getMagentoVersion();
+
+        $extraData = ['extension_version' => $this->systemConfig->getModuleVersion()];
 
         if (isset($context['store_id'])) {
+            $extraData['store_id'] = $context['store_id'];
             $context['commerce_merchant_settings_id'] = $this->systemConfig->getCommerceAccountId($context['store_id']);
         }
 
-        $context['seller_platform_app_version'] = $this->getMagentoVersion();
-
-        // Add extension version to the extra data.
-        $extensionVersion = ['extension_version' => $this->systemConfig->getModuleVersion()];
         if (isset($context['extra_data'])) {
-            $context['extra_data'] = array_merge($context['extra_data'], $extensionVersion);
+            $context['extra_data'] = array_merge($context['extra_data'], $extraData);
         } else {
-            $context['extra_data'] = $extensionVersion;
+            $context['extra_data'] = $extraData;
         }
 
         $this->logger->error($errorMessage, $context);

app/code/Meta/BusinessExtension/Helper/GraphAPIAdapter.php

@@ -932,13 +932,14 @@ public function getFBEInstalls($accessToken, $externalBusinessId)
      * Persist log to Meta
      *
      * @param mixed[] $context
+     * @param null|string $accessToken
      * @return mixed
      * @throws GuzzleException
      */
-    public function persistLogToMeta($context)
+    public function persistLogToMeta($context, $accessToken = null)
     {
         $request = [
-            'access_token' => $this->accessToken,
+            'access_token' => $accessToken ?? $this->accessToken,
             'event' => $this->getContextData($context, 'event'),
             'event_type' => $this->getContextData($context, 'event_type'),
             'commerce_merchant_settings_id' => $this->getContextData($context, 'commerce_merchant_settings_id'),

app/code/Meta/BusinessExtension/Model/PersistMetaLogImmediatelyHandler.php

@@ -21,6 +21,7 @@
 namespace Meta\BusinessExtension\Model;
 
 use Meta\BusinessExtension\Helper\GraphAPIAdapter;
+use Meta\BusinessExtension\Model\System\Config as SystemConfig;
 
 class PersistMetaLogImmediatelyHandler
 {
@@ -30,15 +31,23 @@ class PersistMetaLogImmediatelyHandler
      */
     private $graphApiAdapter;
 
+    /**
+     * @var SystemConfig
+     */
+    private $systemConfig;
+
     /**
      * PersistMetaLogImmediatelyHandler constructor
      *
      * @param GraphAPIAdapter $graphAPIAdapter
+     * @param SystemConfig $systemConfig
      */
     public function __construct(
-        GraphAPIAdapter $graphAPIAdapter
+        GraphAPIAdapter $graphAPIAdapter,
+        SystemConfig $systemConfig
     ) {
         $this->graphApiAdapter = $graphAPIAdapter;
+        $this->systemConfig = $systemConfig;
     }
 
     /**
@@ -49,6 +58,10 @@ public function __construct(
     public function persistMetaLogImmediately(string $message)
     {
         $context = json_decode($message, true);
-        $this->graphApiAdapter->persistLogToMeta($context);
+        $accessToken = null;
+        if ($context['store_id']) {
+            $accessToken = $this->systemConfig->getAccessToken($context['store_id']);
+        }
+        $this->graphApiAdapter->persistLogToMeta($context, $accessToken);
     }
 }

app/code/Meta/BusinessExtension/Model/PersistMetaTelemetryLogsHandler.php

@@ -48,6 +48,7 @@ public function __construct(
      */
     public function persistMetaTelemetryLogs(string $messages)
     {
+        $telemetryContext = [];
         $telemetryContext['event'] = 'persist_meta_telemetry_logs';
         $telemetryContext['extra_data']['telemetry_logs'] = $messages;
         $this->graphApiAdapter->persistLogToMeta($telemetryContext);

app/code/Meta/Catalog/Cron/LogCatalogSetup.php

@@ -93,30 +93,33 @@ public function execute()
                     continue;
                 }
 
-                $this->graphAPIAdapter->persistLogToMeta([
-                    'event' => 'log_catalog_setup_data',
-                    'event_type' => 'log_catalog_setup',
-                    'catalog_id' => $this->systemConfig->getCatalogId($storeId),
-                    'commerce_merchant_settings_id' => $this->systemConfig->getCommerceAccountId($storeId),
-                    'extra_data' => [
-                        'items' => json_encode(
-                            [
-                                'item_count' => $this->queryItemCount(),
-                                'group_count' => $this->queryGroupCount(),
-                                'breakdown' => $this->queryBreakdown(),
-                            ]
-                        ),
-                        'extensions' => self::$logInstalledModules
+                $this->graphAPIAdapter->persistLogToMeta(
+                    [
+                        'event' => 'log_catalog_setup_data',
+                        'event_type' => 'log_catalog_setup',
+                        'catalog_id' => $this->systemConfig->getCatalogId($storeId),
+                        'commerce_merchant_settings_id' => $this->systemConfig->getCommerceAccountId($storeId),
+                        'extra_data' => [
+                            'items' => json_encode(
+                                [
+                                    'item_count' => $this->queryItemCount(),
+                                    'group_count' => $this->queryGroupCount(),
+                                    'breakdown' => $this->queryBreakdown(),
+                                ]
+                            ),
+                            'extensions' => self::$logInstalledModules
                                 ? json_encode($this->fullModuleList->getAll())
                                 : null
-                            ]
-                    ]);
+                        ]
+                    ],
+                    $accessToken
+                );
             } catch (\Exception $e) {
-                    $this->fbeHelper->logExceptionImmediatelyToMeta($e, [
+                $this->fbeHelper->logExceptionImmediatelyToMeta($e, [
                     'store_id' => $storeId,
                     'event' => 'log_catalog_setup_cron_exception',
                     'event_type' => 'log_catalog_setup'
-                    ]);
+                ]);
             }
         }
     }