Merge branch 'newjitsu' into feat/newjitsu/self-hosted-revamped

jitsucom · Jan 25, 2024 · c507fdf · c507fdf
2 parents b942fe7 + 88662c7
commit c507fdf
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/services/rotor/src/lib/message-handler.ts b/services/rotor/src/lib/message-handler.ts
@@ -63,17 +63,20 @@ export async function rotorMessageHandler(
     );
 
   const event = message.httpPayload as AnalyticsServerEvent;
+  if (!event.context) {
+    event.context = {};
+  }
   const geo =
     Object.keys(event.context.geo || {}).length > 0
       ? event.context.geo
-      : geoResolver && event.context?.ip
-      ? await geoResolver.resolve(event.context?.ip)
+      : geoResolver && event.context.ip
+      ? await geoResolver.resolve(event.context.ip)
       : undefined;
   event.context.geo = geo;
   const ctx: EventContext = {
     headers: message.httpHeaders,
     geo: geo,
-    ua: parseUserAgent(event.context?.userAgent),
+    ua: parseUserAgent(event.context.userAgent),
     retries,
     source: {
       type: message.ingestType,