chore: move span to top level

opengovsg · Nov 25, 2024 · ab35496 · ab35496
1 parent a28bcb6
commit ab35496
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/backend/src/email/services/email-callback.service.ts b/backend/src/email/services/email-callback.service.ts
@@ -43,6 +43,11 @@ const parseEvent = async (req: Request): Promise<void> => {
   } else {
     throw new Error('Unable to handle this event')
   }
+  const parseNotificationAndEventSpan = tracer.startSpan(
+    'parseNotificationAndEvent',
+    { childOf: parseJsonSpan }
+  )
   await Promise.all(records)
+  parseNotificationAndEventSpan.finish()
 }
 export const EmailCallbackService = { isAuthenticated, parseEvent }
diff --git a/backend/src/email/utils/callback/parsers/ses.ts b/backend/src/email/utils/callback/parsers/ses.ts
@@ -136,13 +136,8 @@ const shouldBlacklist = ({
 const parseNotificationAndEvent = async (
   type: SesEventType,
   message: any,
-  metadata: Metadata,
-  parentSpan?: tracer.Span
+  metadata: Metadata
 ): Promise<void> => {
-  const parseNotificationAndEventSpan = tracer.startSpan(
-    'parseNotificationAndEvent',
-    { childOf: parentSpan }
-  )
   if (!isNotificationAndEventForMainRecipient(message, type)) {
     logger.info({
       message: 'SES notification or event is not for the main recipient',
@@ -182,7 +177,6 @@ const parseNotificationAndEvent = async (
       })
       return
   }
-  parseNotificationAndEventSpan.finish()
 }
 
 // Validate SES record hash, returns message ID if valid, otherwise throw errors
@@ -281,7 +275,7 @@ const parseRecord = async (record: SesRecord): Promise<void> => {
         parseRecordSpan
       )
     }
-    return parseNotificationAndEvent(type, message, metadata, parseRecordSpan)
+    return parseNotificationAndEvent(type, message, metadata)
   }
   parseRecordSpan.finish()
 }