From 5d7232b3ec960e48df175b7d91f8d089c82e8dc7 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Thu, 19 Sep 2024 15:39:29 +0100 Subject: [PATCH 1/2] =?UTF-8?q?No=20longer=20require=20=E2=80=9Ctrigger-ve?= =?UTF-8?q?rsion=E2=80=9D=20to=20be=20passed=20for=20the=20traceContext=20?= =?UTF-8?q?to=20be=20populated?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts | 8 +++++++- apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts | 9 +++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts b/apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts index 34e84d7076..088b3227a5 100644 --- a/apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts +++ b/apps/webapp/app/routes/api.v1.tasks.$taskId.batch.ts @@ -39,6 +39,7 @@ export async function action({ request, params }: ActionFunctionArgs) { "idempotency-key": idempotencyKey, "trigger-version": triggerVersion, "x-trigger-span-parent-as-link": spanParentAsLink, + "x-trigger-worker": isFromWorker, traceparent, tracestate, } = headers.data; @@ -86,11 +87,16 @@ export async function action({ request, params }: ActionFunctionArgs) { const service = new BatchTriggerTaskService(); + const traceContext = + traceparent ?? isFromWorker // If the request is from a worker, we should pass the trace context + ? { traceparent, tracestate } + : undefined; + try { const result = await service.call(taskId, authenticationResult.environment, body.data, { idempotencyKey: idempotencyKey ?? undefined, triggerVersion: triggerVersion ?? undefined, - traceContext: traceparent ? { traceparent, tracestate } : undefined, + traceContext, spanParentAsLink: spanParentAsLink === 1, }); diff --git a/apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts b/apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts index 08b9d1756c..7a1a590bca 100644 --- a/apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts +++ b/apps/webapp/app/routes/api.v1.tasks.$taskId.trigger.ts @@ -79,13 +79,10 @@ export async function action({ request, params }: ActionFunctionArgs) { const service = new TriggerTaskService(); try { - const traceContext = traceparent - ? !triggerVersion // If the trigger version is NOT set, we are in an older version of the SDK + const traceContext = + traceparent ?? isFromWorker /// If the request is from a worker, we should pass the trace context ? { traceparent, tracestate } - : isFromWorker // If the trigger version is set, and the request is from a worker, we should pass the trace context - ? { traceparent, tracestate } - : undefined - : undefined; + : undefined; logger.debug("Triggering task", { taskId, From 87755185b617a8bcfbb11a72ec1ebb06120dd7b5 Mon Sep 17 00:00:00 2001 From: Matt Aitken Date: Thu, 19 Sep 2024 17:15:05 +0100 Subject: [PATCH 2/2] Remove empty string --- .../route.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx index 349bad884c..94bbe3cd85 100644 --- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx +++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.v3.$projectParam.runs.$runParam/route.tsx @@ -420,7 +420,6 @@ function NoLogsView({ run, resizable }: LoaderData) { min={resizableSettings.parent.inspector.min} isStaticAtRest > - {" "}