ref: Remove makeRoot

Author: HazAT

packages/apm/src/hubextensions.ts

@@ -1,17 +1,8 @@
 import { getMainCarrier, Hub } from '@sentry/hub';
 import { SpanContext } from '@sentry/types';
-import { isInstanceOf } from '@sentry/utils';
 
 import { Span } from './span';
 
-/**
- * Checks whether given value is instance of Span
- * @param span value to check
- */
-function isSpanInstance(span: unknown): span is Span {
-  return isInstanceOf(span, Span);
-}
-
 /** Returns all trace headers that are currently on the top scope. */
 function traceHeaders(): { [key: string]: string } {
   // @ts-ignore
@@ -33,11 +24,9 @@ function traceHeaders(): { [key: string]: string } {
  * and attach a `SpanRecorder`. If it's of type `SpanContext` and there is already a `Span` on the Scope,
  * the created Span will have a reference to it and become it's child. Otherwise it'll crete a new `Span`.
  *
- * @param spanOrSpanContext Already constructed span or properties with which the span should be created
- * @param makeRoot This will just create the span as it is and will not attach it to the span on the scope (if there is one).
- * Under some circumstances, in internal integrations, for example, this is used to make sure they are not interfering with each other.
+ * @param spanContext Already constructed span or properties with which the span should be created
  */
-function startSpan(spanOrSpanContext?: Span | SpanContext, makeRoot: boolean = false): Span {
+function startSpan(spanContext?: SpanContext): Span {
   // @ts-ignore
   const hub = this as Hub;
   const scope = hub.getScope();
@@ -48,20 +37,20 @@ function startSpan(spanOrSpanContext?: Span | SpanContext, makeRoot: boolean = f
   // If we do not have this, we will add it later on twice to the span recorder and therefore have too many spans
   let addedAsChild = false;
 
-  if (!isSpanInstance(spanOrSpanContext) && !makeRoot && scope) {
+  if (scope) {
     const parentSpan = scope.getSpan() as Span;
     if (parentSpan) {
-      span = parentSpan.child(spanOrSpanContext);
+      span = parentSpan.child(spanContext);
       addedAsChild = true;
     }
   }
 
-  if (!isSpanInstance(span)) {
-    span = new Span(spanOrSpanContext, hub);
+  if (!span) {
+    span = new Span(spanContext, hub);
   }
 
   // We only roll the dice on sampling for "root" spans (transactions) because the childs inherit this state
-  if (span.sampled === undefined && !span.isChildSpan()) {
+  if (span.sampled === undefined && span.isRootSpan()) {
     const sampleRate = (client && client.getOptions().tracesSampleRate) || 0;
     span.sampled = Math.random() < sampleRate;
   }

packages/apm/src/integrations/tracing.ts

@@ -371,13 +371,10 @@ export class Tracing implements Integration {
       return undefined;
     }
 
-    Tracing._activeTransaction = hub.startSpan(
-      {
-        ...spanContext,
-        transaction: name,
-      },
-      true,
-    );
+    Tracing._activeTransaction = hub.startSpan({
+      ...spanContext,
+      transaction: name,
+    });
 
     // We set the transaction on the scope so if there are any other spans started outside of this integration
     // we also add them to this transaction.

packages/apm/src/span.ts

@@ -195,8 +195,8 @@ export class Span implements SpanInterface, SpanContext {
   /**
    * @inheritDoc
    */
-  public isChildSpan(): boolean {
-    return this._parentSpanId !== undefined;
+  public isRootSpan(): boolean {
+    return this._parentSpanId === undefined;
   }
 
   /**
@@ -283,6 +283,11 @@ export class Span implements SpanInterface, SpanContext {
 
     this.timestamp = timestampWithMs();
 
+    // We will not send any child spans
+    if (!this.isRootSpan()) {
+      return undefined;
+    }
+
     // This happens if a span was initiated outside of `hub.startSpan`
     // Also if the span was sampled (sampled = false) in `hub.startSpan` already
     if (this.spanRecorder === undefined) {
@@ -306,11 +311,6 @@ export class Span implements SpanInterface, SpanContext {
       }).timestamp;
     }
 
-    // We will not send any child spans
-    if (this.isChildSpan()) {
-      return undefined;
-    }
-
     return this._hub.captureEvent({
       contexts: {
         trace: this.getTraceContext(),

packages/apm/test/hub.test.ts

@@ -35,6 +35,7 @@ describe('Hub', () => {
         expect(child.sampled).toBeFalsy();
       });
     });
+
     describe('start', () => {
       test('simple', () => {
         const hub = new Hub(new BrowserClient());

packages/types/src/span.ts

@@ -70,9 +70,9 @@ export interface Span {
   isSuccess(): boolean;
 
   /**
-   * Determines if the span is a child of another span
+   * Determines if the span is transaction (root)
    */
-  isChildSpan(): boolean;
+  isRootSpan(): boolean;
 }
 
 /** Interface holder all properties that can be set on a Span on creation. */