fix(browser): Resolve rebase conflicts

Signed-off-by: Kaung Zin Hein <[email protected]>

Author: Zen-cronic

dev-packages/browser-integration-tests/suites/integrations/graphqlClient/fetch/test.ts

@@ -13,8 +13,8 @@ const query = `query Test{
 }`;
 const queryPayload = JSON.stringify({ query });
 
-sentryTest('should update spans for GraphQL Fetch requests', async ({ getLocalTestPath, page }) => {
-  const url = await getLocalTestPath({ testDir: __dirname });
+sentryTest('should update spans for GraphQL Fetch requests', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
 
   await page.route('**/foo', route => {
     return route.fulfill({
@@ -57,8 +57,8 @@ sentryTest('should update spans for GraphQL Fetch requests', async ({ getLocalTe
   });
 });
 
-sentryTest('should update breadcrumbs for GraphQL Fetch requests', async ({ getLocalTestPath, page }) => {
-  const url = await getLocalTestPath({ testDir: __dirname });
+sentryTest('should update breadcrumbs for GraphQL Fetch requests', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
 
   await page.route('**/foo', route => {
     return route.fulfill({

dev-packages/browser-integration-tests/suites/integrations/graphqlClient/xhr/test.ts

@@ -13,8 +13,8 @@ const query = `query Test{
 }`;
 const queryPayload = JSON.stringify({ query });
 
-sentryTest('should update spans for GraphQL XHR requests', async ({ getLocalTestPath, page }) => {
-  const url = await getLocalTestPath({ testDir: __dirname });
+sentryTest('should update spans for GraphQL XHR requests', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
 
   await page.route('**/foo', route => {
     return route.fulfill({
@@ -57,8 +57,8 @@ sentryTest('should update spans for GraphQL XHR requests', async ({ getLocalTest
   });
 });
 
-sentryTest('should update breadcrumbs for GraphQL XHR requests', async ({ getLocalTestPath, page }) => {
-  const url = await getLocalTestPath({ testDir: __dirname });
+sentryTest('should update breadcrumbs for GraphQL XHR requests', async ({ getLocalTestUrl, page }) => {
+  const url = await getLocalTestUrl({ testDir: __dirname });
 
   await page.route('**/foo', route => {
     return route.fulfill({

packages/browser/src/index.ts

@@ -32,8 +32,6 @@ import { feedbackSyncIntegration } from './feedbackSync';
 export { feedbackAsyncIntegration, feedbackSyncIntegration, feedbackSyncIntegration as feedbackIntegration };
 export { getFeedback, sendFeedback } from '@sentry-internal/feedback';
 
-export * from './metrics';
-
 export { defaultRequestInstrumentationOptions, instrumentOutgoingRequests } from './tracing/request';
 export {
   browserTracingIntegration,

packages/browser/src/integrations/breadcrumbs.ts

@@ -35,7 +35,7 @@ import {
   parseUrl,
   safeJoin,
   severityLevelFromString,
-} from '@sentry/utils';
+} from '@sentry/core';
 
 import type { FetchHint, XhrHint } from '@sentry-internal/replay';
 import { DEBUG_BUILD } from '../debug-build';
@@ -293,6 +293,7 @@ function _getFetchBreadcrumbHandler(client: Client): (handlerData: HandlerDataFe
     };
 
     if (handlerData.error) {
+      const data: FetchBreadcrumbData = handlerData.fetchData;
       const hint: FetchBreadcrumbHint = {
         data: handlerData.error,
         input: handlerData.args,
@@ -312,6 +313,10 @@ function _getFetchBreadcrumbHandler(client: Client): (handlerData: HandlerDataFe
       addBreadcrumb(breadcrumb, hint);
     } else {
       const response = handlerData.response as Response | undefined;
+      const data: FetchBreadcrumbData = {
+        ...handlerData.fetchData,
+        status_code: response && response.status,
+      };
 
       breadcrumbData.request_body_size = handlerData.fetchData.request_body_size;
       breadcrumbData.response_body_size = handlerData.fetchData.response_body_size;

packages/browser/src/integrations/graphqlClient.ts

@@ -8,8 +8,8 @@ import {
   defineIntegration,
   spanToJSON,
 } from '@sentry/core';
-import type { Client, IntegrationFn } from '@sentry/types';
-import { isString, stringMatchesSomePattern } from '@sentry/utils';
+import type { Client, IntegrationFn } from '@sentry/core';
+import { isString, stringMatchesSomePattern } from '@sentry/core';
 
 interface GraphQLClientOptions {
   endpoints: Array<string | RegExp>;

packages/browser/src/tracing/request.ts

@@ -3,6 +3,7 @@ import {
   addPerformanceInstrumentationHandler,
   addXhrInstrumentationHandler,
 } from '@sentry-internal/browser-utils';
+import { XhrHint } from '@sentry-internal/replay';
 import type { Client, HandlerDataXhr, SentryWrappedXMLHttpRequest, Span } from '@sentry/core';
 import {
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
@@ -12,6 +13,7 @@ import {
   addFetchInstrumentationHandler,
   browserPerformanceTimeOrigin,
   getActiveSpan,
+  getClient,
   getLocationHref,
   getTraceData,
   hasTracingEnabled,
@@ -404,6 +406,7 @@ export function xhrCallback(
     );
   }
 
+  const client = getClient();
   if (client) {
     client.emit('beforeOutgoingRequestSpan', span, handlerData as XhrHint);
   }

packages/browser/test/integrations/graphqlClient.test.ts

@@ -79,7 +79,7 @@ describe('GraphqlClient', () => {
         queryThree,
         { operationName: 'OnTestItemAdded', operationType: 'subscription' },
       ],
-      // ['should handle query without name', queryFour, { operationName: undefined, operationType: 'query' }],
+      // TODO: ['should handle query without name', queryFour, { operationName: undefined, operationType: 'query' }],
     ])('%s', (_, input, output) => {
       expect(parseGraphQLQuery(input)).toEqual(output);
     });

packages/core/src/client.ts

@@ -33,6 +33,7 @@ import type {
   TransactionEvent,
   Transport,
   TransportMakeRequestResponse,
+  XhrBreadcrumbHint,
 } from './types-hoist';
 
 import { getEnvelopeEndpointWithUrlEncodedAuth } from './api';
@@ -593,15 +594,25 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
    */
   public on(hook: 'startNavigationSpan', callback: (options: StartSpanOptions) => void): () => void;
 
-  /** @inheritdoc */
+  /**
+   * A hook for GraphQL client integration to enhance a span with request data.
+   * @returns A function that, when executed, removes the registered callback.
+   */
   public on(hook: 'beforeOutgoingRequestSpan', callback: (span: Span, hint: XhrHint | FetchHint) => void): () => void;
 
-  /** @inheritdoc */
+  /**
+   * A hook for GraphQL client integration to enhance a breadcrumb with request data.
+   * @returns A function that, when executed, removes the registered callback.
+   */
   public on(
     hook: 'beforeOutgoingRequestBreadcrumb',
     callback: (breadcrumb: Breadcrumb, hint: XhrHint | FetchHint) => void,
   ): () => void;
 
+  /**
+   * A hook that is called when the client is flushing
+   * @returns A function that, when executed, removes the registered callback.
+   */
   public on(hook: 'flush', callback: () => void): () => void;
 
   /**
@@ -728,13 +739,19 @@ export abstract class Client<O extends ClientOptions = ClientOptions> {
    */
   public emit(hook: 'startNavigationSpan', options: StartSpanOptions): void;
 
-  /** @inheritdoc */
-  public emit(hook: 'beforeOutgoingRequestSpan', span: Span, hint: XhrHint | FetchHint): void;
+  /**
+   * Emit a hook event for GraphQL client integration to enhance a span with request data.
+   */
+  emit(hook: 'beforeOutgoingRequestSpan', span: Span, hint: XhrHint | FetchHint): void;
 
-  /** @inheritdoc */
-  public emit(hook: 'beforeOutgoingRequestBreadcrumb', breadcrumb: Breadcrumb, hint: XhrHint | FetchHint): void;
+  /**
+   * Emit a hook event for GraphQL client integration to enhance a breadcrumb with request data.
+   */
+  emit(hook: 'beforeOutgoingRequestBreadcrumb', breadcrumb: Breadcrumb, hint: XhrHint | FetchHint): void;
 
-  /** @inheritdoc */
+  /**
+   * Emit a hook event for client flush
+   */
   public emit(hook: 'flush'): void;
 
   /**

packages/core/src/fetch.ts

@@ -1,3 +1,5 @@
+import { FetchHint } from './client';
+import { getClient } from './currentScopes';
 import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from './semanticAttributes';
 import { SPAN_STATUS_ERROR, setHttpStatus, startInactiveSpan } from './tracing';
 import { SentryNonRecordingSpan } from './tracing/sentryNonRecordingSpan';
@@ -96,6 +98,7 @@ export function instrumentFetchRequest(
     }
   }
 
+  const client = getClient();
   if (client) {
     // There's no 'input' key in HandlerDataFetch
     const fetchHint = {