feat(server,store): keep track of Sentry metrics about which routes a…

…nd jobs are run
compasjs · May 21, 2024 · ca1a0a8 · ca1a0a8
1 parent b113b6b
commit ca1a0a8
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 25 deletions.
diff --git a/packages/code-gen/src/generated/structure/validators.js b/packages/code-gen/src/generated/structure/validators.js
diff --git a/packages/server/src/middleware/log.js b/packages/server/src/middleware/log.js
@@ -92,6 +92,15 @@ export function logMiddleware(app, options) {
     }
 
     if (_compasSentryExport) {
+      if (_compasSentryExport?.metrics?.increment) {
+        _compasSentryExport.metrics.increment("compas.route.name", 1, {
+          tags: {
+            compasRouteName: ctx.event.name ?? "<unmatched>",
+          },
+          unit: "none",
+        });
+      }
+
       const span = _compasSentryExport.getActiveSpan();
       if (span) {
         span.setStatus(

diff --git a/packages/server/src/middleware/sentry.js b/packages/server/src/middleware/sentry.js
@@ -22,7 +22,8 @@ export function sentry() {
   }
 
   return (ctx, next) => {
-    if (ctx.method === "OPTIONS" || ctx.method === "HEAD") {
+    const method = ctx.method.toLowerCase();
+    if (method === "options" || method === "head") {
       return next();
     }
 

diff --git a/packages/store/src/generated/database/file.js b/packages/store/src/generated/database/file.js
diff --git a/packages/store/src/generated/database/job.js b/packages/store/src/generated/database/job.js
diff --git a/packages/store/src/generated/database/sessionStore.js b/packages/store/src/generated/database/sessionStore.js
diff --git a/packages/store/src/generated/database/sessionStoreToken.js b/packages/store/src/generated/database/sessionStoreToken.js
diff --git a/packages/store/src/queue-worker.js b/packages/store/src/queue-worker.js
@@ -432,6 +432,15 @@ function queueWorkerRun(
         const [job] = await jobTodoQuery(where, orderBy).exec(sql);
 
         if (!job?.id) {
+          if (_compasSentryExport?.metrics?.increment) {
+            _compasSentryExport.metrics.increment("compas.queue.job", 1, {
+              tags: {
+                compasQueueJob: "<waiting worker>",
+              },
+              unit: "none",
+            });
+          }
+
           return {
             didHandleJob: false,
           };
@@ -522,6 +531,15 @@ async function queueWorkerExecuteJob(logger, sql, options, job) {
         description: job.name,
       },
       async () => {
+        if (_compasSentryExport?.metrics?.increment) {
+          _compasSentryExport.metrics.increment("compas.queue.job", 1, {
+            tags: {
+              compasQueueJob: job.name,
+            },
+            unit: "none",
+          });
+        }
+
         return await exec();
       },
     );