From a1bcf73b5cee6d90e3a2dfbd2b93afe96940fe5b Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 30 Jan 2024 10:51:44 +0100
Subject: [PATCH 1/2] feat(tracing): Allow to pass client to
 `startBrowserTracing*Span` utils

---
 .../src/browser/browserTracingIntegration.ts                | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/tracing-internal/src/browser/browserTracingIntegration.ts b/packages/tracing-internal/src/browser/browserTracingIntegration.ts
index e0ed5b790b63..940922bf6b81 100644
--- a/packages/tracing-internal/src/browser/browserTracingIntegration.ts
+++ b/packages/tracing-internal/src/browser/browserTracingIntegration.ts
@@ -395,8 +395,7 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
  * Manually start a page load span.
  * This will only do something if the BrowserTracing integration has been setup.
  */
-export function startBrowserTracingPageLoadSpan(spanOptions: StartSpanOptions): void {
-  const client = getClient();
+export function startBrowserTracingPageLoadSpan(spanOptions: StartSpanOptions, client = getClient()): void {
   if (!client || !client.emit) {
     return;
   }
@@ -408,8 +407,7 @@ export function startBrowserTracingPageLoadSpan(spanOptions: StartSpanOptions):
  * Manually start a navigation span.
  * This will only do something if the BrowserTracing integration has been setup.
  */
-export function startBrowserTracingNavigationSpan(spanOptions: StartSpanOptions): void {
-  const client = getClient();
+export function startBrowserTracingNavigationSpan(spanOptions: StartSpanOptions, client = getClient()): void {
   if (!client || !client.emit) {
     return;
   }

From 4af9057c42bb672ecc7acac622092cd834fce29e Mon Sep 17 00:00:00 2001
From: Francesco Novy <francesco.novy@sentry.io>
Date: Tue, 30 Jan 2024 11:28:25 +0100
Subject: [PATCH 2/2] pr feedback

---
 .../src/browser/browserTracingIntegration.ts       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/tracing-internal/src/browser/browserTracingIntegration.ts b/packages/tracing-internal/src/browser/browserTracingIntegration.ts
index 940922bf6b81..34fe4a7b13d2 100644
--- a/packages/tracing-internal/src/browser/browserTracingIntegration.ts
+++ b/packages/tracing-internal/src/browser/browserTracingIntegration.ts
@@ -1,6 +1,5 @@
 /* eslint-disable max-lines, complexity */
 import type { IdleTransaction } from '@sentry/core';
-import { getClient } from '@sentry/core';
 import { getCurrentHub } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,
@@ -11,6 +10,7 @@ import {
   startIdleTransaction,
 } from '@sentry/core';
 import type {
+  Client,
   IntegrationFn,
   StartSpanOptions,
   Transaction,
@@ -336,7 +336,7 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
           origin: 'auto.pageload.browser',
           metadata: { source: 'url' },
         };
-        startBrowserTracingPageLoadSpan(context);
+        startBrowserTracingPageLoadSpan(client, context);
       }
 
       if (options.instrumentNavigation && client.emit) {
@@ -364,7 +364,7 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
               metadata: { source: 'url' },
             };
 
-            startBrowserTracingNavigationSpan(context);
+            startBrowserTracingNavigationSpan(client, context);
           }
         });
       }
@@ -395,8 +395,8 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
  * Manually start a page load span.
  * This will only do something if the BrowserTracing integration has been setup.
  */
-export function startBrowserTracingPageLoadSpan(spanOptions: StartSpanOptions, client = getClient()): void {
-  if (!client || !client.emit) {
+export function startBrowserTracingPageLoadSpan(client: Client, spanOptions: StartSpanOptions): void {
+  if (!client.emit) {
     return;
   }
 
@@ -407,8 +407,8 @@ export function startBrowserTracingPageLoadSpan(spanOptions: StartSpanOptions, c
  * Manually start a navigation span.
  * This will only do something if the BrowserTracing integration has been setup.
  */
-export function startBrowserTracingNavigationSpan(spanOptions: StartSpanOptions, client = getClient()): void {
-  if (!client || !client.emit) {
+export function startBrowserTracingNavigationSpan(client: Client, spanOptions: StartSpanOptions): void {
+  if (!client.emit) {
     return;
   }