Fixed tracing prod

build.js

@@ -43,6 +43,7 @@ const out = esbuild.buildSync({
   banner: { js: `/* 2022-${start.getFullYear()} © zhiyan114 GPLv3 UwU | Build: ${commitHash} */` },
   outdir: "dist",
 });
+
 if(out.errors.length > 0)
   console.error(`Build Failed: ${JSON.stringify(out.errors)}`);
 const end = Date.now();

package.json

@@ -2,7 +2,7 @@
   "dependencies": {
     "@discordjs/rest": "^2.0.0",
     "@prisma/client": "^5.0.0",
-    "@sentry/node": "^8.0.0",
+    "@sentry/node": "^8.32.0",
     "axios": "^1.1.2",
     "bufferutil": "^4.0.6",
     "canvas": "^2.11.2",

src/commands/discord/getPoints.ts

@@ -1,4 +1,4 @@
-import { ApplicationCommandType, ContextMenuCommandBuilder, EmbedBuilder, UserContextMenuCommandInteraction } from "discord.js";
+import { ContextMenuCommandBuilder, EmbedBuilder, UserContextMenuCommandInteraction } from "discord.js";
 import { DiscordClient } from "../../core/DiscordClient";
 import { baseCommand } from "../../core/baseCommand";
 import { DiscordUser } from "../../utils/DiscordUser";
@@ -16,7 +16,7 @@ export class getPointsCommand extends baseCommand {
     this.client = client;
     this.metadata = new ContextMenuCommandBuilder()
       .setName("getpoints")
-      .setType(ApplicationCommandType.User);
+      .setType(2); // Workaround for ApplicationCommandType.User since it's throwing type error despite being correct??
   }
 
   public async execute(interaction: UserContextMenuCommandInteraction) {

src/core/DiscordClient.ts

@@ -62,7 +62,8 @@ export class DiscordClient extends Client implements baseClient {
     this.logger = new eventLogger(this);
     this.redis = new Redis((process.env["ISDOCKER"] && !process.env["REDIS_CONN"]) ?
       "redis://redis:6379" : process.env["REDIS_CONN"] ?? "", {
-      keyPrefix: `${this.config.redisPrefix}:`
+      keyPrefix: `${this.config.redisPrefix}:`,
+      enableReadyCheck: false,
     });
     this.prisma = new PrismaClient({
       errorFormat: "minimal"

src/events/discordEvents.ts

@@ -8,6 +8,7 @@ import { APIErrors } from "../utils/discordErrorCode";
 import { captureException, withScope } from "@sentry/node";
 import { BannerPic } from "../utils/bannerGen";
 import { Prisma } from "@prisma/client";
+import { randomBytes } from "crypto";
 
 export class DiscordEvents extends baseEvent {
   client: DiscordClient;
@@ -40,6 +41,12 @@ export class DiscordEvents extends baseEvent {
 
   private async createCommand(interaction: Interaction) {
     await withScope(async (scope) => {
+      scope.setTransactionName("Discord Interaction Handler");
+      scope.setPropagationContext({
+        traceId: randomBytes(16).toString("hex"),
+        spanId: randomBytes(16).toString("hex"),
+      });
+
       const gMember = interaction.member as GuildMember | null;
       scope.setUser({
         id: interaction.user.id,
@@ -52,6 +59,7 @@ export class DiscordEvents extends baseEvent {
 
       if(interaction.isCommand() || interaction.isContextMenuCommand())
         return await this.commandHandler.commandEvent(interaction);
+
 
       if(interaction.isButton())
         if(interaction.customId === "RuleConfirm")
@@ -61,6 +69,10 @@ export class DiscordEvents extends baseEvent {
 
   private async messageCreate(message: Message) {
     await withScope(async (scope) => {
+      scope.setPropagationContext({
+        traceId: randomBytes(16).toString("hex"),
+        spanId: randomBytes(16).toString("hex"),
+      });
       scope.setUser({
         id: message.author.id,
         username: message.author.username,
@@ -87,6 +99,10 @@ export class DiscordEvents extends baseEvent {
 
   private async guildMemberAdd(member: GuildMember) {
     await withScope(async (scope) => {
+      scope.setPropagationContext({
+        traceId: randomBytes(16).toString("hex"),
+        spanId: randomBytes(16).toString("hex"),
+      });
       scope.setUser({
         id: member.user.id,
         username: member.user.username,
@@ -132,6 +148,10 @@ export class DiscordEvents extends baseEvent {
 
   private async userUpdate(oldUser: User | PartialUser, newUser: User) {
     await withScope(async (scope) => {
+      scope.setPropagationContext({
+        traceId: randomBytes(16).toString("hex"),
+        spanId: randomBytes(16).toString("hex"),
+      });
       scope.setUser({
         id: newUser.id,
         username: newUser.username,
@@ -164,6 +184,10 @@ export class DiscordEvents extends baseEvent {
 
   private async voiceStateUpdate(old: VoiceState, now: VoiceState) {
     await withScope(async (scope) => {
+      scope.setPropagationContext({
+        traceId: randomBytes(16).toString("hex"),
+        spanId: randomBytes(16).toString("hex"),
+      });
       scope.setUser({
         id: now.member?.user.id,
         username: now.member?.user.username,

src/events/helper/DiscordCommandHandler.ts

@@ -102,23 +102,26 @@ export class DiscordCommandHandler {
         }
       }
     }
-
-    startSpan({
+    await startSpan({
       name: `Discord Command: ${command.metadata.name}`,
       op: `discord.cmd.${command.metadata.name}`,
     }, async () => {
-      try { await command.execute(interaction); }
+      try {
+        await command.execute(interaction);
+      }
       catch(ex) {
         const id = captureException(ex, {tags: {handled: "no"}});
         await this.client.redis.set(`userSentryErrorID:${interaction.user.id}`, id, "EX", 1800);
-
+  
         // Let the user know that something went wrong
-        if(interaction.replied || interaction.deferred)
+        if(interaction.replied)
           await interaction.followUp({content: "An error occur during command execution, please use the feedback command to submit a report.", ephemeral: true});
+        else if (interaction.deferred)
+          await interaction.editReply({content: "An error occur during command execution, please use the feedback command to submit a report."});
         else
           await interaction.reply({content: "An error occur during command execution, please use the feedback command to submit a report.", ephemeral: true});
       }
-    }); 
+    });
   }
 
   public getCommandHash(): Buffer {

src/events/helper/TwitchCommandHandler.ts

@@ -36,7 +36,7 @@ export async function processCommand(eventData: eventType): Promise<boolean | un
     return false;
   }
 
-  startSpan({
+  await startSpan({
     name: `Twitch Command: ${command.name}`,
     op: `twitch.cmd.${command.name}`,
   }, async () => {

src/events/twitchEvents.ts

@@ -4,6 +4,7 @@ import { baseTEvent } from "../core/baseEvent";
 import { TwitchUser } from "../utils/TwitchUser";
 import { processCommand } from "./helper/TwitchCommandHandler";
 import { withScope } from "@sentry/node";
+import { randomBytes } from "crypto";
 
 
 export class TwitchEvents extends baseTEvent {
@@ -21,9 +22,12 @@ export class TwitchEvents extends baseTEvent {
     if(self) return;
 
     await withScope(async (scope) => {
-
       if(!userstate["user-id"] || !userstate['username']) return;
 
+      scope.setPropagationContext({
+        traceId: randomBytes(16).toString("hex"),
+        spanId: randomBytes(16).toString("hex"),
+      });
       scope.setUser({
         id: userstate["user-id"],
         username: userstate.username,

src/loader.ts

@@ -52,7 +52,7 @@ sentryInit({
       }
     }),
     prismaIntegration(),
-    redisIntegration({cachePrefixes: [redisPrefix]}),
+    redisIntegration({cachePrefixes: [`${redisPrefix}:`]}),
     expressIntegration(),
   ],
 
@@ -109,15 +109,7 @@ sentryInit({
 
 
 // Start the main software
-//import './index';
-
-// Clear import caches. Some libraries like Prisma will be used by sentry before OpenTeletry is registered...
-const cacheClear = ["@prisma"];
-for(const cache of cacheClear) {
-  const cacheKey = Object.keys(require.cache).find(key => key.includes(cache));
-  if(cacheKey)
-    delete require.cache[cacheKey];
-}
+import './index';
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
-require("./index"); // Workaround for esbuild's non-order transpilation
+//require("./index"); // Workaround for esbuild's non-order transpilation