Merge 3815e25 into af41a5b

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Changes
+
+- Native Frames uses `spanId` to attach frames replacing `traceId` ([#4030](https://github.com/getsentry/sentry-react-native/pull/4030))
+
 ### Dependencies
 
 - Bump JavaScript SDK from v8.11.0 to v8.26.0 ([#3851](https://github.com/getsentry/sentry-react-native/pull/3851))

src/js/integrations/default.ts

@@ -12,6 +12,8 @@ import {
   browserGlobalHandlersIntegration,
   browserLinkedErrorsIntegration,
   browserReplayIntegration,
+  createNativeFramesIntegrations,
+  createReactNativeRewriteFrames,
   debugSymbolicatorIntegration,
   dedupeIntegration,
   deviceContextIntegration,
@@ -24,7 +26,6 @@ import {
   inboundFiltersIntegration,
   mobileReplayIntegration,
   modulesLoaderIntegration,
-  nativeFramesIntegration,
   nativeLinkedErrorsIntegration,
   nativeReleaseIntegration,
   reactNativeErrorHandlersIntegration,
@@ -36,7 +37,6 @@ import {
   userInteractionIntegration,
   viewHierarchyIntegration,
 } from './exports';
-import { createReactNativeRewriteFrames } from './rewriteframes';
 
 /**
  * Returns the default ReactNative integrations based on the current environment.
@@ -104,8 +104,9 @@ export function getDefaultIntegrations(options: ReactNativeClientOptions): Integ
   if (hasTracingEnabled && options.enableAppStartTracking) {
     integrations.push(appStartIntegration());
   }
-  if (hasTracingEnabled && options.enableNativeFramesTracking) {
-    integrations.push(nativeFramesIntegration());
+  const nativeFrames = createNativeFramesIntegrations(hasTracingEnabled && options.enableNativeFramesTracking);
+  if (nativeFrames) {
+    integrations.push(nativeFrames);
   }
   if (hasTracingEnabled && options.enableStallTracking) {
     integrations.push(stallTrackingIntegration());

src/js/integrations/exports.ts

@@ -14,9 +14,10 @@ export { expoContextIntegration } from './expocontext';
 export { spotlightIntegration } from './spotlight';
 export { mobileReplayIntegration } from '../replay/mobilereplay';
 export { appStartIntegration } from '../tracing/integrations/appStart';
-export { nativeFramesIntegration } from '../tracing/integrations/nativeFrames';
+export { nativeFramesIntegration, createNativeFramesIntegrations } from '../tracing/integrations/nativeFrames';
 export { stallTrackingIntegration } from '../tracing/integrations/stalltracking';
 export { userInteractionIntegration } from '../tracing/integrations/userInteraction';
+export { createReactNativeRewriteFrames } from './rewriteframes';
 
 export {
   breadcrumbsIntegration,