fix stuff

Author: AbhiPrasad

packages/apm/src/hubextensions.ts

@@ -2,7 +2,6 @@ import { getMainCarrier, Hub } from '@sentry/hub';
 import { SpanContext, TransactionContext } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
-import { IdleTransaction } from './idletransaction';
 import { Span } from './span';
 import { Transaction } from './transaction';
 
@@ -23,8 +22,8 @@ function traceHeaders(this: Hub): { [key: string]: string } {
 /**
  * {@see Hub.startTransaction}
  */
-function startTransaction(this: Hub, context: TransactionContext, idleTimeout?: number): Transaction {
-  const transaction = idleTimeout ? new IdleTransaction(context, this, idleTimeout) : new Transaction(context, this);
+function startTransaction(this: Hub, context: TransactionContext): Transaction {
+  const transaction = new Transaction(context, this);
 
   const client = this.getClient();
   // Roll the dice for sampling transaction, all child spans inherit the sampling decision.

packages/apm/src/index.bundle.ts

@@ -53,7 +53,7 @@ import { Integrations as BrowserIntegrations } from '@sentry/browser';
 import { getGlobalObject } from '@sentry/utils';
 
 import { addExtensionMethods } from './hubextensions';
-import * as TracingIntegrations from './integrations';
+import * as ApmIntegrations from './integrations';
 
 export { Span, TRACEPARENT_REGEXP } from './span';
 
@@ -70,7 +70,7 @@ if (_window.Sentry && _window.Sentry.Integrations) {
 const INTEGRATIONS = {
   ...windowIntegrations,
   ...BrowserIntegrations,
-  Tracing: TracingIntegrations.Tracing,
+  Tracing: ApmIntegrations.Tracing,
 };
 
 export { INTEGRATIONS as Integrations };

packages/apm/src/index.ts

@@ -1,7 +1,7 @@
 import { addExtensionMethods } from './hubextensions';
-import * as TracingIntegrations from './integrations';
+import * as ApmIntegrations from './integrations';
 
-export { TracingIntegrations as Integrations };
+export { ApmIntegrations as Integrations };
 export { Span, TRACEPARENT_REGEXP } from './span';
 export { Transaction } from './transaction';
 

packages/apm/src/integrations/index.ts

@@ -1 +1,2 @@
 export { Express } from './express';
+export { Tracing } from './tracing';

packages/apm/src/integrations/tracing.ts

@@ -4,6 +4,7 @@ import { Event, EventProcessor, Integration, Severity, Span, SpanContext, Transa
 import {
   addInstrumentationHandler,
   getGlobalObject,
+  isInstanceOf,
   isMatchingPattern,
   logger,
   safeJoin,
@@ -1019,19 +1020,24 @@ function fetchCallback(handlerData: { [key: string]: any }): void {
     if (activity) {
       const span = activity.span;
       if (span) {
+        const request = (handlerData.args[0] = handlerData.args[0] as string | Request);
         const options = (handlerData.args[1] = (handlerData.args[1] as { [key: string]: any }) || {});
-        if (options.headers) {
-          if (Array.isArray(options.headers)) {
-            options.headers = [...options.headers, { 'sentry-trace': span.toTraceparent() }];
+        let headers = options.headers;
+        if (isInstanceOf(request, Request)) {
+          headers = (request as Request).headers;
+        }
+        if (headers) {
+          if (typeof headers.append === 'function') {
+            headers.append('sentry-trace', span.toTraceparent());
+          } else if (Array.isArray(headers)) {
+            headers = [...headers, ['sentry-trace', span.toTraceparent()]];
           } else {
-            options.headers = {
-              ...options.headers,
-              'sentry-trace': span.toTraceparent(),
-            };
+            headers = { ...headers, 'sentry-trace': span.toTraceparent() };
           }
         } else {
-          options.headers = { 'sentry-trace': span.toTraceparent() };
+          headers = { 'sentry-trace': span.toTraceparent() };
         }
+        options.headers = headers;
       }
     }
   }

packages/tracing/src/index.bundle.ts

@@ -53,7 +53,7 @@ import { Integrations as BrowserIntegrations } from '@sentry/browser';
 import { getGlobalObject } from '@sentry/utils';
 
 import { addExtensionMethods } from './hubextensions';
-import * as ApmIntegrations from './integrations';
+import * as TracingIntegrations from './integrations';
 
 export { Span, TRACEPARENT_REGEXP } from './span';
 
@@ -70,7 +70,7 @@ if (_window.Sentry && _window.Sentry.Integrations) {
 const INTEGRATIONS = {
   ...windowIntegrations,
   ...BrowserIntegrations,
-  Tracing: ApmIntegrations.Tracing,
+  Tracing: TracingIntegrations.BrowserTracing,
 };
 
 export { INTEGRATIONS as Integrations };

packages/tracing/src/index.ts

@@ -1,7 +1,7 @@
 import { addExtensionMethods } from './hubextensions';
-import * as ApmIntegrations from './integrations';
+import * as TracingIntegrations from './integrations';
 
-export { ApmIntegrations as Integrations };
+export { TracingIntegrations as Integrations };
 export { Span, TRACEPARENT_REGEXP } from './span';
 export { Transaction } from './transaction';
 

packages/tracing/src/integrations/index.ts

@@ -1 +1,2 @@
 export { Express } from './express';
+export { BrowserTracing } from './browsertracing';