fix baggage order

getsentry · Jan 31, 2025 · dff0b91 · dff0b91
1 parent 7d403dd
commit dff0b91
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/packages/node/src/integrations/http/SentryHttpInstrumentation.ts b/packages/node/src/integrations/http/SentryHttpInstrumentation.ts
@@ -606,16 +606,25 @@ function getAbsoluteUrl(origin: string, path: string = '/'): string {
 function mergeBaggageHeaders(
   existing: string | string[] | number | null | undefined | boolean,
   baggage: string,
-): string | undefined {
+): string | string[] | number | null | undefined | boolean {
   if (!existing) {
     return baggage;
   }
 
   const existingBaggageEntries = parseBaggageHeader(existing);
   const newBaggageEntries = parseBaggageHeader(baggage);
 
-  // Existing entries take precedence
-  const mergedBaggageEntries = { ...newBaggageEntries, ...existingBaggageEntries };
+  if (!newBaggageEntries) {
+    return existing;
+  }
+
+  // Existing entries take precedence, ensuring order remains stable for minimal changes
+  const mergedBaggageEntries = { ...existingBaggageEntries };
+  Object.entries(newBaggageEntries).forEach(([key, value]) => {
+    if (!mergedBaggageEntries[key]) {
+      mergedBaggageEntries[key] = value;
+    }
+  });
 
   return objectToBaggageHeader(mergedBaggageEntries);
 }