From e73a11ad953cbfcd7debc4e7d971c7b3d46388ff Mon Sep 17 00:00:00 2001 From: "john.R" Date: Thu, 30 Sep 2021 16:13:22 +0200 Subject: [PATCH] feat: change sentry module --- _dev/package-lock.json | 131 ++++++++++++++++++ _dev/package.json | 2 + _dev/src/router/index.ts | 9 ++ _dev/src/views/debug.vue | 2 +- classes/Handler/ErrorHandler.php | 2 +- classes/config/Config.php | 3 +- ...AdminPsxMktgWithGoogleModuleController.php | 1 + 7 files changed, 147 insertions(+), 3 deletions(-) diff --git a/_dev/package-lock.json b/_dev/package-lock.json index 3a95d2fee..7d708508d 100644 --- a/_dev/package-lock.json +++ b/_dev/package-lock.json @@ -5894,6 +5894,137 @@ "any-observable": "^0.3.0" } }, + "@sentry/browser": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-6.13.2.tgz", + "integrity": "sha512-bkFXK4vAp2UX/4rQY0pj2Iky55Gnwr79CtveoeeMshoLy5iDgZ8gvnLNAz7om4B9OQk1u7NzLEa4IXAmHTUyag==", + "requires": { + "@sentry/core": "6.13.2", + "@sentry/types": "6.13.2", + "@sentry/utils": "6.13.2", + "tslib": "^1.9.3" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, + "@sentry/core": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-6.13.2.tgz", + "integrity": "sha512-snXNNFLwlS7yYxKTX4DBXebvJK+6ikBWN6noQ1CHowvM3ReFBlrdrs0Z0SsSFEzXm2S4q7f6HHbm66GSQZ/8FQ==", + "requires": { + "@sentry/hub": "6.13.2", + "@sentry/minimal": "6.13.2", + "@sentry/types": "6.13.2", + "@sentry/utils": "6.13.2", + "tslib": "^1.9.3" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, + "@sentry/hub": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-6.13.2.tgz", + "integrity": "sha512-sppSuJdNMiMC/vFm/dQowCBh11uTrmvks00fc190YWgxHshodJwXMdpc+pN61VSOmy2QA4MbQ5aMAgHzPzel3A==", + "requires": { + "@sentry/types": "6.13.2", + "@sentry/utils": "6.13.2", + "tslib": "^1.9.3" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, + "@sentry/minimal": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.13.2.tgz", + "integrity": "sha512-6iJfEvHzzpGBHDfLxSHcGObh73XU1OSQKWjuhDOe7UQDyI4BQmTfcXAC+Fr8sm8C/tIsmpVi/XJhs8cubFdSMw==", + "requires": { + "@sentry/hub": "6.13.2", + "@sentry/types": "6.13.2", + "tslib": "^1.9.3" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, + "@sentry/tracing": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-6.13.2.tgz", + "integrity": "sha512-bHJz+C/nd6biWTNcYAu91JeRilsvVgaye4POkdzWSmD0XoLWHVMrpCQobGpXe7onkp2noU3YQjhqgtBqPHtnpw==", + "requires": { + "@sentry/hub": "6.13.2", + "@sentry/minimal": "6.13.2", + "@sentry/types": "6.13.2", + "@sentry/utils": "6.13.2", + "tslib": "^1.9.3" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, + "@sentry/types": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-6.13.2.tgz", + "integrity": "sha512-6WjGj/VjjN8LZDtqJH5ikeB1o39rO1gYS6anBxiS3d0sXNBb3Ux0pNNDFoBxQpOhmdDHXYS57MEptX9EV82gmg==" + }, + "@sentry/utils": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-6.13.2.tgz", + "integrity": "sha512-foF4PbxqPMWNbuqdXkdoOmKm3quu3PP7Q7j/0pXkri4DtCuvF/lKY92mbY0V9rHS/phCoj+3/Se5JvM2ymh2/w==", + "requires": { + "@sentry/types": "6.13.2", + "tslib": "^1.9.3" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, + "@sentry/vue": { + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/@sentry/vue/-/vue-6.13.2.tgz", + "integrity": "sha512-gS1t6Nko3BulxPYyBLQW/NZ32plZlgIAyoWmZd1IYuZNXgEnHgdNnj6YNChurkQvnYD3wVMDBkLD9sh50NNsCQ==", + "requires": { + "@sentry/browser": "6.13.2", + "@sentry/core": "6.13.2", + "@sentry/minimal": "6.13.2", + "@sentry/types": "6.13.2", + "@sentry/utils": "6.13.2", + "tslib": "^1.9.3" + }, + "dependencies": { + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, "@soda/friendly-errors-webpack-plugin": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/@soda/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.8.0.tgz", diff --git a/_dev/package.json b/_dev/package.json index c67005f83..fd0cbfc11 100644 --- a/_dev/package.json +++ b/_dev/package.json @@ -18,6 +18,8 @@ "@googleapis/content": "^1.2.0", "@googleapis/oauth2": "^0.2.0", "@prestashopcorp/segment-vue": "^1.2.9", + "@sentry/tracing": "^6.13.2", + "@sentry/vue": "^6.13.2", "@vue/composition-api": "^1.2.1", "bootstrap": "^4.5.3", "bootstrap-vue": "^2.21.1", diff --git a/_dev/src/router/index.ts b/_dev/src/router/index.ts index d205a433d..8eaa85ee4 100644 --- a/_dev/src/router/index.ts +++ b/_dev/src/router/index.ts @@ -1,5 +1,6 @@ import Vue from 'vue'; import VueRouter, {RouteConfig} from 'vue-router'; +import * as Sentry from '@sentry/vue'; import Store from '../store'; import CampaignPage from '../views/campaign-page.vue'; import Configuration from '../views/configuration.vue'; @@ -103,4 +104,12 @@ const router = new VueRouter({ }, }); +Sentry.init({ + Vue, + // @ts-ignore + dsn: global.psxMktgWithGoogleDsnSentry, + tracesSampleRate: 1.0, + logErrors: true, +}); + export default router; diff --git a/_dev/src/views/debug.vue b/_dev/src/views/debug.vue index b9d5a9851..d09140721 100644 --- a/_dev/src/views/debug.vue +++ b/_dev/src/views/debug.vue @@ -266,7 +266,7 @@ export default { this.$store.dispatch('smartShoppingCampaigns/GET_REMARKETING_TRACKING_TAG_STATUS_MODULE'); this.$store.dispatch('smartShoppingCampaigns/GET_REMARKETING_CONVERSION_ACTIONS_ASSOCIATED'); this.$store.dispatch('app/REQUEST_DEBUG_DATA'); - throw new Error('coucou les zamis !'); + throw new Error('one error from mounted hook for testing'); }, }; diff --git a/classes/Handler/ErrorHandler.php b/classes/Handler/ErrorHandler.php index 5d8ffc1cc..d06eecfad 100755 --- a/classes/Handler/ErrorHandler.php +++ b/classes/Handler/ErrorHandler.php @@ -45,7 +45,7 @@ public function __construct() $module = Module::getInstanceByName('psxmarketingwithgoogle'); $this->client = new ModuleFilteredRavenClient( - Config::PSX_MKTG_WITH_GOOGLE_SENTRY_CREDENTIALS, + Config::PSX_MKTG_WITH_GOOGLE_SENTRY_CREDENTIALS_PHP, [ 'level' => 'warning', 'tags' => [ diff --git a/classes/config/Config.php b/classes/config/Config.php index dae8dfbb0..bb13b3fa9 100644 --- a/classes/config/Config.php +++ b/classes/config/Config.php @@ -39,7 +39,8 @@ class Config 'AdminPsgoogleshippingModule', ]; - const PSX_MKTG_WITH_GOOGLE_SENTRY_CREDENTIALS = 'https://446479f8bca645fa8838c1a5f99dceba@o298402.ingest.sentry.io/5949536'; + const PSX_MKTG_WITH_GOOGLE_SENTRY_CREDENTIALS_PHP = 'https://446479f8bca645fa8838c1a5f99dceba@o298402.ingest.sentry.io/5949536'; + const PSX_MKTG_WITH_GOOGLE_SENTRY_CREDENTIALS_VUE = 'https://6504c60594bd490eab93afa78f274e35@o298402.ingest.sentry.io/5984715'; const PSX_MKTG_WITH_GOOGLE_SEGMENT_API_KEY = 'RqYiLJKyoWv13t9aKxBvza6vsCsRpPpC'; const PSX_MKTG_WITH_GOOGLE_ACCOUNT_IS_LINKED = 'PSX_MKTG_WITH_GOOGLE_ACCOUNT_IS_LINKED'; diff --git a/controllers/admin/AdminPsxMktgWithGoogleModuleController.php b/controllers/admin/AdminPsxMktgWithGoogleModuleController.php index 4d3f4394d..6a1b04478 100644 --- a/controllers/admin/AdminPsxMktgWithGoogleModuleController.php +++ b/controllers/admin/AdminPsxMktgWithGoogleModuleController.php @@ -122,6 +122,7 @@ public function initContent() 'psxMktgWithGoogleModuleVersion' => $this->module->version, 'psxMktgWithGoogleOnProductionEnvironment' => $this->env->get('PSX_MKTG_WITH_GOOGLE_API_URL') === Config::PSX_MKTG_WITH_GOOGLE_API_URL, 'psxMktgWithGoogleSegmentId' => $this->env->get('PSX_MKTG_WITH_GOOGLE_SEGMENT_API_KEY'), + 'psxMktgWithGoogleDsnSentry' => $this->env->get('PSX_MKTG_WITH_GOOGLE_SENTRY_CREDENTIALS_VUE'), 'psxMktgWithGoogleApiUrl' => $this->env->get('PSX_MKTG_WITH_GOOGLE_API_URL'), 'psxMktgWithGoogleAdminUrl' => $this->context->link->getAdminLink('AdminPsxMktgWithGoogleModule'), 'psxMktgWithGoogleAdminAjaxUrl' => $this->context->link->getAdminLink(