better integration logging

Author: Uroš Marolt

backend/src/serverless/integrations/services/integrationProcessor.ts

@@ -185,18 +185,22 @@ export class IntegrationProcessor extends LoggingBase {
   }
 
   async processWebhook(webhookId: string, force?: boolean) {
-    let logger = createChildLogger('processWebhook', this.log, { webhookId })
-    logger.debug('Processing webhook!')
-
     const options = (await SequelizeRepository.getDefaultIRepositoryOptions()) as IRepositoryOptions
     const repo = new IncomingWebhookRepository(options)
     const webhook = await repo.findById(webhookId)
+    let logger = createChildLogger('processWebhook', this.log, { webhookId })
 
     if (webhook === null || webhook === undefined) {
       logger.error('Webhook not found!')
       return
     }
 
+    logger = createChildLogger('processWebhook', this.log, {
+      webhookId,
+      tenantId: webhook.tenantId,
+    })
+    logger.debug('Processing webhook!')
+
     logger = createChildLogger('processWebhook', this.log, {
       type: webhook.type,
       tenantId: webhook.tenantId,
@@ -287,6 +291,7 @@ export class IntegrationProcessor extends LoggingBase {
   async process(req: NodeWorkerIntegrationProcessMessage) {
     const logger = createChildLogger('process', this.log, {
       type: req.integrationType,
+      tenantId: req.tenantId,
       integrationId: req.integrationId,
       onboarding: req.onboarding,
       microserviceId: req.microserviceId,

backend/src/serverless/integrations/usecases/discord/errorHandler.ts

@@ -28,6 +28,6 @@ export const handleDiscordError = (
 
     return new RateLimitError(rateLimitResetSeconds, url, err)
   }
-  logger.error({ err, input }, `Error while calling Slack API URL: ${url}`)
+  logger.error(err, { input }, `Error while calling Slack API URL: ${url}`)
   return err
 }

backend/src/serverless/integrations/usecases/linkedin/errorHandler.ts

@@ -28,6 +28,6 @@ export const handleLinkedinError = (
     const rateLimitResetSeconds = nextMidnight.diff(now, 'seconds')
     return new RateLimitError(rateLimitResetSeconds, url, err)
   }
-  logger.error({ err, input }, `Error while calling LinkedIn API URL: ${url}`)
+  logger.error(err, { input }, `Error while calling LinkedIn API URL: ${url}`)
   return err
 }

backend/src/serverless/integrations/usecases/slack/errorHandler.ts

@@ -28,6 +28,6 @@ export const handleSlackError = (
 
     return new RateLimitError(rateLimitResetSeconds, url, err)
   }
-  logger.error({ err, input }, `Error while calling Slack API URL: ${url}`)
+  logger.error(err, { input }, `Error while calling Slack API URL: ${url}`)
   return err
 }