.

Author: Luca Forstner

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

@@ -8,7 +8,10 @@ import {
   setCurrentClient,
   spanIsSampled,
   spanToJSON,
+  startInactiveSpan,
 } from '@sentry/core';
+import type { StartSpanOptions } from '@sentry/types';
+import { timestampInSeconds } from '@sentry/utils';
 import { JSDOM } from 'jsdom';
 import { browserTracingIntegration, startBrowserTracingNavigationSpan, startBrowserTracingPageLoadSpan } from '../..';
 import { WINDOW } from '../../src/browser/types';
@@ -181,6 +184,26 @@ describe('browserTracingIntegration', () => {
     });
   });
 
+  it('trims pageload transactions to the max duration of the transactions children', () => {
+    const client = new TestClient(
+      getDefaultClientOptions({
+        integrations: [browserTracingIntegration()],
+      }),
+    );
+
+    setCurrentClient(client);
+    client.init();
+
+    const pageloadSpan = getActiveSpan();
+    const childSpan = startInactiveSpan({ name: 'pageload-child' });
+    const timestamp = timestampInSeconds();
+
+    childSpan?.end(timestamp);
+    pageloadSpan?.end(timestamp + 12345);
+
+    expect(spanToJSON(pageloadSpan!).timestamp).toBe(timestamp);
+  });
+
   describe('startBrowserTracingPageLoadSpan', () => {
     it('works without integration setup', () => {
       const client = new TestClient(
@@ -275,6 +298,30 @@ describe('browserTracingIntegration', () => {
         trace_id: expect.any(String),
       });
     });
+
+    it('calls before beforeStartSpan', () => {
+      const mockBeforeStartSpan = jest.fn((options: StartSpanOptions) => options);
+
+      const client = new TestClient(
+        getDefaultClientOptions({
+          tracesSampleRate: 0,
+          integrations: [
+            browserTracingIntegration({ instrumentPageLoad: false, beforeStartSpan: mockBeforeStartSpan }),
+          ],
+        }),
+      );
+      setCurrentClient(client);
+      client.init();
+
+      startBrowserTracingPageLoadSpan(client, { name: 'test span' });
+
+      expect(mockBeforeStartSpan).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: 'test span',
+          op: 'pageload',
+        }),
+      );
+    });
   });
 
   describe('startBrowserTracingNavigationSpan', () => {
@@ -371,5 +418,33 @@ describe('browserTracingIntegration', () => {
         trace_id: expect.any(String),
       });
     });
+
+    it('calls before beforeStartSpan', () => {
+      const mockBeforeStartSpan = jest.fn((options: StartSpanOptions) => options);
+
+      const client = new TestClient(
+        getDefaultClientOptions({
+          tracesSampleRate: 0,
+          integrations: [
+            browserTracingIntegration({
+              instrumentPageLoad: false,
+              instrumentNavigation: false,
+              beforeStartSpan: mockBeforeStartSpan,
+            }),
+          ],
+        }),
+      );
+      setCurrentClient(client);
+      client.init();
+
+      startBrowserTracingNavigationSpan(client, { name: 'test span' });
+
+      expect(mockBeforeStartSpan).toHaveBeenCalledWith(
+        expect.objectContaining({
+          name: 'test span',
+          op: 'navigation',
+        }),
+      );
+    });
   });
 });

packages/tracing-internal/test/browser/browsertracing.test.ts

@@ -99,32 +99,6 @@ describe('BrowserTracing', () => {
       customStartTransaction({ name: 'a/path', op: 'pageload' });
     };
 
-    it('calls custom routing instrumenation', () => {
-      createBrowserTracing(true, {
-        routingInstrumentation: customInstrumentRouting,
-      });
-
-      const transaction = getActiveTransaction() as IdleTransaction;
-      expect(transaction).toBeDefined();
-      expect(transaction.name).toBe('a/path');
-      expect(transaction.op).toBe('pageload');
-    });
-
-    it('trims all transactions', () => {
-      createBrowserTracing(true, {
-        routingInstrumentation: customInstrumentRouting,
-      });
-
-      const transaction = getActiveTransaction() as IdleTransaction;
-      const span = transaction.startChild();
-
-      const timestamp = timestampInSeconds();
-      span.end(timestamp);
-      transaction.end(timestamp + 12345);
-
-      expect(spanToJSON(transaction).timestamp).toBe(timestamp);
-    });
-
     describe('beforeNavigate', () => {
       it('is called on transaction creation', () => {
         const mockBeforeNavigation = jest.fn().mockReturnValue({ name: 'here/is/my/path' });