From 5a5a20c20331de00d7ea691ab08412abeff89dbf Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sun, 30 Oct 2022 11:33:27 +1100
Subject: [PATCH] Sentry stuff?

---
 package-lock.json             | Bin 411527 -> 413198 bytes
 package.json                  |   5 +++--
 src/bundle/Server.ts          |   4 ++++
 src/gateway/events/Message.ts |  13 ++++++++-----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4cba09005903fb7259552fb48de9cb2ffd98c679..3189e47bdef0581e3a2ff786ec86a54fda9113d8 100644
GIT binary patch
delta 2899
zcmd6p&2QUe9LMF>X}b=#cIz0WE$fR`38jtgIIoC_xry^yCr%tEP7c!?CwA<-C(f%h
zq>00Jq6Z%y4jd*fTqYQ*v|f<-3y>IyF|ol4n>e=H88L{vH4Pd<<FJAy`>`L(^7r?B
zzQ2#2D;v`vd^CMy6*?`K)T~tFRk>WMFTOp$c)@PM>?X4|2h9%a<2%q9ecZeN{q`+n
z*A~Vw?cMvM6GFL`MOG1gSk=D(k6~zmEv|W#l9UM0Av}%|h}uP}Jf`F$&0<PrQF|^|
zNJz$fkyqSk$<rv%J~lx%Q@OhA2zi=Wuh6F20@5n-46`nf;YzS-T{k<m$E^iz_s&UO
z2Dr8i&q8)EdBrfLUA!0B+_`-OIyz8;c5CJotP9##IzRBT-cvmIIH0`kW2{6FPlhWV
zf5DaD@ERkwTOl@p6v9D<W6@^YNcd5j@CH1gpe0B)EOsWS=5kexAZqa%u2emW(7{u2
ztC5Q-?R2-3AwVPo&1*Y%rux$7do?Vsj34P8i-oel7sPUnm$G}tV<v|Q({>*SuMBF`
zps6R?qwhzxjUQ$X{0G<1!pD0)?75zye4=P~;gl4t_zUUve2pa4DpukgWh^H1ZN!}j
ztBN(VUZbhH66wfIs_sN>-YkQA19{G#%u<xtapH<Yav7`spw%K(JzB)8yFPkMUt(R~
z(_Dbdy#?r(vv>35GThQWy?tK$^~V!n{3<lNdH<eisIOIDu05HG(~n3thRR12imt6?
zy2(g@ap%#hfTQaHXDd~(HG*8WZqHOif~gw)v=GhY=}uIzrc#{E=SF0fDDbY@S};^h
z)`J$K-^#y`%z?mYyFZO?ezv^;_4SQ`i4}NaUu3tP3q>59isVGvk@lp>xXo5>22w#g
z&sNKMYYS^Bb)S@Hy9i@Lq`XYk+{qXoR->+HBZ(KqNW&Q{X4gtGg|<_9z8xh47}&lF
zodp+<4bN%Uw#T%)zw|uW&!>hynB4z)!J*o!-HvQz*{&Pqk#aa$vdBhK)=#q&iN#wA
zVsw@zG0<Jh+cHdxS#NT3wps7Eq7@;8tD;&-(5T>xl0rHavRP8$#50FZ4w&$M^x;<Y
zA@pbkE@m?_xPgqE29-}B7`PDw`dU$+<W;@B<^B6r96)c3EX6r4>`^;aw-Ry_k#<~6
zwi_P1<n$L1e>zbt79x_FN(RF|2if+=u&QKh3zlw&!F@bQ5;3WcrB$)pu3}a}X62+^
zQW!4kjcAXLPj8){9HJK>8GIfcng*4d5HePfbq$5y)J<rajmn{%uTy80T+JORsbZ25
zlNO3KTZA&lWyrA9awfb&&=<;*Em3qQ(;ftAIP4TgCV0x*ZFtH|x|%>;PM57fk~w#n
zsJFzPIrEeKD)pGZhnrA9Ts551w#`Sz4|){bS{OPF9<&VRxr50)eFts4iuD@!^28#G
zSr8w_bM{<!ZLL_$+3Q|9V<f^<KJTyjC_IJHM8_+oWQo9hSj8H)5}^{+NpzbPf{dwN
zn*+(XEEN}8>Ji0A)7~zZ^3gpG&JXuI0cTE)ysn+Myn1EBJhZi89v<I0h|^($89>X1
zS+KJNAMouUWRqL>SK*@&Fuetj{C@$>&y2hY9xcHq`bc{bLN5)}2Dr2Ep@JD;9}mxg
z@bWXw&+&Mx$7AiV@cU0<{x%Dv+E;f+wJ(02>PPl3{Efd9{<gq}D=^ys<LFCg?o(TK
zm*4^F?lr{9lYfic<jX<sxpRv*R}A0G9X4<QQ6HXNd5*Xy>!Q9Xy41T|(zizgo1_08
kynw%Bm>YTqUJxS;C$#ToCc)Pw7zck?hQ_v#fPwq{Pv<POg8%>k

delta 1921
zcmc(g&1>6c9LJHP;KXGFuh~Yn1ZK0+Q74gPOP0M|YD<2%_2zdo)<~9R%d%x#QtUXl
zQc7>ziVnIIMqz)zzz4Ha$!W)}jD^vLwX|W!(c@rb%uQ@}urjtny65m59-fEa=lTAg
z56@?J)^2^i_VpHks2#E9{^))8r}#GF+lJknj^)X4U)5`>p$#EJ<Eye-|I3ciP2l$*
ztloDv#Dt$Lncw`lV%^q2cfJuu{gTpZr?f1YiS#RUG|&sj8$%suXet~X?y-hIk(GR_
z4=KE$qxGn-5UC@QLGUHDxresWR7=mdplmfNX8cGH<@$-NdH<%%+&Q$bG<JpO3^Pa*
zIDU6wf@?Xifa`$IbiVVp`Na`E`t5KTur+qg`_8u(CVS_YZ%ocZThL_QdcJ%L90))$
zokYT&p%xx+sU*=Z#4AQNj%o5fttZ;~crj9{A|aYbcrKvws-$B6q!<!Jzd>MFH{?-s
zD2K+;J_Rvap6|4Cf-wcY_!78<Np<s{^AGd;$9D6<gZJie=JvyBhP#YUU_uEl&d4p5
zj>zR0%aUoH?KY}V6&C~epdCbnik3@yij0~mq9jDMbGW4P*nTWVvIz}J<wO=rN4jLK
zLMPIKLi9{m|1?AM=-~zTOIrL-(Vkudz5)(LUmo4D&4`z+lTC2-EJY}j%8Fi0i}n3X
z6^=6DbSWuIiqy~Y<pL85l=5_XzfdD7xZZ;CMj%vb$!ISY<lDIhgcb#?fr`<tP}Qq+
zzvwLxp6;HKFmHeGU)pYNJhG2|e(VBffNN)LhEY{ANQtiv<6Jr;YItzaj)gELD&%5&
z-lp6Mk^~90l}I-$DSkR8^&|qXcLzf}Oz8$0hYG17+k{#qkz~|Czt{_LnT~bv6L87e
zxeIKV&kmPN$J6y$)g|-VQ|DRbrpg7dbe&6Q6+FS#ymTW)Gnq0f@p_V=SgHuiL`jc(
zvR)49se05yp^8o^tOrjHhnZjmkHWrkH{tDxxL-(>;X*>i<Y_7wU%dAl*N?~7kAY{K
z<K~+-%4N|X+w8X-e%sjLU$Fi9g6n)GweH>k*R5-p!KHtv>B{)(CD8f*dOBxb{ky4C
zKI@kc!Ph3K<-E7BVeMQ7?XRloc%rHK`V_Se4qm0{)+RJLHvK)$G%cKqrmW?FL3mc_
myw#kiu{xLY^c7tI#-DgW*U4Ch7r))GMv+D5xXCPjb@C_u7jWwU

diff --git a/package.json b/package.json
index ef2cc223..ea9c9b40 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,9 @@
 	},
 	"dependencies": {
 		"@aws-sdk/client-s3": "^3.178.0",
-		"@sentry/node": "^7.13.0",
-		"@sentry/tracing": "^7.13.0",
+		"@sentry/integrations": "^7.17.2",
+		"@sentry/node": "^7.17.2",
+		"@sentry/tracing": "^7.17.2",
 		"ajv": "^8.6.2",
 		"ajv-formats": "^2.1.1",
 		"amqplib": "^0.10.3",
diff --git a/src/bundle/Server.ts b/src/bundle/Server.ts
index b98a3776..2bc45f84 100644
--- a/src/bundle/Server.ts
+++ b/src/bundle/Server.ts
@@ -10,6 +10,7 @@ import { green, bold, yellow } from "picocolors";
 import { Config, initDatabase, BannedWords } from "@fosscord/util";
 import * as Sentry from "@sentry/node";
 import * as Tracing from "@sentry/tracing";
+import * as Integrations from "@sentry/integrations";
 
 const app = express();
 const server = http.createServer();
@@ -73,6 +74,9 @@ async function main() {
 				new Sentry.Integrations.Http({ tracing: true }),
 				new Tracing.Integrations.Express({ app }),
 				new Tracing.Integrations.Mysql(),
+				new Integrations.RewriteFrames({
+					root: __dirname,
+				}),
 			],
 			tracesSampleRate: Config.get().sentry.traceSampleRate,
 			environment: Config.get().sentry.environment,
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);