added to all

Author: nina-kollman

packages/traceloop-sdk/src/lib/tracing/association.ts

@@ -14,8 +14,16 @@ export function withAssociationProperties<
     return fn.apply(thisArg, args);
   }
 
+  // Get existing associations from context and merge with new properties
+  const existingAssociations = context
+    .active()
+    .getValue(ASSOCATION_PROPERTIES_KEY) as Record<string, string> | undefined;
+  const mergedAssociations = existingAssociations
+    ? { ...existingAssociations, ...properties }
+    : properties;
+
   const newContext = context
     .active()
-    .setValue(ASSOCATION_PROPERTIES_KEY, properties);
+    .setValue(ASSOCATION_PROPERTIES_KEY, mergedAssociations);
   return context.with(newContext, fn, thisArg, ...args);
 }

packages/traceloop-sdk/src/lib/tracing/associations.ts

@@ -77,8 +77,8 @@ export class Associations {
       }
     }
 
-    // Also set directly on the current span
-    const span = trace.getSpan(otelContext.active());
+    // Also set directly on the current span (use newContext after enterWith)
+    const span = trace.getSpan(newContext);
     if (span && span.isRecording()) {
       for (const [prop, value] of associations) {
         span.setAttribute(prop, value);