Merge remote-tracking branch 'origin/main' into improvement/custom-reports

Author: joanagmaia

backend/package-lock.json

@@ -40,7 +40,8 @@
     "script:send-weekly-analytics-email": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/send-weekly-analytics-email.ts",
     "script:unleash-init": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/unleash-init.ts",
     "script:enrich-members-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/enrich-members-and-organizations.ts",
-    "script:enrich-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/enrich-organizations-synchronous.ts"
+    "script:enrich-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/enrich-organizations-synchronous.ts",
+    "script:generate-merge-suggestions": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true node -r tsconfig-paths/register -r ts-node/register src/bin/scripts/generate-merge-suggestions.ts"
   },
   "dependencies": {
     "@aws-sdk/client-comprehend": "^3.159.0",
@@ -53,6 +54,7 @@
     "@crowd/common": "file:../services/libs/common",
     "@crowd/integrations": "file:../services/libs/integrations",
     "@crowd/logging": "file:../services/libs/logging",
+    "@crowd/tracing": "file:../services/libs/tracing",
     "@crowd/opensearch": "file:../services/libs/opensearch",
     "@crowd/redis": "file:../services/libs/redis",
     "@crowd/sqs": "file:../services/libs/sqs",

backend/package.json

@@ -9,6 +9,7 @@ import { getRedisClient, getRedisPubSubPair, RedisPubSubReceiver } from '@crowd/
 import { getServiceLogger } from '@crowd/logging'
 import { ApiWebsocketMessage, Edition } from '@crowd/types'
 import { getOpensearchClient } from '@crowd/opensearch'
+import { getServiceTracer } from '@crowd/tracing'
 import { API_CONFIG, REDIS_CONFIG, UNLEASH_CONFIG, OPENSEARCH_CONFIG } from '../conf'
 import { authMiddleware } from '../middlewares/authMiddleware'
 import { tenantMiddleware } from '../middlewares/tenantMiddleware'
@@ -26,6 +27,7 @@ import WebSockets from './websockets'
 import { opensearchMiddleware } from '../middlewares/opensearchMiddleware'
 
 const serviceLogger = getServiceLogger()
+getServiceTracer()
 
 const app = express()
 

backend/src/api/index.ts

@@ -4,6 +4,7 @@ import { processPaginated, timeout } from '@crowd/common'
 import { RedisCache, getRedisClient } from '@crowd/redis'
 import { getChildLogger, getServiceLogger } from '@crowd/logging'
 import { PlatformType } from '@crowd/types'
+import { SpanStatusCode, getServiceTracer } from '@crowd/tracing'
 import { DISCORD_CONFIG, REDIS_CONFIG } from '../conf'
 import SequelizeRepository from '../database/repositories/sequelizeRepository'
 import IntegrationRepository from '../database/repositories/integrationRepository'
@@ -14,6 +15,7 @@ import {
   getIntegrationStreamWorkerEmitter,
 } from '@/serverless/utils/serviceSQS'
 
+const tracer = getServiceTracer()
 const log = getServiceLogger()
 
 async function executeIfNotExists(
@@ -56,40 +58,51 @@ async function spawnClient(
 
     logger.info({ payload }, 'Processing Discord WS Message!')
 
-    try {
-      const integration = (await IntegrationRepository.findByIdentifier(
-        guildId,
-        PlatformType.DISCORD,
-      )) as any
+    tracer.startActiveSpan('ProcessDiscordWSMessage', async (span) => {
+      try {
+        const integration = (await IntegrationRepository.findByIdentifier(
+          guildId,
+          PlatformType.DISCORD,
+        )) as any
 
-      const result = await repo.create({
-        tenantId: integration.tenantId,
-        integrationId: integration.id,
-        type: WebhookType.DISCORD,
-        payload,
-      })
+        const result = await repo.create({
+          tenantId: integration.tenantId,
+          integrationId: integration.id,
+          type: WebhookType.DISCORD,
+          payload,
+        })
 
-      const streamEmitter = await getIntegrationStreamWorkerEmitter()
+        const streamEmitter = await getIntegrationStreamWorkerEmitter()
 
-      await streamEmitter.triggerWebhookProcessing(
-        integration.tenantId,
-        integration.platform,
-        result.id,
-      )
-    } catch (err) {
-      if (err.code === 404) {
-        logger.warn({ guildId }, 'No integration found for incoming Discord WS Message!')
-      } else {
-        logger.error(
-          err,
-          {
-            discordPayload: JSON.stringify(payload),
-            guildId,
-          },
-          'Error processing Discord WS Message!',
+        await streamEmitter.triggerWebhookProcessing(
+          integration.tenantId,
+          integration.platform,
+          result.id,
         )
+        span.setStatus({
+          code: SpanStatusCode.OK,
+        })
+      } catch (err) {
+        if (err.code === 404) {
+          logger.warn({ guildId }, 'No integration found for incoming Discord WS Message!')
+        } else {
+          span.setStatus({
+            code: SpanStatusCode.ERROR,
+            message: err,
+          })
+          logger.error(
+            err,
+            {
+              discordPayload: JSON.stringify(payload),
+              guildId,
+            },
+            'Error processing Discord WS Message!',
+          )
+        }
+      } finally {
+        span.end()
       }
-    }
+    })
   }
 
   const client = new Client({