more tests

Author: Lms24

packages/browser/src/tracing/previousTrace.ts

@@ -25,7 +25,8 @@ export const PREVIOUS_TRACE_KEY = 'sentry_previous_trace';
  * Adds a previous_trace span link to the passed span if the passed
  * previousTraceInfo is still valid.
  *
- * @returns the updated previous trace info (based on the current span/trace) or `undefined` the
+ * @returns the updated previous trace info (based on the current span/trace) to
+ * be used on the next call
  */
 export function addPreviousTraceSpanLink(
   previousTraceInfo: PreviousTraceInfo | undefined,

packages/browser/test/tracing/browserTracingIntegration.test.ts

@@ -29,6 +29,7 @@ import {
   spanIsSampled,
   spanToJSON,
   startInactiveSpan,
+  withScope,
 } from '@sentry/core';
 import type { Span, StartSpanOptions } from '@sentry/core';
 import { JSDOM } from 'jsdom';
@@ -1028,6 +1029,75 @@ describe('browserTracingIntegration', () => {
     });
   });
 
+  describe('enablePreviousTrace', () => {
+    it('registers the previous trace listener on span start by default', () => {
+      const client = new BrowserClient(
+        getDefaultBrowserClientOptions({
+          tracesSampleRate: 1,
+          integrations: [browserTracingIntegration({ instrumentPageLoad: false, instrumentNavigation: false })],
+        }),
+      );
+      setCurrentClient(client);
+      client.init();
+
+      const span1 = startInactiveSpan({ name: 'test span 1', forceTransaction: true });
+      span1.end();
+      const span1Json = spanToJSON(span1);
+
+      expect(span1Json.links).toBeUndefined();
+
+      // ensure we start a new trace
+      getCurrentScope().setPropagationContext({ traceId: '123', sampleRand: 0.2 });
+
+      const span2 = startInactiveSpan({ name: 'test span 2', forceTransaction: true });
+      span2.end();
+      const spanJson2 = spanToJSON(span2);
+
+      expect(spanJson2.links).toEqual([
+        {
+          attributes: {
+            'sentry.link.type': 'previous_trace',
+          },
+          sampled: true,
+          span_id: span1Json.span_id,
+          trace_id: span1Json.trace_id,
+        },
+      ]);
+    });
+
+    it("doesn't register the previous trace listener on span start if disabled", () => {
+      const client = new BrowserClient(
+        getDefaultBrowserClientOptions({
+          tracesSampleRate: 1,
+          integrations: [
+            browserTracingIntegration({
+              instrumentPageLoad: false,
+              instrumentNavigation: false,
+              enablePreviousTrace: false,
+            }),
+          ],
+        }),
+      );
+      setCurrentClient(client);
+      client.init();
+
+      const span1 = startInactiveSpan({ name: 'test span 1', forceTransaction: true });
+      span1.end();
+      const span1Json = spanToJSON(span1);
+
+      expect(span1Json.links).toBeUndefined();
+
+      // ensure we start a new trace
+      getCurrentScope().setPropagationContext({ traceId: '123', sampleRand: 0.2 });
+
+      const span2 = startInactiveSpan({ name: 'test span 2', forceTransaction: true });
+      span2.end();
+      const spanJson2 = spanToJSON(span2);
+
+      expect(spanJson2.links).toBeUndefined();
+    });
+  });
+
   // TODO(lforst): I cannot manage to get this test to pass.
   /*
   it('heartbeatInterval can be a custom value', () => {