Merge 102f1f1 into 81c2acb

Author: krystofwoldrich

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Features
+
+- Send debug information with Profiles for symbolicated stack traces ([#3338](https://github.com/getsentry/sentry-react-native/pull/3338))
+
 ### Fixes
 
 - Add actual `activeThreadId` to Profiles ([#3338](https://github.com/getsentry/sentry-react-native/pull/3338))

src/js/profiling/hermes.ts

@@ -58,9 +58,10 @@ export interface ParsedHermesStackFrame {
   file?: string;
   lineno?: number;
   colno?: number;
+  in_app?: boolean;
 }
 
-const DEFAULT_BUNDLE_NAME =
+export const DEFAULT_BUNDLE_NAME =
   Platform.OS === 'android' ? ANDROID_DEFAULT_BUNDLE_NAME : Platform.OS === 'ios' ? IOS_DEFAULT_BUNDLE_NAME : undefined;
 const ANONYMOUS_FUNCTION_NAME = 'anonymous';
 
@@ -71,6 +72,9 @@ const ANONYMOUS_FUNCTION_NAME = 'anonymous';
 export function parseHermesJSStackFrame(frame: StackFrame): ParsedHermesStackFrame {
   if (frame.category !== 'JavaScript') {
     // Native
+    if (frame.name === '[root]') {
+      return { function: frame.name, in_app: false };
+    }
     return { function: frame.name };
   }
 

src/js/profiling/types.ts

@@ -1,6 +1,11 @@
-import type { ThreadCpuProfile } from '@sentry/types';
+import type { ThreadCpuFrame as SentryThreadCpuFrame, ThreadCpuProfile } from '@sentry/types';
+
+export interface ThreadCpuFrame extends SentryThreadCpuFrame {
+  in_app?: boolean;
+}
 
 export interface RawThreadCpuProfile extends ThreadCpuProfile {
+  frames: ThreadCpuFrame[];
   profile_id?: string;
   active_thread_id: string;
 }

src/js/profiling/utils.ts

@@ -1,6 +1,7 @@
-import type { Envelope, Event, Profile } from '@sentry/types';
-import { forEachEnvelopeItem, logger } from '@sentry/utils';
+import type { DebugImage, Envelope, Event, Profile } from '@sentry/types';
+import { forEachEnvelopeItem, GLOBAL_OBJ, logger } from '@sentry/utils';
 
+import { DEFAULT_BUNDLE_NAME } from './hermes';
 import type { RawThreadCpuProfile } from './types';
 
 /**
@@ -136,7 +137,7 @@ function createProfilePayload(
   const profile: Profile = {
     event_id: profile_id,
     timestamp: new Date(start_timestamp).toISOString(),
-    platform: 'node',
+    platform: 'javascript',
     version: '1',
     release: release,
     environment: environment,
@@ -163,11 +164,47 @@ function createProfilePayload(
       trace_id: trace_id || '',
       active_thread_id: cpuProfile.active_thread_id,
     },
+    debug_meta: {
+      images: getDebugMetadata(),
+    },
   };
 
   return profile;
 }
 
+/**
+ * Returns debug meta images of the loaded bundle.
+ */
+export function getDebugMetadata(): DebugImage[] {
+  if (!DEFAULT_BUNDLE_NAME) {
+    return [];
+  }
+
+  const debugIdMap = GLOBAL_OBJ._sentryDebugIds;
+  if (!debugIdMap) {
+    return [];
+  }
+
+  const debugIdsKeys = Object.keys(debugIdMap);
+  if (!debugIdsKeys.length) {
+    return [];
+  }
+
+  if (debugIdsKeys.length > 1) {
+    logger.warn(
+      '[Profiling] Multiple debug images found, but only one one bundle is supported. Using the first one...',
+    );
+  }
+
+  return [
+    {
+      code_file: DEFAULT_BUNDLE_NAME,
+      debug_id: debugIdMap[debugIdsKeys[0]],
+      type: 'sourcemap',
+    },
+  ];
+}
+
 /**
  * Adds items to envelope if they are not already present - mutates the envelope.
  * @param envelope

test/profiling/convertHermesProfile.test.ts

@@ -84,6 +84,7 @@ describe('convert hermes profile to sentry profile', () => {
       frames: [
         {
           function: '[root]',
+          in_app: false,
         },
         {
           colno: 33,