From 84529f6f326cb603de0678068cec212d5e8885cc Mon Sep 17 00:00:00 2001
From: spiral <spiral@spiral.sh>
Date: Thu, 20 Jan 2022 23:38:58 -0500
Subject: [PATCH] fix: put Serilog event ID / shard ID in same scope as Sentry
 error ID

---
 PluralKit.Bot/Bot.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/PluralKit.Bot/Bot.cs b/PluralKit.Bot/Bot.cs
index 0466fbb6..f93475d0 100644
--- a/PluralKit.Bot/Bot.cs
+++ b/PluralKit.Bot/Bot.cs
@@ -153,14 +153,14 @@ public class Bot
                 return;
             }
 
+            using var _ = LogContext.PushProperty("EventId", Guid.NewGuid());
+            using var __ = LogContext.Push(await serviceScope.Resolve<SerilogGatewayEnricherFactory>().GetEnricher(shardId, evt));
+            _logger.Verbose("Received gateway event: {@Event}", evt);
+
             try
             {
                 var queue = serviceScope.ResolveOptional<HandlerQueue<T>>();
 
-                using var _ = LogContext.PushProperty("EventId", Guid.NewGuid());
-                using var __ = LogContext.Push(await serviceScope.Resolve<SerilogGatewayEnricherFactory>().GetEnricher(shardId, evt));
-                _logger.Verbose("Received gateway event: {@Event}", evt);
-
                 // Also, find a Sentry enricher for the event type (if one is present), and ask it to put some event data in the Sentry scope
                 var sentryEnricher = serviceScope.ResolveOptional<ISentryEnricher<T>>();
                 sentryEnricher?.Enrich(serviceScope.Resolve<Scope>(), shardId, evt);