Merge branch 'main' into main

Author: iFlyinq

.changeset/new-items-glow.md

@@ -0,0 +1,5 @@
+---
+"@trigger.dev/core": patch
+---
+
+OTEL attributes can include Dates that will be formatted as ISO strings

.github/workflows/e2e.yml

@@ -17,6 +17,8 @@ jobs:
       matrix:
         os: [buildjet-8vcpu-ubuntu-2204, windows-latest]
         package-manager: ["npm", "pnpm", "yarn"]
+    env:
+      YARN_ENABLE_IMMUTABLE_INSTALLS: false
     steps:
       - name: ⬇️ Checkout repo
         uses: actions/checkout@v3

apps/webapp/app/presenters/v3/ApiRunListPresenter.server.ts

@@ -8,6 +8,27 @@ import { ApiRetrieveRunPresenter } from "./ApiRetrieveRunPresenter.server";
 import { RunListOptions, RunListPresenter } from "./RunListPresenter.server";
 import { BasePresenter } from "./basePresenter.server";
 
+const CoercedDate = z.preprocess((arg) => {
+  if (arg === undefined || arg === null) {
+    return;
+  }
+
+  if (typeof arg === "number") {
+    return new Date(arg);
+  }
+
+  if (typeof arg === "string") {
+    const num = Number(arg);
+    if (!isNaN(num)) {
+      return new Date(num);
+    }
+
+    return new Date(arg);
+  }
+
+  return arg;
+}, z.date().optional());
+
 const SearchParamsSchema = z.object({
   "page[size]": z.coerce.number().int().positive().min(1).max(100).optional(),
   "page[after]": z.string().optional(),
@@ -95,8 +116,8 @@ const SearchParamsSchema = z.object({
 
       return z.NEVER;
     }),
-  "filter[createdAt][from]": z.coerce.date().optional(),
-  "filter[createdAt][to]": z.coerce.date().optional(),
+  "filter[createdAt][from]": CoercedDate,
+  "filter[createdAt][to]": CoercedDate,
   "filter[createdAt][period]": z.string().optional(),
 });
 

packages/cli-v3/e2e/fixtures/monorepo-react-email/package.json

@@ -1,7 +1,7 @@
 {
   "name": "monorepo-react-email",
   "private": true,
-  "packageManager": "[email protected]+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589",
+  "packageManager": "[email protected]+sha256.1aa43a5304405be7a7cb9cb5de7b97de9c4e8ddd3273e4dad00d6ae3eb39f0ef",
   "engines": {
     "pnpm": "8.15.5",
     "yarn": "4.2.2"

packages/core/src/v3/utils/flattenAttributes.ts

@@ -33,6 +33,11 @@ export function flattenAttributes(
     return result;
   }
 
+  if (obj instanceof Date) {
+    result[prefix || ""] = obj.toISOString();
+    return result;
+  }
+
   for (const [key, value] of Object.entries(obj)) {
     const newPrefix = `${prefix ? `${prefix}.` : ""}${Array.isArray(obj) ? `[${key}]` : key}`;
     if (Array.isArray(value)) {

references/v3-catalog/src/trigger/tags.ts

@@ -1,9 +1,8 @@
-import { RunTags } from "@trigger.dev/core/v3";
-import { logger, runs, tags, task, tasks } from "@trigger.dev/sdk/v3";
-import { simpleChildTask } from "./subtasks";
+import { logger, runs, task, tasks } from "@trigger.dev/sdk/v3";
+import { simpleChildTask } from "./subtasks.js";
 
 type Payload = {
-  tags: RunTags;
+  tags: string | string[];
 };
 
 export const triggerRunsWithTags = task({
@@ -16,6 +15,22 @@ export const triggerRunsWithTags = task({
       { tags: payload.tags }
     );
 
+    //runs in the past 5 seconds, as a date
+    const from = new Date();
+    from.setSeconds(from.getSeconds() - 5);
+    const result2 = await runs.list({ tag: payload.tags, from });
+    logger.log("list with Date()", { length: result2.data.length, data: result2.data });
+
+    //runs in the past 5 seconds, as a number timestamp
+    const result3 = await runs.list({ tag: payload.tags, from: from.getTime() - 5000 });
+    logger.log("list with timestamp", { length: result3.data.length, data: result3.data });
+
+    logger.log("run usage", {
+      costInCents: result2.data[0].costInCents,
+      baseCostInCents: result2.data[0].baseCostInCents,
+      durationMs: result2.data[0].durationMs,
+    });
+
     await simpleChildTask.triggerAndWait(
       { message: "triggerAndWait from triggerRunsWithTags" },
       { tags: payload.tags }
@@ -71,13 +86,5 @@ export const triggerRunsWithTags = task({
       baseCostInCents: run.baseCostInCents,
       durationMs: run.durationMs,
     });
-
-    const result2 = await runs.list({ tag: payload.tags });
-    logger.log("trigger runs ", { length: result2.data.length, data: result2.data });
-    logger.log("run usage", {
-      costInCents: result2.data[0].costInCents,
-      baseCostInCents: result2.data[0].baseCostInCents,
-      durationMs: result2.data[0].durationMs,
-    });
   },
 });