From 96a821a2ac91c21e6e14aaf3c6d61e64a5378750 Mon Sep 17 00:00:00 2001 From: Mrugesh Mohapatra <1884376+raisedadead@users.noreply.github.com> Date: Tue, 14 Feb 2023 20:20:01 +0530 Subject: [PATCH] revert(tools): sentry apm and other telemetry (#49383) Revert "feat(tools): sentry apm and other telemetry (#49230)" This reverts commit b4fa56be3ed7cc940b4686814b611bb185ce21cb. --- api-server/package.json | 3 +- api-server/src/server/index.js | 21 +--- package-lock.json | 174 +++------------------------------ 3 files changed, 17 insertions(+), 181 deletions(-) diff --git a/api-server/package.json b/api-server/package.json index f01fec9df07..8b2b9214fea 100644 --- a/api-server/package.json +++ b/api-server/package.json @@ -29,8 +29,7 @@ }, "dependencies": { "@freecodecamp/loopback-component-passport": "1.2.0", - "@sentry/node": "7.37.1", - "@sentry/tracing": "7.37.1", + "@sentry/node": "6.19.7", "accepts": "1.3.8", "axios": "0.23.0", "bad-words": "3.0.4", diff --git a/api-server/src/server/index.js b/api-server/src/server/index.js index 347cb159547..6c350cf2cfb 100644 --- a/api-server/src/server/index.js +++ b/api-server/src/server/index.js @@ -2,7 +2,6 @@ const path = require('path'); require('dotenv').config({ path: path.resolve(__dirname, '../../../.env') }); const Sentry = require('@sentry/node'); -const Tracing = require('@sentry/tracing'); const createDebugger = require('debug'); const _ = require('lodash'); const loopback = require('loopback'); @@ -15,32 +14,16 @@ const { setupPassport } = require('./component-passport'); const log = createDebugger('fcc:server'); const reqLogFormat = ':date[iso] :status :method :response-time ms - :url'; -const app = loopback(); - if (sentry.dsn === 'dsn_from_sentry_dashboard') { log('Sentry reporting disabled unless DSN is provided.'); } else { Sentry.init({ - dsn: sentry.dsn, - integrations: [ - new Sentry.Integrations.Http({ tracing: true }), - new Tracing.Integrations.Express({ - app - }) - ], - // Capture 20% of transactions to avoid - // overwhelming Sentry and remain within - // the usage quota - tracesSampleRate: 0.2 + dsn: sentry.dsn }); log('Sentry initialized'); } -// RequestHandler creates a separate execution context using domains, so that every -// transaction/span/breadcrumb is attached to its own Hub instance -app.use(Sentry.Handlers.requestHandler()); -// TracingHandler creates a trace for every incoming request -app.use(Sentry.Handlers.tracingHandler()); +const app = loopback(); app.set('state namespace', '__fcc__'); app.set('port', process.env.API_PORT || 3000); diff --git a/package-lock.json b/package-lock.json index 342aa194961..029adbb8865 100644 --- a/package-lock.json +++ b/package-lock.json @@ -114,8 +114,7 @@ "license": "BSD-3-Clause", "dependencies": { "@freecodecamp/loopback-component-passport": "1.2.0", - "@sentry/node": "7.37.1", - "@sentry/tracing": "7.37.1", + "@sentry/node": "6.19.7", "accepts": "1.3.8", "axios": "0.23.0", "bad-words": "3.0.4", @@ -5276,53 +5275,20 @@ } }, "node_modules/@sentry/node": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz", - "integrity": "sha512-nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA==", + "version": "6.19.7", + "license": "BSD-3-Clause", "dependencies": { - "@sentry/core": "7.37.1", - "@sentry/types": "7.37.1", - "@sentry/utils": "7.37.1", + "@sentry/core": "6.19.7", + "@sentry/hub": "6.19.7", + "@sentry/types": "6.19.7", + "@sentry/utils": "6.19.7", "cookie": "^0.4.1", "https-proxy-agent": "^5.0.0", "lru_map": "^0.3.3", "tslib": "^1.9.3" }, "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/node/node_modules/@sentry/core": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz", - "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==", - "dependencies": { - "@sentry/types": "7.37.1", - "@sentry/utils": "7.37.1", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/node/node_modules/@sentry/types": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz", - "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug==", - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/node/node_modules/@sentry/utils": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz", - "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==", - "dependencies": { - "@sentry/types": "7.37.1", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=8" + "node": ">=6" } }, "node_modules/@sentry/react": { @@ -5343,53 +5309,6 @@ "react": "15.x || 16.x || 17.x || 18.x" } }, - "node_modules/@sentry/tracing": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.37.1.tgz", - "integrity": "sha512-3mQG2XtMCGqDkgfzhKpRJAIfRaokNAOF8WafgAmFmZQwEDsRAFjZ3pLoO+KiBUeQE5E5et7HyWBOl9rqHCkWnQ==", - "dependencies": { - "@sentry/core": "7.37.1", - "@sentry/types": "7.37.1", - "@sentry/utils": "7.37.1", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/tracing/node_modules/@sentry/core": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz", - "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==", - "dependencies": { - "@sentry/types": "7.37.1", - "@sentry/utils": "7.37.1", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/tracing/node_modules/@sentry/types": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz", - "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug==", - "engines": { - "node": ">=8" - } - }, - "node_modules/@sentry/tracing/node_modules/@sentry/utils": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz", - "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==", - "dependencies": { - "@sentry/types": "7.37.1", - "tslib": "^1.9.3" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@sentry/types": { "version": "6.19.7", "license": "BSD-3-Clause", @@ -55761,8 +55680,7 @@ "@babel/preset-env": "7.18.0", "@babel/register": "7.17.7", "@freecodecamp/loopback-component-passport": "1.2.0", - "@sentry/node": "7.37.1", - "@sentry/tracing": "7.37.1", + "@sentry/node": "6.19.7", "accepts": "1.3.8", "axios": "0.23.0", "babel-core": "7.0.0-bridge.0", @@ -57747,43 +57665,16 @@ } }, "@sentry/node": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/node/-/node-7.37.1.tgz", - "integrity": "sha512-nGerngIo5JwinJgl7m0SaL/xI+YRBlhb53gbkuLSAAcnoitBFzbp7LjywsqYFTWuWDIyk7O2t124GNxtolBAgA==", + "version": "6.19.7", "requires": { - "@sentry/core": "7.37.1", - "@sentry/types": "7.37.1", - "@sentry/utils": "7.37.1", + "@sentry/core": "6.19.7", + "@sentry/hub": "6.19.7", + "@sentry/types": "6.19.7", + "@sentry/utils": "6.19.7", "cookie": "^0.4.1", "https-proxy-agent": "^5.0.0", "lru_map": "^0.3.3", "tslib": "^1.9.3" - }, - "dependencies": { - "@sentry/core": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz", - "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==", - "requires": { - "@sentry/types": "7.37.1", - "@sentry/utils": "7.37.1", - "tslib": "^1.9.3" - } - }, - "@sentry/types": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz", - "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug==" - }, - "@sentry/utils": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz", - "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==", - "requires": { - "@sentry/types": "7.37.1", - "tslib": "^1.9.3" - } - } } }, "@sentry/react": { @@ -57797,43 +57688,6 @@ "tslib": "^1.9.3" } }, - "@sentry/tracing": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.37.1.tgz", - "integrity": "sha512-3mQG2XtMCGqDkgfzhKpRJAIfRaokNAOF8WafgAmFmZQwEDsRAFjZ3pLoO+KiBUeQE5E5et7HyWBOl9rqHCkWnQ==", - "requires": { - "@sentry/core": "7.37.1", - "@sentry/types": "7.37.1", - "@sentry/utils": "7.37.1", - "tslib": "^1.9.3" - }, - "dependencies": { - "@sentry/core": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.37.1.tgz", - "integrity": "sha512-eS5hoFDjAOl7POZg6K77J0oiypiqR1782oVSB49UkjK+D8tCZzZ5PxPMv0b/O0310p7x4oZ3WGRJaWEN3vY4KQ==", - "requires": { - "@sentry/types": "7.37.1", - "@sentry/utils": "7.37.1", - "tslib": "^1.9.3" - } - }, - "@sentry/types": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.37.1.tgz", - "integrity": "sha512-c2HWyWSgVA0V4+DSW2qVb0yjftrb1X/q2CzCom+ayjGHO72qyWC+9Tc+7ZfotU1mapRjqUWBgkXkbGmao8N8Ug==" - }, - "@sentry/utils": { - "version": "7.37.1", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.37.1.tgz", - "integrity": "sha512-/4mJOyDsfysx+5TXyJgSI+Ihw2/0EVJbrHjCyXPDXW5ADwbtU8VdBZ0unOmF0hk4QfftqwM9cyEu3BN4iBJsEA==", - "requires": { - "@sentry/types": "7.37.1", - "tslib": "^1.9.3" - } - } - } - }, "@sentry/types": { "version": "6.19.7" },