Sentry stuff?

1 files changed, 8 insertions, 5 deletions

diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts
index 9fafae1e..4ed715b2 100644
--- a/src/gateway/events/Message.ts
+++ b/src/gateway/events/Message.ts
@@ -42,22 +42,25 @@ export async function Message(this: WebSocket, buffer: WS.Data) {
 		return;
 	}
 
-	const transaction = Sentry.startTransaction({
+	const transaction = data.op != 1 ? Sentry.startTransaction({
 		op: OPCODES[data.op],
 		name: `GATEWAY ${OPCODES[data.op]}`,
 		data: {
 			...data.d,
 			token: data?.d?.token ? "[Redacted]" : undefined,
 		},
-	});
+	}) : undefined;
 
 	try {
 		var ret = await OPCodeHandler.call(this, data);
-		transaction.finish();
+		transaction?.finish();
 		return ret;
 	} catch (error) {
-		Sentry.captureException(error);
-		transaction.finish();
+		Sentry.withScope((scope) => {
+			scope.setSpan(transaction);
+			Sentry.captureException(error);
+		});
+		transaction?.finish();
 		console.error(`Error: Op ${data.op}`, error);
 		// if (!this.CLOSED && this.CLOSING)
 		return this.close(CLOSECODES.Unknown_error);