fix: fetch headers if array (getsentry#2096)

HazAT · web-flow · commit f13d4c638fc7 · 2019-06-01T09:56:19.000+02:00
* fix: fetch headers if array

* meta: Changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.4.1
+
+- [integrations] fix: Tracing integration fetch headers bug.
+
 ## 5.4.0
 
 - [global] feat: Exposed new simplified scope API. `Sentry.setTag`, `Sentry.setTags`, `Sentry.setExtra`, `Sentry.setExtras`, `Sentry.setUser`, `Sentry.setContext`
diff --git a/packages/integrations/src/tracing.ts b/packages/integrations/src/tracing.ts
@@ -162,10 +162,14 @@ export class Tracing implements Integration {
 
           if (options && whiteListed) {
             if (options.headers) {
-              options.headers = {
-                ...options.headers,
-                ...getCurrentHub().traceHeaders(),
-              };
+              if (Array.isArray(options.headers)) {
+                options.headers = [...options.headers, ...Object.entries(getCurrentHub().traceHeaders())];
+              } else {
+                options.headers = {
+                  ...options.headers,
+                  ...getCurrentHub().traceHeaders(),
+                };
+              }
             } else {
               options.headers = getCurrentHub().traceHeaders();
             }
