From 8a8f1f83c7b2bdb884b68d8d6ab3f8d35513cb80 Mon Sep 17 00:00:00 2001 From: Abhinav-grd Date: Fri, 18 Jun 2021 14:59:46 +0530 Subject: [PATCH] enable sentry tunneling --- package.json | 2 +- sentry.client.config.js | 4 +- src/utils/common/apiUtil.ts | 5 ++ yarn.lock | 154 ++++++++++++++++++------------------ 4 files changed, 86 insertions(+), 79 deletions(-) diff --git a/package.json b/package.json index 78962a4bd..a7dc1a6bc 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "postinstall": "husky install" }, "dependencies": { - "@sentry/nextjs": "^6.5.1", + "@sentry/nextjs": "^6.7.1", "@ente-io/next-with-workbox": "^1.0.3", "@stripe/stripe-js": "^1.13.2", "@typescript-eslint/eslint-plugin": "^4.25.0", diff --git a/sentry.client.config.js b/sentry.client.config.js index 6b1e89086..0f607c016 100644 --- a/sentry.client.config.js +++ b/sentry.client.config.js @@ -1,13 +1,15 @@ import * as Sentry from '@sentry/nextjs'; +import { getSentryTunnelUrl } from 'utils/common/apiUtil'; const SENTRY_DSN = process.env.NEXT_PUBLIC_SENTRY_DSN ?? 'https://860186db60c54c7fbacfe255124958e8@errors.ente.io/4'; const SENTRY_ENV = process.env.NEXT_PUBLIC_SENTRY_ENV ?? 'development'; Sentry.init({ dsn: SENTRY_DSN, enabled: SENTRY_ENV !== 'development', + environment: SENTRY_ENV, release: process.env.SENTRY_RELEASE, attachStacktrace: true, - autoSessionTracking: false, + tunnel: getSentryTunnelUrl(), // ... // Note: if you want to override the automatic release value, do not set a // `release` value here - use the environment variable `SENTRY_RELEASE`, so diff --git a/src/utils/common/apiUtil.ts b/src/utils/common/apiUtil.ts index 6aff7c32d..f19395829 100644 --- a/src/utils/common/apiUtil.ts +++ b/src/utils/common/apiUtil.ts @@ -16,3 +16,8 @@ export const getThumbnailUrl = (id: number) => { } return `https://thumbnails.ente.workers.dev/?fileID=${id}`; }; + + +export const getSentryTunnelUrl = () => { + return `https://sentry-reporter.ente.workers.dev`; +}; diff --git a/yarn.lock b/yarn.lock index 91235ae0a..41ec984c2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1175,14 +1175,14 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@sentry/browser@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.5.1.tgz#9a6ed5607b3b0f4e83f38720e3e202906f8c5bdb" - integrity sha512-iVLCdEFwsoWAzE/hNknexPQjjDpMQV7mmaq9Z1P63bD6MfhwVTx4hG4pHn8HEvC38VvCVf1wv0v/LxtoODAYXg== +"@sentry/browser@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.7.1.tgz#e01144a08984a486ecc91d7922cc457e9c9bd6b7" + integrity sha512-R5PYx4TTvifcU790XkK6JVGwavKaXwycDU0MaAwfc4Vf7BLm5KCNJCsDySu1RPAap/017MVYf54p6dWvKiRviA== dependencies: - "@sentry/core" "6.5.1" - "@sentry/types" "6.5.1" - "@sentry/utils" "6.5.1" + "@sentry/core" "6.7.1" + "@sentry/types" "6.7.1" + "@sentry/utils" "6.7.1" tslib "^1.9.3" "@sentry/cli@^1.63.1": @@ -1197,108 +1197,108 @@ progress "^2.0.3" proxy-from-env "^1.1.0" -"@sentry/core@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.5.1.tgz#c8b6c3ed86ed07b193c95d599c1b9a4a161e500e" - integrity sha512-Mh3sl/iUOT1myHmM6RlDy2ARzkUClx/g4DAt1rJ/IpQBOlDYQraplXSIW80i/hzRgQDfwhwgf4wUa5DicKBjKw== +"@sentry/core@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.7.1.tgz#c3aaa6415d06bec65ac446b13b84f073805633e3" + integrity sha512-VAv8OR/7INn2JfiLcuop4hfDcyC7mfL9fdPndQEhlacjmw8gRrgXjR7qyhnCTgzFLkHI7V5bcdIzA83TRPYQpA== dependencies: - "@sentry/hub" "6.5.1" - "@sentry/minimal" "6.5.1" - "@sentry/types" "6.5.1" - "@sentry/utils" "6.5.1" + "@sentry/hub" "6.7.1" + "@sentry/minimal" "6.7.1" + "@sentry/types" "6.7.1" + "@sentry/utils" "6.7.1" tslib "^1.9.3" -"@sentry/hub@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.5.1.tgz#135ef09d07d32e87a53f664c0ae8fcc4f5963519" - integrity sha512-lBRMBVMYP8B4PfRiM70murbtJAXiIAao/asDEMIRNGMP6pI2ArqXfJCBYDkStukhikYD0Kqb4trXq+JYF07Hbg== +"@sentry/hub@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.7.1.tgz#d46d24deec67f0731a808ca16796e6765b371bc1" + integrity sha512-eVCTWvvcp6xa0A5GGNHMQEWslmKPlisE5rGmsV/kjvSUv3zSrI0eIDfb51ikdnCiBjHpK2NBWP8Vy8cZOEJegg== dependencies: - "@sentry/types" "6.5.1" - "@sentry/utils" "6.5.1" + "@sentry/types" "6.7.1" + "@sentry/utils" "6.7.1" tslib "^1.9.3" -"@sentry/integrations@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.5.1.tgz#e7016f3023a98e2ef893daba18ba74bd8d62654b" - integrity sha512-NYiW0rH7fwv7aRtrRnfCSIiwulfV2NoLjhmghCONsyo10DNtYmOpogLotCytZFWLDnTJW1+pmTomq8UW/OSTcQ== +"@sentry/integrations@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-6.7.1.tgz#9a6723e35589dfdb13c2cd22259184946f0b275e" + integrity sha512-nWxAPTunZxE+E6bi4FyhKHXcUUVpbSpvtwvdHiw/K72p7FuX/K0qU002Ltdfs4U1nyMIjesE776IGMrBLU67uA== dependencies: - "@sentry/types" "6.5.1" - "@sentry/utils" "6.5.1" + "@sentry/types" "6.7.1" + "@sentry/utils" "6.7.1" localforage "^1.8.1" tslib "^1.9.3" -"@sentry/minimal@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.5.1.tgz#b8c1b382c2ea788eec3d32d203e5081b00eb6838" - integrity sha512-q9Do/oreu1RP695CXCLowVDuQyk7ilE6FGdz2QLpTXAfx8247qOwk6+zy9Kea/Djk93+BoSDVQUSneNiVwl0nQ== +"@sentry/minimal@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.7.1.tgz#babf85ee2f167e9dcf150d750d7a0b250c98449c" + integrity sha512-HDDPEnQRD6hC0qaHdqqKDStcdE1KhkFh0RCtJNMCDn0zpav8Dj9AteF70x6kLSlliAJ/JFwi6AmQrLz+FxPexw== dependencies: - "@sentry/hub" "6.5.1" - "@sentry/types" "6.5.1" + "@sentry/hub" "6.7.1" + "@sentry/types" "6.7.1" tslib "^1.9.3" -"@sentry/nextjs@^6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/nextjs/-/nextjs-6.5.1.tgz#a16d5b01ec46b853fc540ac081e83458461e9b43" - integrity sha512-cuSGvK8iCA9Nfakj5k903POE4kLSYWLLfjEfaP3CdfXD5KyZL6xhxvFJoZfq8mQT8dDLH4QArTpSIbUtic3meg== +"@sentry/nextjs@^6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/nextjs/-/nextjs-6.7.1.tgz#af103b91feba894a3e0a0beab29b6027d17d9e80" + integrity sha512-TQjTbgvvFOinCKJRmC0q1jEhn5A+pUR5wIz8ERITL5afU2DzzQvdci2lvgm1FPwGdD4j7Mom5Hz4vwClzeyceQ== dependencies: - "@sentry/core" "6.5.1" - "@sentry/integrations" "6.5.1" - "@sentry/node" "6.5.1" - "@sentry/react" "6.5.1" - "@sentry/tracing" "6.5.1" - "@sentry/utils" "6.5.1" + "@sentry/core" "6.7.1" + "@sentry/integrations" "6.7.1" + "@sentry/node" "6.7.1" + "@sentry/react" "6.7.1" + "@sentry/tracing" "6.7.1" + "@sentry/utils" "6.7.1" "@sentry/webpack-plugin" "1.15.0" tslib "^1.9.3" -"@sentry/node@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.5.1.tgz#a572b380858de5aeaf98eade6d8d3afcba13d364" - integrity sha512-Yh8J/QJ5e8gRBVL9VLCDpUvmiaxsxVZm0CInPHw3V/smgMkrzSKEiqxSeMq8ImPlaJrCFECqdpv4gnvYKI+mQQ== +"@sentry/node@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/node/-/node-6.7.1.tgz#b09e2eca8e187168feba7bd865a23935bf0f5cc0" + integrity sha512-rtZo1O8ROv4lZwuljQz3iFZW89oXSlgXCG2VqkxQyRspPWu89abROpxLjYzsWwQ8djnur1XjFv51kOLDUTS6Qw== dependencies: - "@sentry/core" "6.5.1" - "@sentry/hub" "6.5.1" - "@sentry/tracing" "6.5.1" - "@sentry/types" "6.5.1" - "@sentry/utils" "6.5.1" + "@sentry/core" "6.7.1" + "@sentry/hub" "6.7.1" + "@sentry/tracing" "6.7.1" + "@sentry/types" "6.7.1" + "@sentry/utils" "6.7.1" cookie "^0.4.1" https-proxy-agent "^5.0.0" lru_map "^0.3.3" tslib "^1.9.3" -"@sentry/react@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.5.1.tgz#1c7019fc3d8b1168c1ab8936cb65971b314d060d" - integrity sha512-YeGi7FzInhMZQxiy5fKqb7kS6W+u4NfsjzsVV3bLjJ1kiVtbpzZ2gs+ObHqW3zVE622V4nL7A4P8/CBHbcm5PA== +"@sentry/react@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/react/-/react-6.7.1.tgz#7d69b9509ee1c08fd20f41b2bd3452f061524c83" + integrity sha512-kLswcfwkq+Pv4ZAQ0Tq1X3PUx0t/glD3kRRSQ0ZGn4zdQWhkTkIaVeSrxfU+K9nwZisVEAVXtMJadk4X2KNySA== dependencies: - "@sentry/browser" "6.5.1" - "@sentry/minimal" "6.5.1" - "@sentry/types" "6.5.1" - "@sentry/utils" "6.5.1" + "@sentry/browser" "6.7.1" + "@sentry/minimal" "6.7.1" + "@sentry/types" "6.7.1" + "@sentry/utils" "6.7.1" hoist-non-react-statics "^3.3.2" tslib "^1.9.3" -"@sentry/tracing@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.5.1.tgz#a5f3e497d4f1f319f36475df050e135cf65af750" - integrity sha512-y1W/xFC2hAuKqSuuaovkElHY4pbli3XoXrreesg8PtO7ilX6ZbatOQbHsEsHQyoUv0F6aVA+MABOxWH2jt7tfw== +"@sentry/tracing@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-6.7.1.tgz#b11f0c17a6c5dc14ef44733e5436afb686683268" + integrity sha512-wyS3nWNl5mzaC1qZ2AIp1hjXnfO9EERjMIJjCihs2LWBz1r3efxrHxJHs8wXlNWvrT3KLhq/7vvF5CdU82uPeQ== dependencies: - "@sentry/hub" "6.5.1" - "@sentry/minimal" "6.5.1" - "@sentry/types" "6.5.1" - "@sentry/utils" "6.5.1" + "@sentry/hub" "6.7.1" + "@sentry/minimal" "6.7.1" + "@sentry/types" "6.7.1" + "@sentry/utils" "6.7.1" tslib "^1.9.3" -"@sentry/types@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.5.1.tgz#0a34ecfd1ae9275a416a105640eb4bed45a46a1d" - integrity sha512-b/7a6CMoytaeFPx4IBjfxPw3nPvsQh7ui1C8Vw0LxNNDgBwVhPLzUOWeLWbo5YZCVbGEMIWwtCUQYWxneceZSA== +"@sentry/types@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.7.1.tgz#c8263e1886df5e815570c4668eb40a1cfaa1c88b" + integrity sha512-9AO7HKoip2MBMNQJEd6+AKtjj2+q9Ze4ooWUdEvdOVSt5drg7BGpK221/p9JEOyJAZwEPEXdcMd3VAIMiOb4MA== -"@sentry/utils@6.5.1": - version "6.5.1" - resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.5.1.tgz#046baf7d1a6564d6d555437ad3674dba9bc0806a" - integrity sha512-Wv86JYGQH+ZJ5XGFQX7h6ijl32667ikenoL9EyXMn8UoOYX/MLwZoQZin1P60wmKkYR9ifTNVmpaI9OoTaH+UQ== +"@sentry/utils@6.7.1": + version "6.7.1" + resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.7.1.tgz#909184ad580f0f6375e1e4d4a6ffd33dfe64a4d1" + integrity sha512-Tq2otdbWlHAkctD+EWTYKkEx6BL1Qn3Z/imkO06/PvzpWvVhJWQ5qHAzz5XnwwqNHyV03KVzYB6znq1Bea9HuA== dependencies: - "@sentry/types" "6.5.1" + "@sentry/types" "6.7.1" tslib "^1.9.3" "@sentry/webpack-plugin@1.15.0":