Merge branch 'main' into nsc/job-priority

apps/api/src/services/queue-jobs.ts

@@ -2,6 +2,20 @@ import { Job, Queue } from "bullmq";
 import { getScrapeQueue } from "./queue-service";
 import { v4 as uuidv4 } from "uuid";
 import { WebScraperOptions } from "../types";
+import * as Sentry from "@sentry/node";
+
+async function addScrapeJobRaw(
+  webScraperOptions: any,
+  options: any,
+  jobId: string,
+  jobPriority: number = 10
+): Promise<Job> {
+  return await getScrapeQueue().add(jobId, webScraperOptions, {
+    ...options,
+    priority: jobPriority,
+    jobId,
+  });
+}
 
 export async function addScrapeJob(
   webScraperOptions: WebScraperOptions,
@@ -9,11 +23,30 @@ export async function addScrapeJob(
   jobId: string = uuidv4(),
   jobPriority: number = 10
 ): Promise<Job> {
-  return await getScrapeQueue().add(jobId, webScraperOptions, {
-    priority: jobPriority,
-    ...options,
-    jobId,
-  });
+  
+  if (Sentry.isInitialized()) {
+    const size = JSON.stringify(webScraperOptions).length;
+    return await Sentry.startSpan({
+      name: "Add scrape job",
+      op: "queue.publish",
+      attributes: {
+        "messaging.message.id": jobId,
+        "messaging.destination.name": getScrapeQueue().name,
+        "messaging.message.body.size": size,
+      },
+    }, async (span) => {
+      return await addScrapeJobRaw({
+        ...webScraperOptions,
+        sentry: {
+          trace: Sentry.spanToTraceHeader(span),
+          baggage: Sentry.spanToBaggageHeader(span),
+          size,
+        },
+      }, options, jobId, jobPriority);
+    });
+  } else {
+    return await addScrapeJobRaw(webScraperOptions, options, jobId, jobPriority);
+  }
 }