fix: Empty fetch options doesn't attach header (getsentry#2119)

HazAT · web-flow · commit c68d9376a687 · 2019-06-13T16:29:08.000+02:00
* fix: Empty fetch options doesn't attach header

* ref: Remove trace id for now

* fix: linter

* meta: Changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- [integrations] fix: Tracing integration fetch headers bug where trace header is not attached if there are no options.
+
 ## 5.4.1
 
 - [integrations] fix: Tracing integration fetch headers bug.
diff --git a/packages/integrations/src/tracing.ts b/packages/integrations/src/tracing.ts
@@ -4,8 +4,8 @@ import { fill, getGlobalObject, isMatchingPattern, logger, supportsNativeFetch }
 /** JSDoc */
 interface TracingOptions {
   tracingOrigins?: Array<string | RegExp>;
-  traceXHR?: boolean;
   traceFetch?: boolean;
+  traceXHR?: boolean;
   autoStartOnDomReady?: boolean;
 }
 
@@ -147,7 +147,7 @@ export class Tracing implements Integration {
         const self = getCurrentHub().getIntegration(Tracing);
         if (self && self._options.tracingOrigins) {
           const url = args[0] as string;
-          const options = args[1] as { [key: string]: any };
+          const options = (args[1] = (args[1] as { [key: string]: any }) || {});
 
           let whiteListed = false;
           self._options.tracingOrigins.forEach((whiteListUrl: string | RegExp) => {
@@ -156,7 +156,7 @@ export class Tracing implements Integration {
             }
           });
 
-          if (options && whiteListed) {
+          if (whiteListed) {
             if (options.headers) {
               if (Array.isArray(options.headers)) {
                 options.headers = [...options.headers, ...Object.entries(getCurrentHub().traceHeaders())];
diff --git a/packages/utils/src/supports.ts b/packages/utils/src/supports.ts
@@ -1,5 +1,5 @@
-import { getGlobalObject } from './misc';
 import { logger } from './logger';
+import { getGlobalObject } from './misc';
 
 /**
  * Tells whether current environment supports ErrorEvent objects
