Merge pull request #1121 from M0rgan01/sentry-tags

Add new sentry tags
PrestaShop · Jan 20, 2025 · 8ae4a6a · 8ae4a6a
2 parents fe4bc6f + 38f6197
commit 8ae4a6a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/_dev/global.d.ts b/_dev/global.d.ts
@@ -6,6 +6,8 @@ interface AutoUpgradeVariables {
   admin_dir: string;
   stepper_parent_id: string;
   module_version: string;
+  php_version: string;
+  anonymous_id: string;
 }
 
 declare global {

diff --git a/_dev/jest.setup.ts b/_dev/jest.setup.ts
@@ -4,7 +4,9 @@ window.AutoUpgradeVariables = {
   admin_url: 'http://localhost',
   admin_dir: '/admin_directory',
   stepper_parent_id: 'stepper_content',
-  module_version: '7.1.0'
+  module_version: '7.1.0',
+  anonymous_id: 'b168a116d1a14fda8c21a22c7560fa27ade7dae22641ce9d773be680640dac0f',
+  php_version: '7.4.33'
 };
 
 beforeAll(() => {});
diff --git a/_dev/src/ts/api/sentryApi.ts b/_dev/src/ts/api/sentryApi.ts
@@ -70,7 +70,9 @@ export function sendUserFeedback(
     level,
     tags: {
       url: maskedUrl,
-      source: feedbackModalTag
+      source: feedbackModalTag,
+      phpVersion: window.AutoUpgradeVariables.php_version,
+      anonymousId: window.AutoUpgradeVariables.anonymous_id
     }
   });
 
@@ -85,7 +87,9 @@ export function sendUserFeedback(
         captureContext: {
           tags: {
             url: maskedUrl,
-            source: feedbackModalTag
+            source: feedbackModalTag,
+            phpVersion: window.AutoUpgradeVariables.php_version,
+            anonymousId: window.AutoUpgradeVariables.anonymous_id
           }
         }
       }

diff --git a/classes/Analytics.php b/classes/Analytics.php
@@ -164,4 +164,9 @@ private function hasOptedOut(): bool
         return isset($_SERVER[self::URL_TRACKING_ENV_NAME])
             && ((bool) $_SERVER[self::URL_TRACKING_ENV_NAME] === false || $_SERVER[self::URL_TRACKING_ENV_NAME] === 'false');
     }
+
+    public function getAnonymousId(): string
+    {
+        return $this->anonymousId;
+    }
 }
diff --git a/controllers/admin/AdminSelfUpgradeController.php b/controllers/admin/AdminSelfUpgradeController.php
@@ -31,6 +31,7 @@
 use PrestaShop\Module\AutoUpgrade\Tools14;
 use PrestaShop\Module\AutoUpgrade\UpgradeContainer;
 use PrestaShop\Module\AutoUpgrade\UpgradePage;
+use PrestaShop\Module\AutoUpgrade\VersionUtils;
 use Symfony\Component\HttpFoundation\Request;
 
 class AdminSelfUpgradeController extends ModuleAdminController
@@ -533,6 +534,8 @@ private function getScriptsVariables()
             'admin_dir' => $adminDir,
             'stepper_parent_id' => \PrestaShop\Module\AutoUpgrade\Twig\PageSelectors::STEPPER_PARENT_ID,
             'module_version' => $this->module->version,
+            'php_version' => VersionUtils::getHumanReadableVersionOf(PHP_VERSION_ID),
+            'anonymous_id' => $this->upgradeContainer->getAnalytics()->getAnonymousId(),
         ];
     }