update with master

Author: AbhiPrasad

packages/tracing/src/integrations/tracing.ts

@@ -15,6 +15,8 @@ import { Span as SpanClass } from '../span';
 import { SpanStatus } from '../spanstatus';
 import { Transaction } from '../transaction';
 
+import { Location } from './types';
+
 /**
  * Options for Tracing integration
  */
@@ -283,6 +285,44 @@ export class Tracing implements Integration {
     });
   }
 
+  /**
+   * Returns a new Transaction either continued from sentry-trace meta or a new one
+   */
+  private static _getNewTransaction(hub: Hub, transactionContext: TransactionContext): Transaction {
+    let traceId;
+    let parentSpanId;
+    let sampled;
+
+    const header = Tracing._getMeta('sentry-trace');
+    if (header) {
+      const span = SpanClass.fromTraceparent(header);
+      if (span) {
+        traceId = span.traceId;
+        parentSpanId = span.parentSpanId;
+        sampled = span.sampled;
+        Tracing._log(
+          `[Tracing] found 'sentry-meta' '<meta />' continuing trace with: trace_id: ${traceId} span_id: ${parentSpanId}`,
+        );
+      }
+    }
+
+    return hub.startTransaction({
+      parentSpanId,
+      sampled,
+      traceId,
+      trimEnd: true,
+      ...transactionContext,
+    }) as Transaction;
+  }
+
+  /**
+   * Returns the value of a meta tag
+   */
+  private static _getMeta(metaName: string): string | null {
+    const el = document.querySelector(`meta[name=${metaName}]`);
+    return el ? el.getAttribute('content') : null;
+  }
+
   /**
    * Pings the heartbeat
    */
@@ -454,10 +494,7 @@ export class Tracing implements Integration {
       return undefined;
     }
 
-    Tracing._activeTransaction = hub.startTransaction({
-      trimEnd: true,
-      ...transactionContext,
-    }) as Transaction;
+    Tracing._activeTransaction = Tracing._getNewTransaction(hub, transactionContext);
 
     // We set the transaction here on the scope so error events pick up the trace context and attach it to the error
     hub.configureScope(scope => scope.setSpan(Tracing._activeTransaction));

packages/tracing/src/integrations/types.ts

@@ -0,0 +1,82 @@
+/**
+ * The location (URL) of the object it is linked to. Changes done on it are reflected on the object it relates to.
+ * Both the Document and Window interface have such a linked Location, accessible via Document.location and Window.location respectively.
+ *
+ * Copy Location interface so that user's dont have to include dom typings with Tracing integration
+ * Based on https://github.com/microsoft/TypeScript/blob/4cf0afe2662980ebcd8d444dbd13d8f47d06fcd5/lib/lib.dom.d.ts#L9691
+ */
+export interface Location {
+  /**
+   * Returns a DOMStringList object listing the origins of the ancestor browsing contexts, from the parent browsing context to the top-level browsing context.
+   */
+  readonly ancestorOrigins: DOMStringList;
+  /**
+   * Returns the Location object's URL's fragment (includes leading "#" if non-empty).
+   *
+   * Can be set, to navigate to the same URL with a changed fragment (ignores leading "#").
+   */
+  hash: string;
+  /**
+   * Returns the Location object's URL's host and port (if different from the default port for the scheme).
+   *
+   * Can be set, to navigate to the same URL with a changed host and port.
+   */
+  host: string;
+  /**
+   * Returns the Location object's URL's host.
+   *
+   * Can be set, to navigate to the same URL with a changed host.
+   */
+  hostname: string;
+  /**
+   * Returns the Location object's URL.
+   *
+   * Can be set, to navigate to the given URL.
+   */
+  href: string;
+  // tslint:disable-next-line: completed-docs
+  toString(): string;
+  /**
+   * Returns the Location object's URL's origin.
+   */
+  readonly origin: string;
+  /**
+   * Returns the Location object's URL's path.
+   *
+   * Can be set, to navigate to the same URL with a changed path.
+   */
+  pathname: string;
+  /**
+   * Returns the Location object's URL's port.
+   *
+   * Can be set, to navigate to the same URL with a changed port.
+   */
+  port: string;
+  /**
+   * Returns the Location object's URL's scheme.
+   *
+   * Can be set, to navigate to the same URL with a changed scheme.
+   */
+  protocol: string;
+  /**
+   * Returns the Location object's URL's query (includes leading "?" if non-empty).
+   *
+   * Can be set, to navigate to the same URL with a changed query (ignores leading "?").
+   */
+  search: string;
+  /**
+   * Navigates to the given URL.
+   */
+  assign(url: string): void;
+  /**
+   * Reloads the current page.
+   */
+  reload(): void;
+  /** @deprecated */
+  // tslint:disable-next-line: unified-signatures completed-docs
+  reload(forcedReload: boolean): void;
+  /**
+   * Removes the current page from the session history and navigates to the given URL.
+   */
+  replace(url: string): void;
+}