chore(dependencies): update sentry to v8, refactor code to view perfo…

…rmance hit
YappyBots · Nov 15, 2024 · 171c3d0 · 171c3d0
1 parent 20ad613
commit 171c3d0
Show file tree

Hide file tree

Showing 8 changed files with 1,424 additions and 151 deletions.
diff --git a/lib/GitHub/index.js b/lib/GitHub/index.js
@@ -4,7 +4,6 @@ const {
   createOAuthUserAuth,
 } = require('@octokit/auth-oauth-app');
 const pick = require('lodash/pick');
-const EventHandler = require('./EventHandler');
 const Constants = require('./Constants');
 const Log = require('../Util/Log');
 const redis = require('../Util/redis');

diff --git a/lib/Util/Log.js b/lib/Util/Log.js
@@ -1,7 +1,6 @@
 const winston = require('winston');
 const path = require('path');
 const util = require('util');
-const YappyGitHub = require('./YappyGitHub');
 
 const { MESSAGE } = require('triple-beam');
 const jsonStringify = require('fast-safe-stringify');
@@ -84,20 +83,7 @@ class Log {
 
     winston.addColors(this._colors);
 
-    if (process.env.SENTRY) {
-      const tracesSampleRate = Number(process.env.SENTRY_SAMPLE_RATE) || 0;
-
-      this.sentry = true;
-      Sentry.init({
-        dsn: process.env.SENTRY,
-        release: YappyGitHub.git.release,
-        environment:
-          process.env.NODE_ENV === 'production' ? 'production' : 'development',
-        integrations: [new Sentry.Integrations.Http({ tracing: true })],
-        tracesSampleRate,
-      });
-      this.info(`Sentry | Initialized (sample rate = ${tracesSampleRate})`);
-    }
+    this.sentry = !!process.env.SENTRY;
 
     this.error = this.error.bind(this);
     this.warn = this.warn.bind(this);
@@ -115,13 +101,17 @@ class Log {
     if (!error) return;
 
     if (this.sentry && !error.sentry) {
+      let eventId;
+
       if (error instanceof Error) {
-        error.sentry = Sentry.captureException(error);
+        eventId = Sentry.captureException(error);
       } else {
-        error.sentry = Sentry.captureMessage(
+        eventId = Sentry.captureMessage(
           typeof error === 'object' ? util.inspect(error) : error
         );
       }
+
+      if (typeof error === 'object') error.sentry = eventId;
     }
 
     if (error.name == 'DiscordAPIError') delete error.stack;
@@ -187,26 +177,11 @@ class Log {
 
   configureExpressInit(app) {
     if (this.sentry) {
-      Sentry.getCurrentHub().getClient().addIntegration(
-        new Sentry.Integrations.Express({
-          app,
-        })
-      );
-
-      app.use(Sentry.Handlers.requestHandler());
-      app.use(Sentry.Handlers.tracingHandler());
+      Sentry.setupExpressErrorHandler(app);
 
       this.info('Sentry | Express initialized');
     }
   }
-
-  configureExpressError(app) {
-    if (this.sentry) {
-      app.use(Sentry.Handlers.errorHandler());
-
-      this.info('Sentry | Express error handler initialized');
-    }
-  }
 }
 
 module.exports = new Log();
diff --git a/lib/Util/redis.js b/lib/Util/redis.js
@@ -2,7 +2,12 @@ const redis = require('redis');
 const Log = require('./Log');
 const client = redis.createClient(
   process.env.REDIS_HOST,
-  process.env.REDIS_HOST
+  process.env.REDIS_PORT,
+  {
+    socket: {
+      connectTimeout: 5000,
+    },
+  }
 );
 
 exports.get = (db, key) => client.get(`${db}:${key}`);

diff --git a/lib/Web/index.js b/lib/Web/index.js
@@ -492,8 +492,6 @@ app.use(function (req, res, next) {
   next(new NotFoundError());
 });
 
-Log.configureExpressError(app);
-
 app.use((err, req, res, next) => {
   const status = err?.status ?? (Number.isInteger(err) ? err : 500);
 

diff --git a/lib/index.js b/lib/index.js
@@ -1,15 +1,40 @@
 require('dotenv').config();
 
+require('./instrument');
+
 global.Log = require('./Util/Log');
 
-Log.info('Initializing');
+async function initialize() {
+  const components = [
+    { name: 'models', import: () => require('./Models') },
+    { name: 'github', import: () => require('./GitHub') },
+    { name: 'discord', import: () => require('./Discord') },
+    { name: 'web', import: () => require('./Web') },
+  ];
+
+  Log.info('* Initializing components...');
+
+  try {
+    for (const component of components) {
+      const startTime = process.hrtime();
+
+      try {
+        await Promise.resolve(component.import());
+        const [seconds, nanoseconds] = process.hrtime(startTime);
+        const ms = (seconds * 1000 + nanoseconds / 1e6).toFixed(2);
+        Log.info(`* Loaded ${component.name} (${ms}ms)`);
+      } catch (err) {
+        Log.error(`* Failed to load ${component.name}:`, err);
+        throw err; // Re-throw to stop initialization
+      }
+    }
 
-require('./Web');
-require('./Models');
-require('./Util');
-require('./Util/YappyGitHub');
-require('./Discord');
-require('./GitHub');
+    Log.info('* All components initialized successfully');
+  } catch (err) {
+    Log.error('* Initialization failed:', err);
+    process.exit(1);
+  }
+}
 
 const logUnhandled = (type) => (err) => {
   try {
@@ -23,3 +48,9 @@ const logUnhandled = (type) => (err) => {
 
 process.on('unhandledRejection', logUnhandled('Rejection'));
 process.on('uncaughtException', logUnhandled('Exception'));
+
+// Start initialization
+initialize().catch((err) => {
+  Log.error('Fatal initialization error:', err);
+  process.exit(1);
+});
diff --git a/lib/instrument.js b/lib/instrument.js
@@ -0,0 +1,24 @@
+const YappyGitHub = require('./Util/YappyGitHub');
+
+if (process.env.SENTRY) {
+  console.log(`Sentry | Initializing...`);
+
+  const Sentry = require('@sentry/node');
+  const tracesSampleRate = Number(process.env.SENTRY_SAMPLE_RATE) || 0;
+
+  Sentry.init({
+    dsn: process.env.SENTRY,
+    release: YappyGitHub.git.release,
+    environment:
+      process.env.NODE_ENV === 'production' ? 'production' : 'development',
+    integrations: [
+      Sentry.httpIntegration({ tracing: true }),
+      Sentry.expressIntegration(),
+    ],
+    tracesSampleRate,
+    autoSessionTracking: false,
+    defaultIntegrations: false,
+  });
+
+  console.log(`Sentry | Initialized (sample rate = ${tracesSampleRate})`);
+}