fix: ignore tracer spans

Author: tschoffelen

packages/api/package.json

@@ -20,7 +20,7 @@
     "@includable/serverless-middleware": "^2.2.0",
     "@thi.ng/ksuid": "^3.2.83",
     "bcryptjs": "^2.4.3",
-    "date-fns": "^3.6.0",
+    "date-fns": "^4.1.0",
     "dynamodb-toolbox": "^1.3.8",
     "hono": "^4.5.10",
     "jest": "^29.7.0",

packages/api/src/lib/storage.js

@@ -1,3 +1,4 @@
+import { eachDayOfInterval, parseISO, format } from "date-fns";
 import {
   GetObjectCommand,
   ListObjectsV2Command,
@@ -46,14 +47,11 @@ export const listByPrefix = async (prefix) => {
 
 export const list = async (startDate, endDate, prefix) => {
   // Get a list of all days between startDate and endDate
-  const start = new Date(startDate);
-  const end = new Date(endDate);
-  const dateList = [];
-  const currentDate = new Date(start);
-  while (currentDate <= end) {
-    dateList.push(currentDate.toISOString().split("T")[0]);
-    currentDate.setDate(currentDate.getDate() + 1);
-  }
+  const start = typeof startDate === "string" ? parseISO(startDate) : startDate;
+  const end = typeof endDate === "string" ? parseISO(endDate) : endDate;
+  const dateList = eachDayOfInterval({ start, end }).map((date) =>
+    format(date, "yyyy-MM-dd"),
+  );
 
   // Get all keys for each date, and flatten the array
   const allKeys = await Promise.all(

packages/dashboard/src/components/stats/transaction-graph.tsx

@@ -18,6 +18,7 @@ import {
   getTransactionService,
   useTransaction,
 } from "@/lib/transaction";
+import { isTracerSendSpan } from "@/lib/utils";
 
 const GraphNode = ({ data, isConnectable }) => {
   return (
@@ -103,7 +104,8 @@ const buildTransactionGraph = (transaction) => {
     if (
       item.id?.endsWith("_started") ||
       item.type === "enrichment" ||
-      item.type === "log"
+      item.type === "log" || 
+      isTracerSendSpan(item)
     )
       continue;
 

packages/dashboard/src/lib/transaction.ts

@@ -1,4 +1,5 @@
 import { API_URL, authenticatedFetch } from "@/lib/api";
+import { isTracerSendSpan } from "@/lib/utils";
 import useSWR from "swr";
 
 export const getGroupingKey = (transaction: any, extended = false) => {
@@ -46,16 +47,19 @@ export const getTransactionService = (transaction: any) => {
   ) {
     return "eventBridge";
   }
-  if (transaction.info?.httpInfo?.host === "hooks.slack.com" || transaction.info?.httpInfo?.host === "slack.com") {
+  if (
+    transaction.info?.httpInfo?.host === "hooks.slack.com" ||
+    transaction.info?.httpInfo?.host === "slack.com"
+  ) {
     return "slack";
   }
-  if (transaction.info?.httpInfo?.host?.endsWith('.chargebee.com')) {
+  if (transaction.info?.httpInfo?.host?.endsWith(".chargebee.com")) {
     return "chargebee";
   }
-  if (transaction.info?.httpInfo?.host?.endsWith('.myshopify.com')) {
+  if (transaction.info?.httpInfo?.host?.endsWith(".myshopify.com")) {
     return "shopify";
   }
-  if (transaction.info?.httpInfo?.host === 'api.todoist.com') {
+  if (transaction.info?.httpInfo?.host === "api.todoist.com") {
     return "todoist";
   }
 
@@ -87,16 +91,19 @@ export const getTransactionLabel = (transaction: any) => {
     return "CloudFront";
   }
 
-  if (transaction.info?.httpInfo?.host === "hooks.slack.com" || transaction.info?.httpInfo?.host === "slack.com") {
+  if (
+    transaction.info?.httpInfo?.host === "hooks.slack.com" ||
+    transaction.info?.httpInfo?.host === "slack.com"
+  ) {
     return "Slack";
   }
-  if (transaction.info?.httpInfo?.host?.endsWith('.chargebee.com')) {
+  if (transaction.info?.httpInfo?.host?.endsWith(".chargebee.com")) {
     return "Chargebee";
   }
-  if (transaction.info?.httpInfo?.host?.endsWith('.myshopify.com')) {
+  if (transaction.info?.httpInfo?.host?.endsWith(".myshopify.com")) {
     return "Shopify";
   }
-  if (transaction.info?.httpInfo?.host === 'api.todoist.com') {
+  if (transaction.info?.httpInfo?.host === "api.todoist.com") {
     return "Todoist";
   }
 
@@ -127,7 +134,11 @@ export const getTransactionLabel = (transaction: any) => {
 export const groupSpans = (spans?: any[]) => {
   const grouped: { groupingKey: any; spans: any[] }[] = [];
   for (const span of spans || []) {
-    if (span.id?.endsWith("_started") || span.spanType === "enrichment")
+    if (
+      span.id?.endsWith("_started") ||
+      span.spanType === "enrichment" ||
+      isTracerSendSpan(span)
+    )
       continue;
 
     span.groupingKey = getGroupingKey(span, true);

packages/dashboard/src/lib/utils.ts

@@ -1,6 +1,13 @@
-import { clsx, type ClassValue } from "clsx"
-import { twMerge } from "tailwind-merge"
+import { clsx, type ClassValue } from "clsx";
+import { twMerge } from "tailwind-merge";
 
 export function cn(...inputs: ClassValue[]) {
-  return twMerge(clsx(inputs))
+  return twMerge(clsx(inputs));
 }
+
+export const isTracerSendSpan = (span: any) => {
+  return (
+    span.service === "sqs" &&
+    span.info?.httpInfo?.request?.body.includes("__TRACE_TOKEN__")
+  );
+};

packages/lambda-layer/lib/utils/httpSpansAgent.js

@@ -27,12 +27,16 @@ exports.HttpSpansAgent = (() => {
     }
 
     try {
-      const params = {
+      const command = new SendMessageCommand({
         QueueUrl: process.env.AUTO_TRACE_QUEUE_URL,
+        MessageAttributes: {
+          __TRACE_TOKEN__: {
+            DataType: "String",
+            StringValue: process.env.TRACER_TOKEN || "",
+          },
+        },
         MessageBody: JSON.stringify(requestBody),
-      };
-
-      const command = new SendMessageCommand(params);
+      });
       await sqsClient.send(command);
     } catch (error) {
       console.warn("Error sending trace spans:", error);

yarn.lock

@@ -9438,7 +9438,7 @@ __metadata:
     "@thi.ng/ksuid": "npm:^3.2.83"
     "@types/jest": "npm:^29.5.13"
     bcryptjs: "npm:^2.4.3"
-    date-fns: "npm:^3.6.0"
+    date-fns: "npm:^4.1.0"
     dynamodb-toolbox: "npm:^1.3.8"
     esbuild: "npm:^0.20.1"
     hono: "npm:^4.5.10"
@@ -11799,6 +11799,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"date-fns@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "date-fns@npm:4.1.0"
+  checksum: 10c0/b79ff32830e6b7faa009590af6ae0fb8c3fd9ffad46d930548fbb5acf473773b4712ae887e156ba91a7b3dc30591ce0f517d69fd83bd9c38650fdc03b4e0bac8
+  languageName: node
+  linkType: hard
+
 "dayjs@npm:^1.11.8":
   version: 1.11.13
   resolution: "dayjs@npm:1.11.13"