refactor: printConfirmSubscription span

opengovsg · Nov 22, 2024 · 2fd482d · 2fd482d
1 parent 566e538
commit 2fd482d
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/backend/src/email/middlewares/email-callback.middleware.ts b/backend/src/email/middlewares/email-callback.middleware.ts
@@ -48,25 +48,28 @@ const printConfirmSubscription = (
   res: Response,
   next: NextFunction
 ): Response | void => {
-  tracer.wrap('printConfirmSubscription', () => {
-    const { Type: type, SubscribeURL: subscribeUrl } = JSON.parse(req.body)
-    if (type === 'SubscriptionConfirmation') {
-      const parsed = new URL(subscribeUrl)
-      if (
-        parsed.protocol === 'https:' &&
-        /^sns\.[a-zA-Z0-9-]{3,}\.amazonaws\.com(\.cn)?$/.test(parsed.host)
-      ) {
-        logger.info({
-          message: 'Confirm the subscription',
-          type,
-          subscribeUrl,
-          action: 'printConfirmSubscription',
-        })
-        return res.sendStatus(202)
-      }
+  const printConfirmSubscriptionSpan = tracer.startSpan(
+    'printConfirmSubscription'
+  )
+  const { Type: type, SubscribeURL: subscribeUrl } = JSON.parse(req.body)
+  if (type === 'SubscriptionConfirmation') {
+    const parsed = new URL(subscribeUrl)
+    if (
+      parsed.protocol === 'https:' &&
+      /^sns\.[a-zA-Z0-9-]{3,}\.amazonaws\.com(\.cn)?$/.test(parsed.host)
+    ) {
+      logger.info({
+        message: 'Confirm the subscription',
+        type,
+        subscribeUrl,
+        action: 'printConfirmSubscription',
+      })
+
+      return res.sendStatus(202)
     }
-    return next()
-  })
+  }
+  printConfirmSubscriptionSpan.finish()
+  return next()
 }
 export const EmailCallbackMiddleware = {
   isAuthenticated,