No longer require “trigger-version” to be passed for the traceContext to be populated

Author: matt-aitken

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,
     });
 

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,