From 5d55591adeb756e9f52166d1c4157577dfd991ca Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Fri, 5 May 2023 22:30:16 +0200
Subject: [PATCH 01/40] Add profiling start and stop to RNSentry Android module

---
 .../io/sentry/react/RNSentryModuleImpl.java   | 50 +++++++++++++++++++
 .../java/io/sentry/react/RNSentryPackage.java |  3 +-
 .../java/io/sentry/react/RNSentryModule.java  | 11 ++++
 .../MainApplication.java                      | 17 +++++++
 .../src/Screens/HomeScreen.tsx                | 16 ++++++
 src/js/NativeRNSentry.ts                      |  2 +
 src/js/index.ts                               |  2 +
 src/js/wrapper.ts                             | 28 +++++++++++
 8 files changed, 128 insertions(+), 1 deletion(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index daa1b94b0..5fdba78b9 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -14,6 +14,7 @@
 import androidx.core.app.FrameMetricsAggregator;
 
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -26,9 +27,12 @@
 import com.facebook.react.bridge.WritableNativeMap;
 
 import java.io.BufferedInputStream;
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.HashMap;
@@ -69,6 +73,8 @@ public class RNSentryModuleImpl {
 
     public static final String NAME = "RNSentry";
 
+    private static JavaScriptExecutorFactory javaScriptExecutorFactory = null;
+
     private static final ILogger logger = new AndroidLogger(NAME);
     private static final BuildInfoProvider buildInfo = new BuildInfoProvider(logger);
     private static final String modulesPath = "modules.json";
@@ -88,6 +94,10 @@ public class RNSentryModuleImpl {
 
     private static final int SCREENSHOT_TIMEOUT_SECONDS = 2;
 
+    public static void setJavaScriptExecutorFactory(JavaScriptExecutorFactory javaScriptExecutorFactory) {
+        RNSentryModuleImpl.javaScriptExecutorFactory = javaScriptExecutorFactory;
+    }
+
     public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
         packageInfo = getPackageInfo(reactApplicationContext);
         this.reactApplicationContext = reactApplicationContext;
@@ -615,6 +625,46 @@ public void disableNativeFramesTracking() {
         }
     }
 
+    public void startProfiling(Promise promise) {
+        final WritableMap result = new WritableNativeMap();
+        try {
+            RNSentryModuleImpl.javaScriptExecutorFactory.startSamplingProfiler();
+        } catch (UnsupportedOperationException e) {
+            String error = javaScriptExecutorFactory.toString() + "does not support Sampling Profiler";
+            logger.log(SentryLevel.ERROR, error);
+            result.putString("error", error);
+        }
+        promise.resolve(result);
+    }
+
+    public void stopProfiling(Promise promise) {
+        final WritableMap result = new WritableNativeMap();
+        try {
+            final File output = File.createTempFile(
+        "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
+            RNSentryModuleImpl.javaScriptExecutorFactory.stopSamplingProfiler(output.getPath());
+
+            StringBuilder text = new StringBuilder();
+            BufferedReader br = new BufferedReader(new FileReader(output));
+            String line;
+            while ((line = br.readLine()) != null) {
+                text.append(line);
+                text.append('\n');
+            }
+
+            result.putString("data", text.toString());
+        } catch (IOException e) {
+            final String error = "Could not create temporary file for saving results from Sampling Profiler";
+            logger.log(SentryLevel.ERROR, error);
+            result.putString("error", error);
+        } catch (UnsupportedOperationException e) {
+            final String error = javaScriptExecutorFactory.toString() + "does not support Sampling Profiler";
+            logger.log(SentryLevel.ERROR, error);
+            result.putString("error", error);
+        }
+        promise.resolve(result);
+    }
+
     private void setEventOriginTag(SentryEvent event) {
         SdkVersion sdk = event.getSdk();
         if (sdk != null) {
diff --git a/android/src/main/java/io/sentry/react/RNSentryPackage.java b/android/src/main/java/io/sentry/react/RNSentryPackage.java
index eb2fd90f2..c9ccdbde9 100644
--- a/android/src/main/java/io/sentry/react/RNSentryPackage.java
+++ b/android/src/main/java/io/sentry/react/RNSentryPackage.java
@@ -5,6 +5,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;
@@ -17,7 +18,7 @@ public class RNSentryPackage extends TurboReactPackage {
   @Override
   public NativeModule getModule(String name, ReactApplicationContext reactContext) {
     if (name.equals(RNSentryModuleImpl.NAME)) {
-      return new RNSentryModule(reactContext);
+      return new io.sentry.react.RNSentryModule(reactContext);
     } else {
       return null;
     }
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryModule.java b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
index 40eb787b1..b67c50e15 100644
--- a/android/src/newarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
@@ -2,6 +2,7 @@
 
 import androidx.annotation.NonNull;
 
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
@@ -121,4 +122,14 @@ public void fetchNativeDeviceContexts(Promise promise) {
     public void fetchNativeSdkInfo(Promise promise) {
         // Not used on android
     }
+
+    @Override
+    public void startProfiling(Promise promise) {
+        this.impl.startProfiling(promise);
+    }
+
+    @Override
+    public void stopProfiling(Promise promise) {
+        this.impl.stopProfiling(promise);
+    }
 }
diff --git a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java
index cae11eb38..444d6418d 100644
--- a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java
+++ b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java
@@ -1,21 +1,32 @@
 package com.samplenewarchitecture;
 
 import android.app.Application;
+
+import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
 import com.facebook.react.PackageList;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JavaScriptExecutor;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
+import com.facebook.react.common.JavascriptException;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactNativeHost;
 import com.facebook.soloader.SoLoader;
 import java.util.List;
 
+import javax.annotation.Nullable;
+
+import io.sentry.react.RNSentryModuleImpl;
 import io.sentry.react.RNSentryPackage;
 
 public class MainApplication extends Application implements ReactApplication {
 
+  private final JavaScriptExecutorFactory mJavaScriptExecutorFactory = new HermesExecutorFactory();
+
   private final ReactNativeHost mReactNativeHost =
       new DefaultReactNativeHost(this) {
+
         @Override
         public boolean getUseDeveloperSupport() {
           return BuildConfig.DEBUG;
@@ -52,6 +63,12 @@ protected boolean isNewArchEnabled() {
         protected Boolean isHermesEnabled() {
           return BuildConfig.IS_HERMES_ENABLED;
         }
+
+        @Override
+        protected @Nullable JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
+            RNSentryModuleImpl.setJavaScriptExecutorFactory(mJavaScriptExecutorFactory);
+            return mJavaScriptExecutorFactory;
+        }
       };
 
   @Override
diff --git a/sample-new-architecture/src/Screens/HomeScreen.tsx b/sample-new-architecture/src/Screens/HomeScreen.tsx
index 7a576e7e6..a2779ed3b 100644
--- a/sample-new-architecture/src/Screens/HomeScreen.tsx
+++ b/sample-new-architecture/src/Screens/HomeScreen.tsx
@@ -121,6 +121,22 @@ const HomeScreen = (props: Props) => {
 
         <Spacer />
 
+        <Button
+          title="Start profiling"
+          onPress={() => {
+            Sentry.NATIVE.startProfiling();
+          }}
+        />
+
+        <Button
+          title="Stop profiling"
+          onPress={() => {
+            Sentry.NATIVE.stopProfiling();
+          }}
+        />
+
+        <Spacer />
+
         <Sentry.ErrorBoundary fallback={errorBoundaryFallback}>
           <Button
             title="Activate Error Boundary"
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index 4c2f8bb7a..5d369e6ce 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -31,6 +31,8 @@ export interface Spec extends TurboModule {
   enableNativeFramesTracking(): void;
   fetchModules(): Promise<string | undefined | null>;
   fetchViewHierarchy(): Promise<number[] | undefined | null>;
+  startProfiling(): Promise<{ error?: string }>;
+  stopProfiling(): Promise<{ data?: string, error?: string }>;
 }
 
 export type NativeAppStartResponse = {
diff --git a/src/js/index.ts b/src/js/index.ts
index 3c033fcab..c42d27df0 100644
--- a/src/js/index.ts
+++ b/src/js/index.ts
@@ -50,6 +50,8 @@ import { SDK_NAME, SDK_VERSION } from './version';
 export { ReactNativeOptions } from './options';
 export { ReactNativeClient } from './client';
 
+export { NATIVE } from './wrapper';
+
 export {
   init,
   wrap,
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 4b494bf6d..6720585e7 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -79,6 +79,9 @@ interface SentryNativeWrapper {
 
   fetchModules(): Promise<Record<string, string> | null>;
   fetchViewHierarchy(): PromiseLike<Uint8Array | null>;
+
+  startProfiling(): Promise<void>;
+  stopProfiling(): Promise<void>;
 }
 
 /**
@@ -495,6 +498,31 @@ export const NATIVE: SentryNativeWrapper = {
     return raw ? new Uint8Array(raw) : null;
   },
 
+  async startProfiling(): Promise<void> {
+    if (!this.enableNative) {
+      throw this._DisabledNativeError;
+    }
+    if (!this._isModuleLoaded(RNSentry)) {
+      throw this._NativeClientError;
+    }
+
+    const { error } = await RNSentry.startProfiling();
+    logger.error(error);
+  },
+
+  async stopProfiling(): Promise<void> {
+    if (!this.enableNative) {
+      throw this._DisabledNativeError;
+    }
+    if (!this._isModuleLoaded(RNSentry)) {
+      throw this._NativeClientError;
+    }
+
+    const { error, data } = await RNSentry.stopProfiling();
+    logger.error(error);
+    logger.log(data);
+  },
+
   /**
    * Gets the event from envelopeItem and applies the level filter to the selected event.
    * @param data An envelope item containing the event.

From c3f41570072242058dabb0f412ed9a6805060c9e Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 10 May 2023 17:59:10 +0200
Subject: [PATCH 02/40] WIP! Add Profiling Integration Interface

---
 src/js/integrations/profiling.ts | 66 ++++++++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 src/js/integrations/profiling.ts

diff --git a/src/js/integrations/profiling.ts b/src/js/integrations/profiling.ts
new file mode 100644
index 000000000..182723ad1
--- /dev/null
+++ b/src/js/integrations/profiling.ts
@@ -0,0 +1,66 @@
+import type { EventProcessor, Integration } from '@sentry/types';
+
+interface Sample {
+  stack_id: number;
+  thread_id: string;
+  elapsed_since_start_ns: string;
+}
+
+type Stack = number[];
+
+type Frame = {
+  function: string;
+  file: string;
+  line: number;
+  column: number;
+};
+
+interface ThreadCpuProfile {
+  samples: Sample[];
+  stacks: Stack[];
+  frames: Frame[];
+  thread_metadata: Record<string, { name?: string; priority?: number }>;
+  queue_metadata?: Record<string, { label: string }>;
+}
+
+/**
+ *
+ */
+export class ProfilingIntegration implements Integration {
+
+  /**
+   * @inheritDoc
+   */
+  public static id: string = 'ProfilingIntegration';
+
+  /**
+   * @inheritDoc
+   */
+  public name: string = ProfilingIntegration.id;
+
+  /**
+   * @inheritDoc
+   */
+  public setupOnce(addGlobalEventProcessor: (e: EventProcessor) => void, getCurrentHub: () => Hub): void {
+    // TODO:
+  }
+}
+
+/**
+ *
+ */
+export async function startProfiling(): Promise<void> {
+  // TODO:
+}
+
+/**
+ *
+ */
+export async function stopProfiling(): Promise<ThreadCpuProfile> {
+  // TODO:
+  throw new Error('not implemented');
+}
+
+function toUnixTimestampNs(uptimeTimestampNs: number, relativeTimestampNs: number): number {
+  return uptimeTimestampNs + relativeTimestampNs;
+}

From 03e054f4876690e6b8b944d54474b371922fb18a Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Thu, 11 May 2023 17:47:18 +0200
Subject: [PATCH 03/40] Add convertToSentryProfile

---
 ios/RNSentry.mm                       |  46 ++++++++++
 scripts/hermes-profile-transformer.js |  26 ++++++
 src/js/NativeRNSentry.ts              |   1 +
 src/js/integrations/profiling.ts      | 124 ++++++++++++++++++++++----
 src/js/utils/hermes.ts                |  41 +++++++++
 src/js/wrapper.ts                     |  20 ++++-
 test/integrations/profiling.test.ts   |  21 +++++
 7 files changed, 260 insertions(+), 19 deletions(-)
 create mode 100644 scripts/hermes-profile-transformer.js
 create mode 100644 src/js/utils/hermes.ts
 create mode 100644 test/integrations/profiling.test.ts

diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index 3204a1824..bdb109eda 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -11,6 +11,10 @@
 #import <Sentry/SentryScreenFrames.h>
 #import <Sentry/SentryOptions+HybridSDKs.h>
 
+//#ifdef SENTRY_PROFILING_ENABLED
+#import <hermes/hermes.h>
+//#endif
+
 // Thanks to this guard, we won't import this header when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
 #import "RNSentrySpec.h"
@@ -498,6 +502,48 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
     // the 'tracesSampleRate' or 'tracesSampler' option.
 }
 
+RCT_EXPORT_METHOD(startProfiling:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+//#ifdef SENTRY_PROFILING_ENABLED
+    facebook::hermes::HermesRuntime::enableSamplingProfiler();
+    resolve(@{});
+//#else
+//  NSLog(@"Use SENTRY_PROFILING_ENABLED env to build with enabled profiling");
+//#endif
+}
+
+RCT_EXPORT_METHOD(stopProfiling:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+//#ifdef SENTRY_PROFILING_ENABLED
+    facebook::hermes::HermesRuntime::disableSamplingProfiler();
+    std::stringstream ss;
+    facebook::hermes::HermesRuntime::dumpSampledTraceToStream(ss);
+    
+    std::string s = ss.str();
+    NSString *data = [NSString stringWithCString:s.c_str() encoding:[NSString defaultCStringEncoding]];
+    
+    [data writeToFile:[NSString stringWithFormat:@"%@/cpu_profile.json", NSHomeDirectory()]
+                       atomically:NO
+                             encoding:NSStringEncodingConversionAllowLossy
+                                    error:nil];
+    
+    NSLog(@"file path %@", [NSString stringWithFormat:@"%@/cpu_profile.json", NSHomeDirectory()]);
+    resolve(@{ @"data": data });
+//#else
+//  NSLog(@"Use SENTRY_PROFILING_ENABLED env to build with enabled profiling");
+//#endif
+}
+
+RCT_EXPORT_METHOD(getUptimeTimestampNs:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+{
+  double uptimeSeconds = [[NSProcessInfo processInfo] systemUptime];
+  double uptimeNanoSeconds = uptimeSeconds * 10e9;
+  resolve([[NSNumber alloc] initWithDouble: uptimeNanoSeconds]);
+}
+
 // Thanks to this guard, we won't compile this code when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
diff --git a/scripts/hermes-profile-transformer.js b/scripts/hermes-profile-transformer.js
new file mode 100644
index 000000000..10efe8744
--- /dev/null
+++ b/scripts/hermes-profile-transformer.js
@@ -0,0 +1,26 @@
+const { writeFileSync } = require('fs');
+
+const transformer = require('hermes-profile-transformer').default;
+
+const hermesCpuProfilePath = 'iOS_release_profile.json';
+const sourceMapPath = './main.jsbundle.map';
+const sourceMapBundleFileName = 'main.jsbundle';
+
+transformer(
+  // profile path is required
+  hermesCpuProfilePath,
+  // source maps are optional
+  sourceMapPath,
+  sourceMapBundleFileName
+)
+  .then(events => {
+    // write converted trace to a file
+    return writeFileSync(
+      './chrome-supported.json',
+      JSON.stringify(events, null, 2),
+      'utf-8'
+    );
+  })
+  .catch(err => {
+    console.log(err);
+  });
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index 5d369e6ce..11e305a24 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -33,6 +33,7 @@ export interface Spec extends TurboModule {
   fetchViewHierarchy(): Promise<number[] | undefined | null>;
   startProfiling(): Promise<{ error?: string }>;
   stopProfiling(): Promise<{ data?: string, error?: string }>;
+  getUptimeTimestampNs(): Promise<number>;
 }
 
 export type NativeAppStartResponse = {
diff --git a/src/js/integrations/profiling.ts b/src/js/integrations/profiling.ts
index 182723ad1..d3933c3be 100644
--- a/src/js/integrations/profiling.ts
+++ b/src/js/integrations/profiling.ts
@@ -1,33 +1,45 @@
-import type { EventProcessor, Integration } from '@sentry/types';
+import type { EventProcessor, Hub, Integration } from '@sentry/types';
+
+import type * as Hermes from '../utils/hermes';
+import { NATIVE } from '../wrapper';
+
+type ThreadId = string;
+type FrameId = number;
+type StackId = number;
 
 interface Sample {
   stack_id: number;
-  thread_id: string;
+  thread_id: ThreadId;
   elapsed_since_start_ns: string;
 }
 
-type Stack = number[];
+type Stack = FrameId[];
 
 type Frame = {
   function: string;
-  file: string;
-  line: number;
-  column: number;
+  file?: string;
+  line?: number;
+  column?: number;
 };
 
-interface ThreadCpuProfile {
+export interface ThreadCpuProfile {
   samples: Sample[];
   stacks: Stack[];
   frames: Frame[];
-  thread_metadata: Record<string, { name?: string; priority?: number }>;
-  queue_metadata?: Record<string, { label: string }>;
+  thread_metadata: Record<ThreadId, { name?: string; priority?: number }>;
 }
 
+const UNKNOWN_STACK_ID = -1;
+const JS_THREAD_NAME = 'JavaScriptThread';
+const JS_THREAD_PRIORITY = 1;
+
 /**
  *
  */
 export class ProfilingIntegration implements Integration {
 
+  private _profileStartTimestampNs: number | undefined;
+
   /**
    * @inheritDoc
    */
@@ -49,18 +61,96 @@ export class ProfilingIntegration implements Integration {
 /**
  *
  */
-export async function startProfiling(): Promise<void> {
-  // TODO:
+async function startProfiling(): Promise<{ profileStartTimestampNs: number }> {
+  const startTimestampNs = Date.now() * 10e6; // TODO: use timestamp from native for more accuracy
+  await NATIVE.startProfiling();
+  return { profileStartTimestampNs: startTimestampNs };
+}
+
+async function stopProfiling(profileStartTimestampNs: number): Promise<ThreadCpuProfile> {
+  const uptimeTimestampNs = await NATIVE.getUptimeTimestampNs();
+  const hermesProfile = await NATIVE.stopProfiling();
+  return convertToSentryProfile(hermesProfile, { uptimeTimestampNs, profileStartTimestampNs });
 }
 
 /**
  *
  */
-export async function stopProfiling(): Promise<ThreadCpuProfile> {
-  // TODO:
-  throw new Error('not implemented');
-}
+export function convertToSentryProfile(
+  hermesProfile: Hermes.Profile,
+  {
+    uptimeTimestampNs,
+    profileStartTimestampNs,
+  }: {
+    uptimeTimestampNs: number,
+    profileStartTimestampNs: number,
+  },
+): ThreadCpuProfile {
+  const jsThreads = new Set<ThreadId>();
+  const hermesStacks = new Set<Hermes.StackFrameId>();
+
+  const relativeProfileStart = Math.round(profileStartTimestampNs - uptimeTimestampNs);
+  const samples = hermesProfile.samples.map((hermesSample: Hermes.Sample): Sample => {
+    jsThreads.add(hermesSample.tid);
+    hermesStacks.add(hermesSample.sf);
+
+    const elapsed_since_start_ns = relativeProfileStart - Number(`${hermesSample.ts}000`);
+    return {
+      stack_id: hermesSample.sf,
+      thread_id: hermesSample.tid,
+      elapsed_since_start_ns: elapsed_since_start_ns.toString(),
+    };
+  });
+
+  const hermesFrameChildMap = new Map<Hermes.StackFrameId, Hermes.StackFrameId>();
+  const framesMap = new Map<string, Frame>();
+  for (const key in hermesProfile.stackFrames) {
+    if (!Object.prototype.hasOwnProperty.call(hermesProfile.stackFrames, key)) {
+      continue;
+    }
+    const hermesFrame = hermesProfile.stackFrames[key];
+
+    if (hermesFrame.parent !== undefined) {
+      hermesFrameChildMap.set(Number(key), hermesFrame.parent);
+    }
+
+    framesMap.set(key, {
+      function: hermesFrame.name, // TODO: parse function name and file from name field of hermes stack frame
+      line: hermesFrame.line !== undefined ? Number(hermesFrame.line) : undefined,
+      column: hermesFrame.column !== undefined ? Number(hermesFrame.column): undefined,
+    });
+  }
+
+  const hermesStackRootToSentryStackMap = new Map<Hermes.StackFrameId, StackId>();
+  const stacks: Stack[] = [];
+  for (const hermesStackRootFrameId of hermesStacks) {
+    const stackId = stacks.length;
+    hermesStackRootToSentryStackMap.set(hermesStackRootFrameId, stackId);
+    const stack: Stack = [];
+    let currentHermesFrameId: Hermes.StackFrameId | undefined  = hermesStackRootFrameId;
+    while (currentHermesFrameId !== undefined) {
+      stack.push(currentHermesFrameId - 1); // Sentry frames are indexed from 0
+      currentHermesFrameId = hermesFrameChildMap.get(currentHermesFrameId);
+    }
+    stacks.push(stack);
+  }
+
+  for (const sample of samples) {
+    sample.stack_id = hermesStackRootToSentryStackMap.get(sample.stack_id) || UNKNOWN_STACK_ID;
+  }
+
+  const thread_metadata: Record<ThreadId, { name?: string; priority?: number }> = {};
+  for (const jsThreadId of jsThreads) {
+    thread_metadata[jsThreadId] = {
+      name: JS_THREAD_NAME,
+      priority: JS_THREAD_PRIORITY,
+    };
+  }
 
-function toUnixTimestampNs(uptimeTimestampNs: number, relativeTimestampNs: number): number {
-  return uptimeTimestampNs + relativeTimestampNs;
+  return {
+    samples,
+    frames: Array.from(framesMap.values()), // TODO: ensure sorted by frame id
+    stacks,
+    thread_metadata,
+  };
 }
diff --git a/src/js/utils/hermes.ts b/src/js/utils/hermes.ts
new file mode 100644
index 000000000..235521581
--- /dev/null
+++ b/src/js/utils/hermes.ts
@@ -0,0 +1,41 @@
+
+export type StackFrameId = number;
+export type MicrosecondsSinceBoot = string;
+
+export interface TraceEvent {
+  name: string,
+  ph: string,
+  cat: string,
+  pid: number,
+  ts: MicrosecondsSinceBoot,
+  tid: string,
+  args: {
+    name?: string,
+  },
+}
+
+export interface Sample {
+  cpu: string;
+  name: string;
+  ts: MicrosecondsSinceBoot;
+  pid: number;
+  tid: string;
+  weight: string;
+  sf: StackFrameId;
+}
+
+export interface StackFrame {
+  line?: string;
+  column?: string;
+  funcLine?: string;
+  funcColumn?: string;
+  name: string;
+  category: string;
+  parent?: number;
+}
+
+export interface Profile {
+  traceEvents: TraceEvent[];
+  samples: Sample[];
+  stackFrames: Record<string, StackFrame>;
+}
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 6720585e7..adf8c8583 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -24,6 +24,7 @@ import type {
 import type { ReactNativeClientOptions } from './options';
 import type { RequiredKeysUser } from './user';
 import { isTurboModuleEnabled } from './utils/environment';
+import type * as Hermes from './utils/hermes';
 import { utf8ToBytes } from './vendor';
 
 const RNSentry: Spec | undefined = isTurboModuleEnabled()
@@ -81,7 +82,8 @@ interface SentryNativeWrapper {
   fetchViewHierarchy(): PromiseLike<Uint8Array | null>;
 
   startProfiling(): Promise<void>;
-  stopProfiling(): Promise<void>;
+  stopProfiling(): Promise<Hermes.Profile>;
+  getUptimeTimestampNs(): Promise<number>;
 }
 
 /**
@@ -510,7 +512,7 @@ export const NATIVE: SentryNativeWrapper = {
     logger.error(error);
   },
 
-  async stopProfiling(): Promise<void> {
+  async stopProfiling(): Promise<Hermes.Profile> {
     if (!this.enableNative) {
       throw this._DisabledNativeError;
     }
@@ -521,6 +523,20 @@ export const NATIVE: SentryNativeWrapper = {
     const { error, data } = await RNSentry.stopProfiling();
     logger.error(error);
     logger.log(data);
+    // TODO: safe parse/parse on native side
+    return JSON.parse(data || '') as Hermes.Profile;
+  },
+
+  async getUptimeTimestampNs(): Promise<number> {
+    if (!this.enableNative) {
+      throw this._DisabledNativeError;
+    }
+    if (!this._isModuleLoaded(RNSentry)) {
+      throw this._NativeClientError;
+    }
+
+    const uptime = await RNSentry.getUptimeTimestampNs();
+    return uptime;
   },
 
   /**
diff --git a/test/integrations/profiling.test.ts b/test/integrations/profiling.test.ts
new file mode 100644
index 000000000..cc34d5d76
--- /dev/null
+++ b/test/integrations/profiling.test.ts
@@ -0,0 +1,21 @@
+import type { ThreadCpuProfile} from '../../src/js/integrations/profiling';
+import { convertToSentryProfile } from '../../src/js/integrations/profiling';
+import type * as Hermes from '../../src/js/utils/hermes';
+
+describe('Profiling Integration', () => {
+  describe('conver hermes profile to sentry profile', () => {
+    it('simple test profile', async () => {
+      const givenContext = {
+        uptimeTimestampNs: 0,
+        profileStartTimestampNs: 0,
+      };
+      const hermesProfile: Hermes.Profile = {
+        // TODO:
+      };
+      const expectedSentryProfile: ThreadCpuProfile = {
+        // TODO:
+      };
+      expect(convertToSentryProfile(hermesProfile, givenContext)).toStrictEqual(expectedSentryProfile);
+    });
+  });
+});

From 1b84f7b109d6e1df73fcfe364d44f7d8f2757dd9 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Fri, 12 May 2023 12:31:14 +0200
Subject: [PATCH 04/40] Add test for convert hermes to sentry profile

---
 src/js/integrations/profiling.ts    | 23 ++++++-
 test/integrations/profiling.test.ts | 94 ++++++++++++++++++++++++++++-
 2 files changed, 113 insertions(+), 4 deletions(-)

diff --git a/src/js/integrations/profiling.ts b/src/js/integrations/profiling.ts
index d3933c3be..0aee653b4 100644
--- a/src/js/integrations/profiling.ts
+++ b/src/js/integrations/profiling.ts
@@ -29,6 +29,7 @@ export interface ThreadCpuProfile {
   thread_metadata: Record<ThreadId, { name?: string; priority?: number }>;
 }
 
+const UNKNOWN_FRAME_FUNCTION_NAME = '<unknown>';
 const UNKNOWN_STACK_ID = -1;
 const JS_THREAD_NAME = 'JavaScriptThread';
 const JS_THREAD_PRIORITY = 1;
@@ -114,8 +115,10 @@ export function convertToSentryProfile(
       hermesFrameChildMap.set(Number(key), hermesFrame.parent);
     }
 
+    const stackFrameName = parseHermesStackFrameName(hermesFrame.name);
     framesMap.set(key, {
-      function: hermesFrame.name, // TODO: parse function name and file from name field of hermes stack frame
+      function: stackFrameName.function || UNKNOWN_FRAME_FUNCTION_NAME,
+      file: stackFrameName.fileName,
       line: hermesFrame.line !== undefined ? Number(hermesFrame.line) : undefined,
       column: hermesFrame.column !== undefined ? Number(hermesFrame.column): undefined,
     });
@@ -154,3 +157,21 @@ export function convertToSentryProfile(
     thread_metadata,
   };
 }
+
+type HermesStackFrameNameParsed = {
+  function?: string;
+  fileName?: string;
+};
+const fileNameRegex = /([a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+):(\d+:\d+)\)$/;
+/**
+ *
+ */
+export function parseHermesStackFrameName(name: string): HermesStackFrameNameParsed {
+  const result: HermesStackFrameNameParsed = {};
+  const match = fileNameRegex.exec(name);
+  if (match) {
+    result.fileName = match[1];
+  }
+  result.function = name.split('(')[0]
+  return result;
+}
diff --git a/test/integrations/profiling.test.ts b/test/integrations/profiling.test.ts
index cc34d5d76..0d7868144 100644
--- a/test/integrations/profiling.test.ts
+++ b/test/integrations/profiling.test.ts
@@ -3,17 +3,105 @@ import { convertToSentryProfile } from '../../src/js/integrations/profiling';
 import type * as Hermes from '../../src/js/utils/hermes';
 
 describe('Profiling Integration', () => {
-  describe('conver hermes profile to sentry profile', () => {
+  describe('convert hermes profile to sentry profile', () => {
     it('simple test profile', async () => {
       const givenContext = {
         uptimeTimestampNs: 0,
         profileStartTimestampNs: 0,
       };
       const hermesProfile: Hermes.Profile = {
-        // TODO:
+        'traceEvents': [],
+        'samples': [
+          {
+            'cpu': '-1',
+            'name': '',
+            'ts': '1896623880553',
+            'pid': 54822,
+            'tid': '14509472',
+            'weight': '1',
+            'sf': 1
+          },
+          {
+            'cpu': '-1',
+            'name': '',
+            'ts': '1896623902244',
+            'pid': 54822,
+            'tid': '14509472',
+            'weight': '1',
+            'sf': 1
+          },
+        ],
+        'stackFrames': {
+          '1': {
+            'name': '[root]',
+            'category': 'root'
+          },
+          '2': {
+            'line': '1610',
+            'column': '33',
+            'funcLine': '1605',
+            'funcColumn': '14',
+            'name': 'invokeCallbackAndReturnFlushedQueue(/Users/krystofwoldrich/Library/Developer/Xcode/DerivedData/sampleNewArchitecture-dtnzzmpchfyuyyajisnbghavfleb/Build/Products/Release-iphonesimulator/main.jsbundle:1610:33)',
+            'category': 'JavaScript',
+            'parent': 1
+          },
+          '3': {
+            'line': '1616',
+            'column': '21',
+            'funcLine': '1614',
+            'funcColumn': '14',
+            'name': 'flushedQueue(/Users/krystofwoldrich/Library/Developer/Xcode/DerivedData/sampleNewArchitecture-dtnzzmpchfyuyyajisnbghavfleb/Build/Products/Release-iphonesimulator/main.jsbundle:1616:21)',
+            'category': 'JavaScript',
+            'parent': 2
+          },
+        },
       };
       const expectedSentryProfile: ThreadCpuProfile = {
-        // TODO:
+        'frames': [
+          {
+            'column': undefined,
+            'file': undefined,
+            'function': '[root]',
+            'line': undefined,
+          },
+          {
+            'column': 33,
+            'file': 'main.jsbundle',
+            'function': 'invokeCallbackAndReturnFlushedQueue',
+            'line': 1610,
+          },
+          {
+            'column': 21,
+            'file': 'main.jsbundle',
+            'function': 'flushedQueue',
+            'line': 1616,
+          },
+        ],
+        'samples':  [
+          {
+            'elapsed_since_start_ns': '-1896623880553000',
+            'stack_id': -1,
+            'thread_id': '14509472',
+          },
+          {
+            'elapsed_since_start_ns': '-1896623902244000',
+            'stack_id': -1,
+            'thread_id': '14509472',
+          },
+        ],
+        'stacks':  [
+          [
+            0,
+            1,
+            2,
+          ],
+        ],
+        'thread_metadata':  {
+          '14509472':  {
+            'name': 'JavaScriptThread',
+            'priority': 1,
+          },
+        },
       };
       expect(convertToSentryProfile(hermesProfile, givenContext)).toStrictEqual(expectedSentryProfile);
     });

From 5ee59f1641eeafe082473a68ca47e7234261cc7a Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 24 May 2023 13:47:44 +0200
Subject: [PATCH 05/40] Update vscode shared launch options

---
 .vscode/launch.json | 56 ++++++++++-----------------------------------
 1 file changed, 12 insertions(+), 44 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 1eea9de16..5555cc4e8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -2,50 +2,18 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "Attach to packager",
-            "cwd": "${workspaceFolder}",
-            "type": "reactnative",
-            "request": "attach"
-        },
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Debug e2e:android",
-            "cwd": "${workspaceFolder}/sample",
-            "program": "./node_modules/jest/bin/jest",
-            "args": [
-                "--runInBand",
-                "--config=./jest.config.js"
-            ],
-            "env": {
-                "PLATFORM": "android"
-            },
-            "console": "integratedTerminal",
-            "internalConsoleOptions": "neverOpen"
-        },
-        {
-            "type": "node",
-            "request": "launch",
-            "name": "Debug e2e:ios",
-            "cwd": "${workspaceFolder}/sample",
-            "program": "./node_modules/jest/bin/jest",
-            "args": [
-                "--runInBand",
-                "--config=./jest.config.js"
-            ],
-            "env": {
-                "PLATFORM": "ios"
-            },
-            "console": "integratedTerminal",
-            "internalConsoleOptions": "neverOpen"
-        },
-        {
-            "name": "Debug Sample - iOS",
-            "cwd": "${workspaceFolder}",
-            "type": "reactnative",
-            "request": "launch",
-            "platform": "ios",
-            "isDynamic": true
+          "name": "Jest Tests",
+          "type": "node",
+          "request": "launch",
+          "runtimeArgs": ["--inspect-brk", "${workspaceRoot}/node_modules/jest/bin/jest.js"],
+          "args": ["--runInBand", "-t", ""],
+          "cwd": "${workspaceRoot}",
+          "console": "integratedTerminal",
+          "internalConsoleOptions": "neverOpen",
+          "outputCapture": "std",
+          "sourceMaps": true,
+          "smartStep": true
         },
+
     ]
 }

From eafa5761a152fe080a7cfa5e0785bee09c558b23 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Thu, 25 May 2023 16:48:41 +0200
Subject: [PATCH 06/40] !WIP JS profiling iOS

---
 ios/RNSentry.mm                               |  73 ++++---
 .../project.pbxproj                           |   2 +
 sample-new-architecture/package.json          |   3 +-
 sample-new-architecture/src/App.tsx           |   6 +-
 src/js/NativeRNSentry.ts                      |   5 +-
 src/js/client.ts                              |   2 +
 src/js/integrations/index.ts                  |   1 +
 src/js/integrations/profiling.ts              | 177 -----------------
 src/js/profiling/cache.ts                     |  74 +++++++
 src/js/profiling/convertHermesProfile.ts      | 100 ++++++++++
 src/js/profiling/hermes.ts                    |  93 +++++++++
 src/js/profiling/integration.ts               | 149 ++++++++++++++
 src/js/profiling/types.ts                     |  69 +++++++
 src/js/profiling/utils.ts                     | 187 ++++++++++++++++++
 src/js/utils/hermes.ts                        |  41 ----
 src/js/wrapper.ts                             |  46 ++---
 test/integrations/profiling.test.ts           | 109 ----------
 .../profiling/convertHermesProfile.test.ts    | 153 ++++++++++++++
 test/integrations/profiling/hermes.test.ts    |  26 +++
 test/wrapper.test.ts                          |  30 +++
 20 files changed, 954 insertions(+), 392 deletions(-)
 delete mode 100644 src/js/integrations/profiling.ts
 create mode 100644 src/js/profiling/cache.ts
 create mode 100644 src/js/profiling/convertHermesProfile.ts
 create mode 100644 src/js/profiling/hermes.ts
 create mode 100644 src/js/profiling/integration.ts
 create mode 100644 src/js/profiling/types.ts
 create mode 100644 src/js/profiling/utils.ts
 delete mode 100644 src/js/utils/hermes.ts
 delete mode 100644 test/integrations/profiling.test.ts
 create mode 100644 test/integrations/profiling/convertHermesProfile.test.ts
 create mode 100644 test/integrations/profiling/hermes.test.ts

diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index bdb109eda..f48ff8e6b 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -11,9 +11,10 @@
 #import <Sentry/SentryScreenFrames.h>
 #import <Sentry/SentryOptions+HybridSDKs.h>
 
-//#ifdef SENTRY_PROFILING_ENABLED
+// This guard prevents importing Hermes in JSC apps
+#ifdef SENTRY_PROFILING_ENABLED
 #import <hermes/hermes.h>
-//#endif
+#endif
 
 // Thanks to this guard, we won't import this header when we build for the old architecture.
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -502,46 +503,44 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
     // the 'tracesSampleRate' or 'tracesSampler' option.
 }
 
-RCT_EXPORT_METHOD(startProfiling:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-//#ifdef SENTRY_PROFILING_ENABLED
-    facebook::hermes::HermesRuntime::enableSamplingProfiler();
-    resolve(@{});
-//#else
-//  NSLog(@"Use SENTRY_PROFILING_ENABLED env to build with enabled profiling");
-//#endif
-}
+static NSString* const enabledProfilingMessage = @"Use SENTRY_PROFILING_ENABLED env to build with enabled profiling";
 
-RCT_EXPORT_METHOD(stopProfiling:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, startProfiling)
 {
-//#ifdef SENTRY_PROFILING_ENABLED
-    facebook::hermes::HermesRuntime::disableSamplingProfiler();
-    std::stringstream ss;
-    facebook::hermes::HermesRuntime::dumpSampledTraceToStream(ss);
-    
-    std::string s = ss.str();
-    NSString *data = [NSString stringWithCString:s.c_str() encoding:[NSString defaultCStringEncoding]];
-    
-    [data writeToFile:[NSString stringWithFormat:@"%@/cpu_profile.json", NSHomeDirectory()]
-                       atomically:NO
-                             encoding:NSStringEncodingConversionAllowLossy
-                                    error:nil];
-    
-    NSLog(@"file path %@", [NSString stringWithFormat:@"%@/cpu_profile.json", NSHomeDirectory()]);
-    resolve(@{ @"data": data });
-//#else
-//  NSLog(@"Use SENTRY_PROFILING_ENABLED env to build with enabled profiling");
-//#endif
+#ifdef SENTRY_PROFILING_ENABLED
+    try {
+        facebook::hermes::HermesRuntime::enableSamplingProfiler();
+        return @{ @"started": @YES };
+    } catch (const std::exception& ex) {
+        return @{ @"error": [NSString stringWithCString: ex.what() encoding:[NSString defaultCStringEncoding]] };
+    } catch (...) {
+        return @{ @"error": @"Failed to start profiling" };
+    }
+#else
+    return @{ @"error": enabledProfilingMessage };
+#endif
 }
 
-RCT_EXPORT_METHOD(getUptimeTimestampNs:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, stopProfiling)
 {
-  double uptimeSeconds = [[NSProcessInfo processInfo] systemUptime];
-  double uptimeNanoSeconds = uptimeSeconds * 10e9;
-  resolve([[NSNumber alloc] initWithDouble: uptimeNanoSeconds]);
+#ifdef SENTRY_PROFILING_ENABLED
+    try {
+        facebook::hermes::HermesRuntime::disableSamplingProfiler();
+        std::stringstream ss;
+        facebook::hermes::HermesRuntime::dumpSampledTraceToStream(ss);
+
+        std::string s = ss.str();
+        NSString *data = [NSString stringWithCString:s.c_str() encoding:[NSString defaultCStringEncoding]];
+
+        return @{ @"profile": data };
+    } catch (const std::exception& ex) {
+        return @{ @"error": [NSString stringWithCString: ex.what() encoding:[NSString defaultCStringEncoding]] };
+    } catch (...) {
+        return @{ @"error": @"Failed to stop profiling" };
+    }
+#else
+    return @{ @"error": enabledProfilingMessage };
+#endif
 }
 
 // Thanks to this guard, we won't compile this code when we build for the old architecture.
diff --git a/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj b/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj
index f579eb8de..72b84872f 100644
--- a/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj
+++ b/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj
@@ -523,6 +523,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = sampleNewArchitecture;
 				RCT_NEW_ARCH_ENABLED = 1;
+				SENTRY_PROFILING_ENABLED = 1;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -549,6 +550,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = sampleNewArchitecture;
 				RCT_NEW_ARCH_ENABLED = 1;
+				SENTRY_PROFILING_ENABLED = 1;
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
diff --git a/sample-new-architecture/package.json b/sample-new-architecture/package.json
index cd7ab1dd2..1d7b88147 100644
--- a/sample-new-architecture/package.json
+++ b/sample-new-architecture/package.json
@@ -11,7 +11,8 @@
     "pod-install": "cd ios; RCT_NEW_ARCH_ENABLED=1 bundle exec pod install; cd ..",
     "pod-install-production": "cd ios; PRODUCTION=1 RCT_NEW_ARCH_ENABLED=1 bundle exec pod install; cd ..",
     "pod-install-legacy": "cd ios; bundle exec pod install; cd ..",
-    "pod-install-legacy-production": "cd ios; PRODUCTION=1 bundle exec pod install; cd .."
+    "pod-install-legacy-production": "cd ios; PRODUCTION=1 bundle exec pod install; cd ..",
+    "clean-ios": "cd ios; xcodebuild clean; rm -rf Podfile.lock Pods; cd .."
   },
   "dependencies": {
     "@react-native-community/cli-platform-android": "^10.1.3",
diff --git a/sample-new-architecture/src/App.tsx b/sample-new-architecture/src/App.tsx
index 5ebd06949..7a99a3225 100644
--- a/sample-new-architecture/src/App.tsx
+++ b/sample-new-architecture/src/App.tsx
@@ -20,6 +20,9 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import GesturesTracingScreen from './Screens/GesturesTracingScreen';
 import { StyleSheet } from 'react-native';
 import { HttpClient } from '@sentry/integrations';
+import { Integrations } from '@sentry/react-native';
+
+const { ProfilingIntegration } = Integrations;
 
 const reactNavigationInstrumentation =
   new Sentry.ReactNavigationInstrumentation({
@@ -31,7 +34,7 @@ Sentry.init({
   dsn: SENTRY_INTERNAL_DSN,
   debug: true,
   beforeSend: (event: Sentry.Event) => {
-    console.log('Event beforeSend:', event);
+    console.log('Event beforeSend:', event.event_id);
     return event;
   },
   // This will be called with a boolean `didCallNativeInit` when the native SDK has been contacted.
@@ -65,6 +68,7 @@ Sentry.init({
         // default: [/.*/]
         failedRequestTargets: [/.*/],
       }),
+      new ProfilingIntegration(),
     );
     return integrations.filter(i => i.name !== 'Dedupe');
   },
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index 11e305a24..d9cf3d133 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -31,9 +31,8 @@ export interface Spec extends TurboModule {
   enableNativeFramesTracking(): void;
   fetchModules(): Promise<string | undefined | null>;
   fetchViewHierarchy(): Promise<number[] | undefined | null>;
-  startProfiling(): Promise<{ error?: string }>;
-  stopProfiling(): Promise<{ data?: string, error?: string }>;
-  getUptimeTimestampNs(): Promise<number>;
+  startProfiling(): { started?: boolean, error?: string };
+  stopProfiling(): { profile?: string, error?: string };
 }
 
 export type NativeAppStartResponse = {
diff --git a/src/js/client.ts b/src/js/client.ts
index 89cfd915e..9e42696c8 100644
--- a/src/js/client.ts
+++ b/src/js/client.ts
@@ -138,6 +138,8 @@ export class ReactNativeClient extends BaseClient<ReactNativeClientOptions> {
 
     let shouldClearOutcomesBuffer = true;
     if (this._transport && this._dsn) {
+      this.emit('beforeEnvelope', envelope);
+
       this._transport.send(envelope).then(null, reason => {
         if (reason instanceof SentryError) {
           // SentryError is thrown by SyncPromise
diff --git a/src/js/integrations/index.ts b/src/js/integrations/index.ts
index 92f8b0eb3..58bd7498b 100644
--- a/src/js/integrations/index.ts
+++ b/src/js/integrations/index.ts
@@ -6,3 +6,4 @@ export { EventOrigin } from './eventorigin';
 export { SdkInfo } from './sdkinfo';
 export { ReactNativeInfo } from './reactnativeinfo';
 export { ModulesLoader } from './modulesloader';
+export { ProfilingIntegration } from '../profiling/integration';
diff --git a/src/js/integrations/profiling.ts b/src/js/integrations/profiling.ts
deleted file mode 100644
index 0aee653b4..000000000
--- a/src/js/integrations/profiling.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import type { EventProcessor, Hub, Integration } from '@sentry/types';
-
-import type * as Hermes from '../utils/hermes';
-import { NATIVE } from '../wrapper';
-
-type ThreadId = string;
-type FrameId = number;
-type StackId = number;
-
-interface Sample {
-  stack_id: number;
-  thread_id: ThreadId;
-  elapsed_since_start_ns: string;
-}
-
-type Stack = FrameId[];
-
-type Frame = {
-  function: string;
-  file?: string;
-  line?: number;
-  column?: number;
-};
-
-export interface ThreadCpuProfile {
-  samples: Sample[];
-  stacks: Stack[];
-  frames: Frame[];
-  thread_metadata: Record<ThreadId, { name?: string; priority?: number }>;
-}
-
-const UNKNOWN_FRAME_FUNCTION_NAME = '<unknown>';
-const UNKNOWN_STACK_ID = -1;
-const JS_THREAD_NAME = 'JavaScriptThread';
-const JS_THREAD_PRIORITY = 1;
-
-/**
- *
- */
-export class ProfilingIntegration implements Integration {
-
-  private _profileStartTimestampNs: number | undefined;
-
-  /**
-   * @inheritDoc
-   */
-  public static id: string = 'ProfilingIntegration';
-
-  /**
-   * @inheritDoc
-   */
-  public name: string = ProfilingIntegration.id;
-
-  /**
-   * @inheritDoc
-   */
-  public setupOnce(addGlobalEventProcessor: (e: EventProcessor) => void, getCurrentHub: () => Hub): void {
-    // TODO:
-  }
-}
-
-/**
- *
- */
-async function startProfiling(): Promise<{ profileStartTimestampNs: number }> {
-  const startTimestampNs = Date.now() * 10e6; // TODO: use timestamp from native for more accuracy
-  await NATIVE.startProfiling();
-  return { profileStartTimestampNs: startTimestampNs };
-}
-
-async function stopProfiling(profileStartTimestampNs: number): Promise<ThreadCpuProfile> {
-  const uptimeTimestampNs = await NATIVE.getUptimeTimestampNs();
-  const hermesProfile = await NATIVE.stopProfiling();
-  return convertToSentryProfile(hermesProfile, { uptimeTimestampNs, profileStartTimestampNs });
-}
-
-/**
- *
- */
-export function convertToSentryProfile(
-  hermesProfile: Hermes.Profile,
-  {
-    uptimeTimestampNs,
-    profileStartTimestampNs,
-  }: {
-    uptimeTimestampNs: number,
-    profileStartTimestampNs: number,
-  },
-): ThreadCpuProfile {
-  const jsThreads = new Set<ThreadId>();
-  const hermesStacks = new Set<Hermes.StackFrameId>();
-
-  const relativeProfileStart = Math.round(profileStartTimestampNs - uptimeTimestampNs);
-  const samples = hermesProfile.samples.map((hermesSample: Hermes.Sample): Sample => {
-    jsThreads.add(hermesSample.tid);
-    hermesStacks.add(hermesSample.sf);
-
-    const elapsed_since_start_ns = relativeProfileStart - Number(`${hermesSample.ts}000`);
-    return {
-      stack_id: hermesSample.sf,
-      thread_id: hermesSample.tid,
-      elapsed_since_start_ns: elapsed_since_start_ns.toString(),
-    };
-  });
-
-  const hermesFrameChildMap = new Map<Hermes.StackFrameId, Hermes.StackFrameId>();
-  const framesMap = new Map<string, Frame>();
-  for (const key in hermesProfile.stackFrames) {
-    if (!Object.prototype.hasOwnProperty.call(hermesProfile.stackFrames, key)) {
-      continue;
-    }
-    const hermesFrame = hermesProfile.stackFrames[key];
-
-    if (hermesFrame.parent !== undefined) {
-      hermesFrameChildMap.set(Number(key), hermesFrame.parent);
-    }
-
-    const stackFrameName = parseHermesStackFrameName(hermesFrame.name);
-    framesMap.set(key, {
-      function: stackFrameName.function || UNKNOWN_FRAME_FUNCTION_NAME,
-      file: stackFrameName.fileName,
-      line: hermesFrame.line !== undefined ? Number(hermesFrame.line) : undefined,
-      column: hermesFrame.column !== undefined ? Number(hermesFrame.column): undefined,
-    });
-  }
-
-  const hermesStackRootToSentryStackMap = new Map<Hermes.StackFrameId, StackId>();
-  const stacks: Stack[] = [];
-  for (const hermesStackRootFrameId of hermesStacks) {
-    const stackId = stacks.length;
-    hermesStackRootToSentryStackMap.set(hermesStackRootFrameId, stackId);
-    const stack: Stack = [];
-    let currentHermesFrameId: Hermes.StackFrameId | undefined  = hermesStackRootFrameId;
-    while (currentHermesFrameId !== undefined) {
-      stack.push(currentHermesFrameId - 1); // Sentry frames are indexed from 0
-      currentHermesFrameId = hermesFrameChildMap.get(currentHermesFrameId);
-    }
-    stacks.push(stack);
-  }
-
-  for (const sample of samples) {
-    sample.stack_id = hermesStackRootToSentryStackMap.get(sample.stack_id) || UNKNOWN_STACK_ID;
-  }
-
-  const thread_metadata: Record<ThreadId, { name?: string; priority?: number }> = {};
-  for (const jsThreadId of jsThreads) {
-    thread_metadata[jsThreadId] = {
-      name: JS_THREAD_NAME,
-      priority: JS_THREAD_PRIORITY,
-    };
-  }
-
-  return {
-    samples,
-    frames: Array.from(framesMap.values()), // TODO: ensure sorted by frame id
-    stacks,
-    thread_metadata,
-  };
-}
-
-type HermesStackFrameNameParsed = {
-  function?: string;
-  fileName?: string;
-};
-const fileNameRegex = /([a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+):(\d+:\d+)\)$/;
-/**
- *
- */
-export function parseHermesStackFrameName(name: string): HermesStackFrameNameParsed {
-  const result: HermesStackFrameNameParsed = {};
-  const match = fileNameRegex.exec(name);
-  if (match) {
-    result.fileName = match[1];
-  }
-  result.function = name.split('(')[0]
-  return result;
-}
diff --git a/src/js/profiling/cache.ts b/src/js/profiling/cache.ts
new file mode 100644
index 000000000..02fbe9d4f
--- /dev/null
+++ b/src/js/profiling/cache.ts
@@ -0,0 +1,74 @@
+// sentry-javascript/packages/browser/src/profiling/cache.ts
+// TODO: Remove after exporting from @sentry/utils
+import type { Event } from '@sentry/types';
+
+/**
+ * Creates a cache that evicts keys in fifo order
+ * @param size {Number}
+ */
+export function makeProfilingCache<Key extends string, Value extends Event>(
+  size: number,
+): {
+  get: (key: Key) => Value | undefined;
+  add: (key: Key, value: Value) => void;
+  delete: (key: Key) => boolean;
+  clear: () => void;
+  size: () => number;
+} {
+  // Maintain a fifo queue of keys, we cannot rely on Object.keys as the browser may not support it.
+  let evictionOrder: Key[] = [];
+  let cache: Record<string, Value> = {};
+
+  return {
+    add(key: Key, value: Value) {
+      while (evictionOrder.length >= size) {
+        // shift is O(n) but this is small size and only happens if we are
+        // exceeding the cache size so it should be fine.
+        const evictCandidate = evictionOrder.shift();
+
+        if (evictCandidate !== undefined) {
+          // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+          delete cache[evictCandidate];
+        }
+      }
+
+      // in case we have a collision, delete the old key.
+      if (cache[key]) {
+        this.delete(key);
+      }
+
+      evictionOrder.push(key);
+      cache[key] = value;
+    },
+    clear() {
+      cache = {};
+      evictionOrder = [];
+    },
+    get(key: Key): Value | undefined {
+      return cache[key];
+    },
+    size() {
+      return evictionOrder.length;
+    },
+    // Delete cache key and return true if it existed, false otherwise.
+    delete(key: Key): boolean {
+      if (!cache[key]) {
+        return false;
+      }
+
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      delete cache[key];
+
+      for (let i = 0; i < evictionOrder.length; i++) {
+        if (evictionOrder[i] === key) {
+          evictionOrder.splice(i, 1);
+          break;
+        }
+      }
+
+      return true;
+    },
+  };
+}
+
+export const PROFILING_EVENT_CACHE = makeProfilingCache<string, Event>(20);
diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
new file mode 100644
index 000000000..59deb0802
--- /dev/null
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -0,0 +1,100 @@
+import type * as Hermes from './hermes';
+import { parseHermesStackFrameName } from './hermes';
+import type {
+  Frame,
+  Sample,
+  Stack,
+  StackId,
+  ThreadCpuProfile,
+  ThreadId,
+} from './types';
+
+const UNKNOWN_FRAME_FUNCTION_NAME = '<unknown>';
+const UNKNOWN_STACK_ID = -1;
+const JS_THREAD_NAME = 'JavaScriptThread';
+const JS_THREAD_PRIORITY = 1;
+
+/**
+ *
+ */
+export function convertToSentryProfile(
+  hermesProfile: Hermes.Profile,
+): ThreadCpuProfile {
+  const jsThreads = new Set<ThreadId>();
+  const hermesStacks = new Set<Hermes.StackFrameId>();
+
+  if (hermesProfile.samples.length === 0) {
+    throw new Error('Empty profile');
+    // TODO: handle empty profile
+  }
+
+  const start = Number(hermesProfile.samples[0].ts);
+  const samples = hermesProfile.samples.map((hermesSample: Hermes.Sample): Sample => {
+    jsThreads.add(hermesSample.tid);
+    hermesStacks.add(hermesSample.sf);
+
+    const elapsed_since_start_ns = (Number(hermesSample.ts) - start) * 1e3;
+
+    return {
+      stack_id: hermesSample.sf,
+      thread_id: hermesSample.tid,
+      elapsed_since_start_ns: elapsed_since_start_ns.toFixed(0),
+    };
+  });
+
+  const hermesFrameChildToParentMap = new Map<Hermes.StackFrameId, Hermes.StackFrameId>();
+  const framesMap = new Map<string, Frame>();
+  for (const key in hermesProfile.stackFrames) {
+    if (!Object.prototype.hasOwnProperty.call(hermesProfile.stackFrames, key)) {
+      continue;
+    }
+    const hermesFrame = hermesProfile.stackFrames[key];
+
+    if (hermesFrame.parent !== undefined) {
+      hermesFrameChildToParentMap.set(Number(key), hermesFrame.parent);
+    }
+
+    const stackFrameName = parseHermesStackFrameName(hermesFrame.name);
+    framesMap.set(key, {
+      function: stackFrameName.function || UNKNOWN_FRAME_FUNCTION_NAME,
+      file: stackFrameName.fileName,
+      line: hermesFrame.line !== undefined ? Number(hermesFrame.line) : undefined,
+      column: hermesFrame.column !== undefined ? Number(hermesFrame.column): undefined,
+    });
+  }
+
+  const hermesStackToSentryStackMap = new Map<Hermes.StackFrameId, StackId>();
+  const stacks: Stack[] = [];
+  for (const hermesStackFunctionFrameId of hermesStacks) {
+    const stackId = stacks.length;
+    hermesStackToSentryStackMap.set(hermesStackFunctionFrameId, stackId);
+    const stack: Stack = [];
+    let currentHermesFrameId: Hermes.StackFrameId | undefined  = hermesStackFunctionFrameId;
+    while (currentHermesFrameId !== undefined) {
+      stack.push(currentHermesFrameId - 1); // Sentry frames are indexed from 0
+      currentHermesFrameId = hermesFrameChildToParentMap.get(currentHermesFrameId);
+    }
+    stacks.push(stack);
+  }
+
+  for (const sample of samples) {
+    sample.stack_id = hermesStackToSentryStackMap.get(sample.stack_id) ?? UNKNOWN_STACK_ID;
+  }
+
+  const thread_metadata: Record<ThreadId, { name?: string; priority?: number }> = {};
+  for (const jsThreadId of jsThreads) {
+    thread_metadata[jsThreadId] = {
+      name: JS_THREAD_NAME,
+      priority: JS_THREAD_PRIORITY,
+    };
+  }
+
+  return {
+    samples,
+    frames: Array.from(framesMap.entries())
+      .sort(([aKey]: [string, Frame], [bKey]: [string, Frame]) => Number(aKey) - Number(bKey))
+      .map(([_, frame]: [string, Frame]) => frame),
+    stacks,
+    thread_metadata,
+  };
+}
diff --git a/src/js/profiling/hermes.ts b/src/js/profiling/hermes.ts
new file mode 100644
index 000000000..a7f480b7b
--- /dev/null
+++ b/src/js/profiling/hermes.ts
@@ -0,0 +1,93 @@
+import { NATIVE } from '../wrapper';
+import {
+  convertToSentryProfile,
+} from './convertHermesProfile';
+import type {
+  ThreadCpuProfile,
+} from './types';
+
+export type StackFrameId = number;
+export type MicrosecondsSinceBoot = string;
+
+export interface TraceEvent {
+  name: string,
+  ph: string,
+  cat: string,
+  pid: number,
+  ts: MicrosecondsSinceBoot,
+  tid: string,
+  args: {
+    name?: string,
+  },
+}
+
+export interface Sample {
+  cpu: string;
+  name: string;
+  ts: MicrosecondsSinceBoot;
+  pid: number;
+  tid: string;
+  weight: string;
+  sf: StackFrameId;
+}
+
+export interface StackFrame {
+  line?: string;
+  column?: string;
+  funcLine?: string;
+  funcColumn?: string;
+  name: string;
+  category: string;
+  parent?: number;
+}
+
+export interface Profile {
+  traceEvents: TraceEvent[];
+  samples: Sample[];
+  stackFrames: Record<string, StackFrame>;
+}
+
+export interface HermesStackFrameNameParsed {
+  function?: string;
+  fileName?: string;
+}
+
+const FILE_NAME_REGEX = /([a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+)(?::(\d+:\d+))?\)/;
+/**
+ * Hermes Profile Stack Frame Name contains function name and file path.
+ *
+ * `foo(/path/to/file.js:1:2)` -> `{ function: 'foo', fileName: 'file.js' }`
+ */
+export function parseHermesStackFrameName(name: string): HermesStackFrameNameParsed {
+  const result: HermesStackFrameNameParsed = {};
+  const match = FILE_NAME_REGEX.exec(name);
+  if (match) {
+    result.fileName = match[1];
+  }
+  result.function = name.split('(')[0]
+  return result;
+}
+
+
+const MS_TO_NS: number = 1e6;
+
+/**
+ * Starts Hermes Sampling Profiler and returns the timestamp when profiling started in nanoseconds.
+ */
+export function startProfiling(): number {
+  const profileStartTimestampNs = Date.now() * MS_TO_NS;
+  void NATIVE.startProfiling();
+  return profileStartTimestampNs;
+}
+
+/**
+ * Stops Hermes Sampling Profiler and returns the profile.
+ */
+export function stopProfiling(): ThreadCpuProfile | null {
+  const hermesProfile = NATIVE.stopProfiling();
+  if (!hermesProfile) {
+    return null;
+  }
+  return convertToSentryProfile(hermesProfile);
+}
+
diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
new file mode 100644
index 000000000..2d0e694fb
--- /dev/null
+++ b/src/js/profiling/integration.ts
@@ -0,0 +1,149 @@
+import type { Envelope, EventProcessor, Hub, Integration, Transaction } from '@sentry/types';
+import { logger, uuid4 } from '@sentry/utils';
+
+import type {
+  Profile,
+} from './types';
+import {
+  addProfilesToEnvelope,
+  createProfilingEvent,
+  findProfiledTransactionsFromEnvelope,
+} from './utils';
+import { PROFILING_EVENT_CACHE } from './cache';
+import { startProfiling, stopProfiling } from './hermes';
+
+/**
+ *
+ */
+export class ProfilingIntegration implements Integration {
+
+  /**
+   * @inheritDoc
+   */
+  public static id: string = 'ProfilingIntegration';
+
+  /**
+   * @inheritDoc
+   */
+  public name: string = ProfilingIntegration.id;
+
+  private _currentProfile: {
+    profile_id: string;
+    startTimestampNs: number;
+  } | undefined;
+
+  /**
+   * @inheritDoc
+   */
+  public setupOnce(_: (e: EventProcessor) => void, getCurrentHub: () => Hub): void {
+    const client = getCurrentHub().getClient();
+
+    if (!client || typeof client.on !== 'function') {
+      return;
+    }
+
+    client.on('startTransaction', (transaction: Transaction) => {
+      // TODO: maybeProfile use sample rate or sample to start profiling
+      void this._finishCurrentProfile();
+      // TODO: _startProfileTimeout
+      const profileStartTimestampNs = startProfiling();
+      this._currentProfile = {
+        profile_id: uuid4(),
+        startTimestampNs: profileStartTimestampNs,
+      };
+      transaction.setContext('profile', { profile_id: this._currentProfile.profile_id });
+      // @ts-expect-error profile_id is not part of the metadata type
+      transaction.setMetadata({ profile_id: this._currentProfile.profile_id });
+      logger.log(
+        '[Profiling] started profiling: ',
+        this._currentProfile.profile_id,
+      );
+    });
+
+    client.on('finishTransaction', () => {
+      // TODO: _stopProfileTimeout
+      this._finishCurrentProfile();
+    });
+
+    client.on('beforeEnvelope', (envelope: Envelope) => {
+      // if not profiles are in queue, there is nothing to add to the envelope.
+      if (!PROFILING_EVENT_CACHE.size()) {
+        return;
+      }
+
+      const profiledTransactionEvents = findProfiledTransactionsFromEnvelope(envelope);
+      if (!profiledTransactionEvents.length) {
+        __DEV__ && logger.log('[Profiling] no profiled transactions found in envelope');
+        return;
+      }
+
+      const profilesToAddToEnvelope: Profile[] = [];
+      // eslint-disable-next-line @typescript-eslint/prefer-for-of
+      for (let i = 0; i < profiledTransactionEvents.length; i++) {
+        const profiledTransaction = profiledTransactionEvents[i];
+        const profile_id = profiledTransaction?.contexts?.['profile']?.['profile_id'];
+
+        if (!profile_id) {
+          logger.log('[Profiling] cannot find profile for a transaction without a profile context');
+          continue;
+        }
+
+        // Remove the profile from the transaction context before sending, relay will take care of the rest.
+        if (profiledTransaction?.contexts?.['.profile']) {
+          delete profiledTransaction.contexts.profile;
+        }
+
+        // We need to find both a profile and a transaction event for the same profile_id.
+        const profileIndex = PROFILE_QUEUE.findIndex((p) => p.profile_id === profile_id);
+        if (profileIndex === -1) {
+          if (__DEV__) {
+            logger.log(`[Profiling] Could not retrieve profile for transaction: ${profile_id}`);
+          }
+          continue;
+        }
+
+        const cpuProfile = PROFILE_QUEUE[profileIndex];
+        if (!cpuProfile) {
+          if (__DEV__) {
+            logger.log(`[Profiling] Could not retrieve profile for transaction: ${profile_id}`);
+          }
+          continue;
+        }
+
+        // Remove the profile from the queue.
+        PROFILE_QUEUE.splice(profileIndex, 1);
+        const profile = createProfilingEvent(cpuProfile, profiledTransaction);
+
+        if (profile) {
+          profilesToAddToEnvelope.push(profile);
+          __DEV__ && logger.log(`[Profiling] Added profile ${profile_id} to transaction ${profiledTransaction.event_id}`);
+        }
+      }
+      addProfilesToEnvelope(envelope, profilesToAddToEnvelope);
+    });
+  }
+
+  private
+
+  /**
+   * Stops profiling and adds the profile to the queue to be processed on beforeEnvelope.
+   */
+  private _finishCurrentProfile = (): void => {
+    if (this._currentProfile === undefined) {
+      return;
+    }
+
+    const profile = stopProfiling();
+    if (!profile) {
+      logger.warn('[Profiling] Stop failed. Cleaning up...');
+      this._currentProfile = undefined;
+      return;
+    }
+
+    profile.profile_id = this._currentProfile.profile_id;
+    addToProfileQueue(profile);
+    logger.log('[Profiling] finished profiling: ', this._currentProfile.profile_id);
+    this._currentProfile = undefined;
+  };
+
+}
diff --git a/src/js/profiling/types.ts b/src/js/profiling/types.ts
new file mode 100644
index 000000000..1308be6ab
--- /dev/null
+++ b/src/js/profiling/types.ts
@@ -0,0 +1,69 @@
+
+export type ThreadId = string;
+export type FrameId = number;
+export type StackId = number;
+
+export interface Sample {
+  stack_id: number;
+  thread_id: ThreadId;
+  elapsed_since_start_ns: string;
+}
+
+export type Stack = FrameId[];
+
+export type Frame = {
+  function: string;
+  file?: string;
+  line?: number;
+  column?: number;
+};
+
+export interface ThreadCpuProfile {
+  profile_id?: string;
+  samples: Sample[];
+  stacks: Stack[];
+  frames: Frame[];
+  thread_metadata: Record<ThreadId, { name?: string; priority?: number }>;
+}
+
+export interface Profile {
+  event_id: string;
+  version: string;
+  os: {
+    name: string;
+    version: string;
+    build_number?: string;
+  };
+  runtime: {
+    name: string;
+    version: string;
+  };
+  device: {
+    architecture: string;
+    is_emulator: boolean;
+    locale: string;
+    manufacturer: string;
+    model: string;
+  };
+  timestamp: string;
+  release: string;
+  environment: string;
+  platform: string;
+  profile: ThreadCpuProfile;
+  debug_meta?: {
+    images: {
+      debug_id: string;
+      image_addr: string;
+      code_file: string;
+      type: string;
+      image_size: number;
+      image_vmaddr: string;
+    }[];
+  };
+  transaction: {
+    name: string;
+    id: string;
+    trace_id: string;
+    active_thread_id: string;
+  };
+}
diff --git a/src/js/profiling/utils.ts b/src/js/profiling/utils.ts
new file mode 100644
index 000000000..eeefe89f8
--- /dev/null
+++ b/src/js/profiling/utils.ts
@@ -0,0 +1,187 @@
+import type { Envelope, Event } from '@sentry/types';
+import { forEachEnvelopeItem, logger } from '@sentry/utils';
+
+import type { Profile, ThreadCpuProfile } from './types';
+
+const ACTIVE_THREAD_ID_STRING = '0';
+
+/**
+ *
+ */
+export function isValidProfile(profile: ThreadCpuProfile): profile is ThreadCpuProfile & { profile_id: string } {
+  if (profile.samples.length <= 1) {
+    if (__DEV__) {
+      // Log a warning if the profile has less than 2 samples so users can know why
+      // they are not seeing any profiling data and we cant avoid the back and forth
+      // of asking them to provide us with a dump of the profile data.
+      logger.log('[Profiling] Discarding profile because it contains less than 2 samples');
+    }
+    return false;
+  }
+
+  if (!profile.profile_id) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Finds transactions with profile_id context in the envelope
+ * @param envelope
+ * @returns
+ */
+export function findProfiledTransactionsFromEnvelope(envelope: Envelope): Event[] {
+  const events: Event[] = [];
+
+  forEachEnvelopeItem(envelope, (item, type) => {
+    if (type !== 'transaction') {
+      return;
+    }
+
+    // First item is the type
+    for (let j = 1; j < item.length; j++) {
+      const event = item[j];
+
+      // @ts-expect-error accessing private property
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      if (event && event.contexts && event.contexts['profile'] && event.contexts['profile']['profile_id']) {
+        events.push(item[j] as Event);
+      }
+    }
+  });
+
+  return events;
+}
+
+/**
+ * Creates a profiling envelope item, if the profile does not pass validation, returns null.
+ * @param event
+ * @returns {Profile | null}
+ */
+export function createProfilingEvent(profile: ThreadCpuProfile, event: Event): Profile | null {
+  if (!isValidProfile(profile)) {
+    return null;
+  }
+
+  return createProfilePayload(profile, {
+    release: event.release || '',
+    environment: event.environment || '',
+    event_id: event.event_id || '',
+    transaction: event.transaction || '',
+    start_timestamp: event.start_timestamp ? event.start_timestamp * 1000 : Date.now(),
+    trace_id: event?.contexts?.trace?.trace_id as string ?? '',
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    profile_id: profile.profile_id,
+    os_platform: event.contexts?.os?.name || '',
+    os_version: event.contexts?.os?.version || '',
+    os_build: event.contexts?.os?.build || '',
+    device_locale: event.contexts?.device?.locale as string || '',
+    device_model: event.contexts?.device?.model || '',
+    device_manufacturer: event.contexts?.device?.manufacturer || '',
+    device_architecture: event.contexts?.device?.arch || '',
+    device_is_emulator: event.contexts?.device?.simulator || false,
+  });
+}
+
+/**
+ * Create a profile
+ * @param profile
+ * @param options
+ * @returns
+ */
+function createProfilePayload(
+  cpuProfile: ThreadCpuProfile,
+  {
+    release,
+    environment,
+    event_id,
+    transaction,
+    start_timestamp,
+    trace_id,
+    profile_id,
+    os_platform,
+    os_version,
+    os_build,
+    device_locale,
+    device_model,
+    device_manufacturer,
+    device_architecture,
+    device_is_emulator,
+  }: {
+    release: string;
+    environment: string;
+    event_id: string;
+    transaction: string;
+    start_timestamp: number;
+    trace_id: string | undefined;
+    profile_id: string;
+    os_platform: string;
+    os_version: string;
+    os_build?: string;
+    device_locale: string;
+    device_model: string;
+    device_manufacturer: string;
+    device_architecture:  string;
+    device_is_emulator: boolean;
+  }
+): Profile {
+  // Log a warning if the profile has an invalid traceId (should be uuidv4).
+  // All profiles and transactions are rejected if this is the case and we want to
+  // warn users that this is happening if they enable debug flag
+  if (trace_id && trace_id.length !== 32) {
+    if (__DEV__) {
+      logger.log(`[Profiling] Invalid traceId: ${  trace_id  } on profiled event`);
+    }
+  }
+
+  const profile: Profile = {
+    event_id: profile_id,
+    timestamp: new Date(start_timestamp).toISOString(),
+    platform: 'node',
+    version: '1',
+    release: release,
+    environment: environment,
+    runtime: {
+      name: 'hermes',
+      version: '', // TODO: get hermes version
+    },
+    os: {
+      name: os_platform,
+      version: os_version,
+      build_number: os_build,
+    },
+    device: {
+      locale: device_locale,
+      model: device_model,
+      manufacturer: device_manufacturer,
+      architecture: device_architecture,
+      is_emulator: device_is_emulator,
+    },
+    profile: cpuProfile,
+    transaction: {
+      name: transaction,
+      id: event_id,
+      trace_id: trace_id || '',
+      active_thread_id: ACTIVE_THREAD_ID_STRING
+    }
+  };
+
+  return profile;
+}
+
+/**
+ * Adds items to envelope if they are not already present - mutates the envelope.
+ * @param envelope
+ */
+export function addProfilesToEnvelope(envelope: Envelope, profiles: Profile[]): Envelope {
+  if (!profiles.length) {
+    return envelope;
+  }
+
+  for (const profile of profiles) {
+    // @ts-expect-error untyped envelope
+    envelope[1].push([{ type: 'profile' }, profile]);
+  }
+  return envelope;
+}
diff --git a/src/js/utils/hermes.ts b/src/js/utils/hermes.ts
deleted file mode 100644
index 235521581..000000000
--- a/src/js/utils/hermes.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-
-export type StackFrameId = number;
-export type MicrosecondsSinceBoot = string;
-
-export interface TraceEvent {
-  name: string,
-  ph: string,
-  cat: string,
-  pid: number,
-  ts: MicrosecondsSinceBoot,
-  tid: string,
-  args: {
-    name?: string,
-  },
-}
-
-export interface Sample {
-  cpu: string;
-  name: string;
-  ts: MicrosecondsSinceBoot;
-  pid: number;
-  tid: string;
-  weight: string;
-  sf: StackFrameId;
-}
-
-export interface StackFrame {
-  line?: string;
-  column?: string;
-  funcLine?: string;
-  funcColumn?: string;
-  name: string;
-  category: string;
-  parent?: number;
-}
-
-export interface Profile {
-  traceEvents: TraceEvent[];
-  samples: Sample[];
-  stackFrames: Record<string, StackFrame>;
-}
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index adf8c8583..7608b0697 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -22,9 +22,9 @@ import type {
   Spec,
 } from './NativeRNSentry';
 import type { ReactNativeClientOptions } from './options';
+import type * as Hermes from './profiling/hermes';
 import type { RequiredKeysUser } from './user';
 import { isTurboModuleEnabled } from './utils/environment';
-import type * as Hermes from './utils/hermes';
 import { utf8ToBytes } from './vendor';
 
 const RNSentry: Spec | undefined = isTurboModuleEnabled()
@@ -81,9 +81,8 @@ interface SentryNativeWrapper {
   fetchModules(): Promise<Record<string, string> | null>;
   fetchViewHierarchy(): PromiseLike<Uint8Array | null>;
 
-  startProfiling(): Promise<void>;
-  stopProfiling(): Promise<Hermes.Profile>;
-  getUptimeTimestampNs(): Promise<number>;
+  startProfiling(): boolean;
+  stopProfiling(): Hermes.Profile | null;
 }
 
 /**
@@ -500,7 +499,7 @@ export const NATIVE: SentryNativeWrapper = {
     return raw ? new Uint8Array(raw) : null;
   },
 
-  async startProfiling(): Promise<void> {
+  startProfiling(): boolean {
     if (!this.enableNative) {
       throw this._DisabledNativeError;
     }
@@ -508,26 +507,17 @@ export const NATIVE: SentryNativeWrapper = {
       throw this._NativeClientError;
     }
 
-    const { error } = await RNSentry.startProfiling();
-    logger.error(error);
-  },
-
-  async stopProfiling(): Promise<Hermes.Profile> {
-    if (!this.enableNative) {
-      throw this._DisabledNativeError;
-    }
-    if (!this._isModuleLoaded(RNSentry)) {
-      throw this._NativeClientError;
+    const { started, error } = RNSentry.startProfiling();
+    if (started) {
+      __DEV__ && logger.log('[NATIVE] Start Profiling');
+    } else {
+      __DEV__ && logger.error('[NATIVE] Start Profiling Failed', error);
     }
 
-    const { error, data } = await RNSentry.stopProfiling();
-    logger.error(error);
-    logger.log(data);
-    // TODO: safe parse/parse on native side
-    return JSON.parse(data || '') as Hermes.Profile;
+    return !!started;
   },
 
-  async getUptimeTimestampNs(): Promise<number> {
+  stopProfiling(): Hermes.Profile | null {
     if (!this.enableNative) {
       throw this._DisabledNativeError;
     }
@@ -535,8 +525,18 @@ export const NATIVE: SentryNativeWrapper = {
       throw this._NativeClientError;
     }
 
-    const uptime = await RNSentry.getUptimeTimestampNs();
-    return uptime;
+    const { profile, error } = RNSentry.stopProfiling();
+    if (!profile || error) {
+      __DEV__ && logger.error('[NATIVE] Stop Profiling Failed', error);
+      return null;
+    }
+
+    try {
+      return JSON.parse( profile) as Hermes.Profile
+    } catch (e) {
+      __DEV__ && logger.error('[NATIVE] Failed to parse Hermes Profile JSON', e);
+      return null;
+    }
   },
 
   /**
diff --git a/test/integrations/profiling.test.ts b/test/integrations/profiling.test.ts
deleted file mode 100644
index 0d7868144..000000000
--- a/test/integrations/profiling.test.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import type { ThreadCpuProfile} from '../../src/js/integrations/profiling';
-import { convertToSentryProfile } from '../../src/js/integrations/profiling';
-import type * as Hermes from '../../src/js/utils/hermes';
-
-describe('Profiling Integration', () => {
-  describe('convert hermes profile to sentry profile', () => {
-    it('simple test profile', async () => {
-      const givenContext = {
-        uptimeTimestampNs: 0,
-        profileStartTimestampNs: 0,
-      };
-      const hermesProfile: Hermes.Profile = {
-        'traceEvents': [],
-        'samples': [
-          {
-            'cpu': '-1',
-            'name': '',
-            'ts': '1896623880553',
-            'pid': 54822,
-            'tid': '14509472',
-            'weight': '1',
-            'sf': 1
-          },
-          {
-            'cpu': '-1',
-            'name': '',
-            'ts': '1896623902244',
-            'pid': 54822,
-            'tid': '14509472',
-            'weight': '1',
-            'sf': 1
-          },
-        ],
-        'stackFrames': {
-          '1': {
-            'name': '[root]',
-            'category': 'root'
-          },
-          '2': {
-            'line': '1610',
-            'column': '33',
-            'funcLine': '1605',
-            'funcColumn': '14',
-            'name': 'invokeCallbackAndReturnFlushedQueue(/Users/krystofwoldrich/Library/Developer/Xcode/DerivedData/sampleNewArchitecture-dtnzzmpchfyuyyajisnbghavfleb/Build/Products/Release-iphonesimulator/main.jsbundle:1610:33)',
-            'category': 'JavaScript',
-            'parent': 1
-          },
-          '3': {
-            'line': '1616',
-            'column': '21',
-            'funcLine': '1614',
-            'funcColumn': '14',
-            'name': 'flushedQueue(/Users/krystofwoldrich/Library/Developer/Xcode/DerivedData/sampleNewArchitecture-dtnzzmpchfyuyyajisnbghavfleb/Build/Products/Release-iphonesimulator/main.jsbundle:1616:21)',
-            'category': 'JavaScript',
-            'parent': 2
-          },
-        },
-      };
-      const expectedSentryProfile: ThreadCpuProfile = {
-        'frames': [
-          {
-            'column': undefined,
-            'file': undefined,
-            'function': '[root]',
-            'line': undefined,
-          },
-          {
-            'column': 33,
-            'file': 'main.jsbundle',
-            'function': 'invokeCallbackAndReturnFlushedQueue',
-            'line': 1610,
-          },
-          {
-            'column': 21,
-            'file': 'main.jsbundle',
-            'function': 'flushedQueue',
-            'line': 1616,
-          },
-        ],
-        'samples':  [
-          {
-            'elapsed_since_start_ns': '-1896623880553000',
-            'stack_id': -1,
-            'thread_id': '14509472',
-          },
-          {
-            'elapsed_since_start_ns': '-1896623902244000',
-            'stack_id': -1,
-            'thread_id': '14509472',
-          },
-        ],
-        'stacks':  [
-          [
-            0,
-            1,
-            2,
-          ],
-        ],
-        'thread_metadata':  {
-          '14509472':  {
-            'name': 'JavaScriptThread',
-            'priority': 1,
-          },
-        },
-      };
-      expect(convertToSentryProfile(hermesProfile, givenContext)).toStrictEqual(expectedSentryProfile);
-    });
-  });
-});
diff --git a/test/integrations/profiling/convertHermesProfile.test.ts b/test/integrations/profiling/convertHermesProfile.test.ts
new file mode 100644
index 000000000..a40c7a894
--- /dev/null
+++ b/test/integrations/profiling/convertHermesProfile.test.ts
@@ -0,0 +1,153 @@
+import { convertToSentryProfile } from '../../../src/js/profiling/convertHermesProfile';
+import type * as Hermes from '../../../src/js/profiling/hermes';
+import type { ThreadCpuProfile} from '../../../src/js/profiling/types';
+
+describe('convert hermes profile to sentry profile', () => {
+  it('simple test profile', async () => {
+    const hermesProfile: Hermes.Profile = {
+      traceEvents: [],
+      samples: [
+        {
+          cpu: '-1',
+          name: '',
+          ts: '10',
+          pid: 54822,
+          tid: '14509472',
+          weight: '1',
+          sf: 4
+        },
+        {
+          cpu: '-1',
+          name: '',
+          ts: '20',
+          pid: 54822,
+          tid: '14509472',
+          weight: '1',
+          sf: 4
+        },
+        {
+          cpu: '-1',
+          name: '',
+          ts: '30',
+          pid: 54822,
+          tid: '14509472',
+          weight: '1',
+          sf: 1
+        },
+        {
+          cpu: '-1',
+          name: '',
+          ts: '40',
+          pid: 54822,
+          tid: '14509472',
+          weight: '1',
+          sf: 3
+        },
+      ],
+      stackFrames: {
+        1: {
+          name: '[root]',
+          category: 'root'
+        },
+        2: {
+          line: '1610',
+          column: '33',
+          funcLine: '1605',
+          funcColumn: '14',
+          name: 'fooA(/absolute/path/main.jsbundle:1610:33)',
+          category: 'JavaScript',
+          parent: 1
+        },
+        3: {
+          line: '1616',
+          column: '21',
+          funcLine: '1614',
+          funcColumn: '14',
+          name: 'fooB(/absolute/path/main.jsbundle:1616:21)',
+          category: 'JavaScript',
+          parent: 1
+        },
+        4: {
+          line: '1627',
+          column: '18',
+          funcLine: '1623',
+          funcColumn: '16',
+          name: 'fooC(/absolute/path/main.jsbundle:1627:18)',
+          category: 'JavaScript',
+          parent: 2
+        },
+      },
+    };
+    const expectedSentryProfile: ThreadCpuProfile = {
+      frames: [
+        {
+          column: undefined,
+          file: undefined,
+          function: '[root]',
+          line: undefined,
+        },
+        {
+          column: 33,
+          file: 'main.jsbundle',
+          function: 'fooA',
+          line: 1610,
+        },
+        {
+          column: 21,
+          file: 'main.jsbundle',
+          function: 'fooB',
+          line: 1616,
+        },
+        {
+          column: 18,
+          file: 'main.jsbundle',
+          function: 'fooC',
+          line: 1627,
+        },
+      ],
+      samples: [
+        {
+          elapsed_since_start_ns: '0',
+          stack_id: 0,
+          thread_id: '14509472',
+        },
+        {
+          elapsed_since_start_ns: '10000',
+          stack_id: 0,
+          thread_id: '14509472',
+        },
+        {
+          elapsed_since_start_ns: '20000',
+          stack_id: 1,
+          thread_id: '14509472',
+        },
+        {
+          elapsed_since_start_ns: '30000',
+          stack_id: 2,
+          thread_id: '14509472',
+        },
+      ],
+      stacks: [
+        [
+          3,
+          1,
+          0,
+        ],
+        [
+          0,
+        ],
+        [
+          2,
+          0,
+        ],
+      ],
+      thread_metadata: {
+        '14509472':  {
+          name: 'JavaScriptThread',
+          priority: 1,
+        },
+      },
+    };
+    expect(convertToSentryProfile(hermesProfile)).toStrictEqual(expectedSentryProfile);
+  });
+});
diff --git a/test/integrations/profiling/hermes.test.ts b/test/integrations/profiling/hermes.test.ts
new file mode 100644
index 000000000..ff98f3b1a
--- /dev/null
+++ b/test/integrations/profiling/hermes.test.ts
@@ -0,0 +1,26 @@
+import { parseHermesStackFrameName } from '../../../src/js/profiling/hermes';
+
+describe('hermes', () => {
+  describe('parseHermesStackFrameName', () => {
+    test('parses function name and file name', () => {
+      expect(parseHermesStackFrameName('fooA(/absolute/path/main.jsbundle:1610:33)'))
+      .toEqual({ function: 'fooA', fileName: 'main.jsbundle' });
+    });
+    test('parse hermes root stack frame', () => {
+      expect(parseHermesStackFrameName('[root]'))
+        .toEqual({ function: '[root]' });
+    });
+    test('parse only file name', () => {
+      expect(parseHermesStackFrameName('(/absolute/path/main.jsbundle:1610:33)'))
+        .toEqual({ fileName: 'main.jsbundle', function: '' });
+    });
+    test('parse only file name no line or col num', () => {
+      expect(parseHermesStackFrameName('(/absolute/path/main.jsbundle)'))
+        .toEqual({ fileName: 'main.jsbundle', function: '' });
+    });
+    test('parse only function name', () => {
+      expect(parseHermesStackFrameName('fooA'))
+        .toEqual({ function: 'fooA' });
+    });
+  });
+});
diff --git a/test/wrapper.test.ts b/test/wrapper.test.ts
index d71b9e6fb..92f6c0cb8 100644
--- a/test/wrapper.test.ts
+++ b/test/wrapper.test.ts
@@ -46,6 +46,8 @@ jest.mock(
       closeNativeSdk: jest.fn(() => Promise.resolve()),
       // @ts-ignore for testing.
       _getLastPayload: () => ({ initPayload }),
+      startProfiling: jest.fn(),
+      stopProfiling: jest.fn(),
     };
 
     return {
@@ -494,4 +496,32 @@ describe('Tests Native Wrapper', () => {
       expect(NATIVE.enableNative).toBe(false);
     });
   });
+
+  describe('profiling', () => {
+    test('start profiling returns true', () => {
+      (RNSentry.startProfiling as jest.MockedFunction<typeof RNSentry.startProfiling>)
+        .mockReturnValue({ started: true });
+      expect(NATIVE.startProfiling()).toBe(true);
+    });
+    test('failed start profiling returns false', () => {
+      (RNSentry.startProfiling as jest.MockedFunction<typeof RNSentry.startProfiling>)
+        .mockReturnValue({ error: 'error' });
+      expect(NATIVE.startProfiling()).toBe(false);
+    });
+    test('stop profiling returns profile', () => {
+      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>)
+        .mockReturnValue({ profile: '{ "valid": "json" }' });
+      expect(NATIVE.stopProfiling()).toEqual({ valid: 'json' });
+    });
+    test('failed stop profiling returns null', () => {
+      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>)
+        .mockReturnValue({ error: 'error' });
+      expect(NATIVE.stopProfiling()).toBe(null);
+    });
+    test('stop profiling returns null on invalid json profile', () => {
+      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>)
+        .mockReturnValue({ profile: 'invalid' });
+      expect(NATIVE.stopProfiling()).toBe(null);
+    });
+  });
 });

From 1240f050b13e89e53397dfd760eb26eef189e6b5 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Thu, 25 May 2023 22:18:16 +0200
Subject: [PATCH 07/40] Large clean up and profiles sample rate

---
 sample-new-architecture/src/App.tsx           |   7 +-
 src/js/NativeRNSentry.ts                      |   4 +-
 src/js/integrations/index.ts                  |   2 +-
 src/js/profiling/cache.ts                     |  11 +-
 src/js/profiling/convertHermesProfile.ts      |  17 +-
 src/js/profiling/hermes.ts                    |  36 ++--
 src/js/profiling/integration.ts               | 188 ++++++++++--------
 src/js/profiling/types.ts                     |   1 -
 src/js/profiling/utils.ts                     |  14 +-
 src/js/wrapper.ts                             |  10 +-
 .../profiling/convertHermesProfile.test.ts    |  35 +---
 test/integrations/profiling/hermes.test.ts    |  24 ++-
 test/wrapper.test.ts                          |  25 ++-
 13 files changed, 197 insertions(+), 177 deletions(-)

diff --git a/sample-new-architecture/src/App.tsx b/sample-new-architecture/src/App.tsx
index 7a99a3225..a95a5afa6 100644
--- a/sample-new-architecture/src/App.tsx
+++ b/sample-new-architecture/src/App.tsx
@@ -22,7 +22,7 @@ import { StyleSheet } from 'react-native';
 import { HttpClient } from '@sentry/integrations';
 import { Integrations } from '@sentry/react-native';
 
-const { ProfilingIntegration } = Integrations;
+const { HermesProfiling } = Integrations;
 
 const reactNavigationInstrumentation =
   new Sentry.ReactNavigationInstrumentation({
@@ -68,7 +68,7 @@ Sentry.init({
         // default: [/.*/]
         failedRequestTargets: [/.*/],
       }),
-      new ProfilingIntegration(),
+      new HermesProfiling(),
     );
     return integrations.filter(i => i.name !== 'Dedupe');
   },
@@ -89,6 +89,9 @@ Sentry.init({
   // otherwise they will not work.
   // release: 'myapp@1.2.3+1',
   // dist: `1`,
+  _experiments: {
+    profilesSampleRate: 1,
+  },
 });
 
 const Stack = createStackNavigator();
diff --git a/src/js/NativeRNSentry.ts b/src/js/NativeRNSentry.ts
index d9cf3d133..f93f6b027 100644
--- a/src/js/NativeRNSentry.ts
+++ b/src/js/NativeRNSentry.ts
@@ -31,8 +31,8 @@ export interface Spec extends TurboModule {
   enableNativeFramesTracking(): void;
   fetchModules(): Promise<string | undefined | null>;
   fetchViewHierarchy(): Promise<number[] | undefined | null>;
-  startProfiling(): { started?: boolean, error?: string };
-  stopProfiling(): { profile?: string, error?: string };
+  startProfiling(): { started?: boolean; error?: string };
+  stopProfiling(): { profile?: string; error?: string };
 }
 
 export type NativeAppStartResponse = {
diff --git a/src/js/integrations/index.ts b/src/js/integrations/index.ts
index 58bd7498b..061bc5e0a 100644
--- a/src/js/integrations/index.ts
+++ b/src/js/integrations/index.ts
@@ -6,4 +6,4 @@ export { EventOrigin } from './eventorigin';
 export { SdkInfo } from './sdkinfo';
 export { ReactNativeInfo } from './reactnativeinfo';
 export { ModulesLoader } from './modulesloader';
-export { ProfilingIntegration } from '../profiling/integration';
+export { HermesProfiling } from '../profiling/integration';
diff --git a/src/js/profiling/cache.ts b/src/js/profiling/cache.ts
index 02fbe9d4f..16a0d409b 100644
--- a/src/js/profiling/cache.ts
+++ b/src/js/profiling/cache.ts
@@ -1,12 +1,13 @@
-// sentry-javascript/packages/browser/src/profiling/cache.ts
-// TODO: Remove after exporting from @sentry/utils
-import type { Event } from '@sentry/types';
+import type { ThreadCpuProfile } from './types';
 
 /**
  * Creates a cache that evicts keys in fifo order
  * @param size {Number}
  */
-export function makeProfilingCache<Key extends string, Value extends Event>(
+// sentry-javascript/packages/browser/src/profiling/cache.ts
+// https://github.com/getsentry/sentry-javascript/blob/bf8c0551e2a969083199f014d07ac2a617e323fc/packages/browser/src/profiling/cache.ts#L7
+// TODO: Remove after exporting from @sentry/utils
+export function makeProfilingCache<Key extends string, Value>(
   size: number,
 ): {
   get: (key: Key) => Value | undefined;
@@ -71,4 +72,4 @@ export function makeProfilingCache<Key extends string, Value extends Event>(
   };
 }
 
-export const PROFILING_EVENT_CACHE = makeProfilingCache<string, Event>(20);
+export const PROFILE_QUEUE = makeProfilingCache<string, ThreadCpuProfile>(20);
diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index 59deb0802..8f54ba669 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -1,13 +1,6 @@
 import type * as Hermes from './hermes';
 import { parseHermesStackFrameName } from './hermes';
-import type {
-  Frame,
-  Sample,
-  Stack,
-  StackId,
-  ThreadCpuProfile,
-  ThreadId,
-} from './types';
+import type { Frame, Sample, Stack, StackId, ThreadCpuProfile, ThreadId } from './types';
 
 const UNKNOWN_FRAME_FUNCTION_NAME = '<unknown>';
 const UNKNOWN_STACK_ID = -1;
@@ -17,9 +10,7 @@ const JS_THREAD_PRIORITY = 1;
 /**
  *
  */
-export function convertToSentryProfile(
-  hermesProfile: Hermes.Profile,
-): ThreadCpuProfile {
+export function convertToSentryProfile(hermesProfile: Hermes.Profile): ThreadCpuProfile {
   const jsThreads = new Set<ThreadId>();
   const hermesStacks = new Set<Hermes.StackFrameId>();
 
@@ -59,7 +50,7 @@ export function convertToSentryProfile(
       function: stackFrameName.function || UNKNOWN_FRAME_FUNCTION_NAME,
       file: stackFrameName.fileName,
       line: hermesFrame.line !== undefined ? Number(hermesFrame.line) : undefined,
-      column: hermesFrame.column !== undefined ? Number(hermesFrame.column): undefined,
+      column: hermesFrame.column !== undefined ? Number(hermesFrame.column) : undefined,
     });
   }
 
@@ -69,7 +60,7 @@ export function convertToSentryProfile(
     const stackId = stacks.length;
     hermesStackToSentryStackMap.set(hermesStackFunctionFrameId, stackId);
     const stack: Stack = [];
-    let currentHermesFrameId: Hermes.StackFrameId | undefined  = hermesStackFunctionFrameId;
+    let currentHermesFrameId: Hermes.StackFrameId | undefined = hermesStackFunctionFrameId;
     while (currentHermesFrameId !== undefined) {
       stack.push(currentHermesFrameId - 1); // Sentry frames are indexed from 0
       currentHermesFrameId = hermesFrameChildToParentMap.get(currentHermesFrameId);
diff --git a/src/js/profiling/hermes.ts b/src/js/profiling/hermes.ts
index a7f480b7b..33ba8a105 100644
--- a/src/js/profiling/hermes.ts
+++ b/src/js/profiling/hermes.ts
@@ -1,24 +1,20 @@
 import { NATIVE } from '../wrapper';
-import {
-  convertToSentryProfile,
-} from './convertHermesProfile';
-import type {
-  ThreadCpuProfile,
-} from './types';
+import { convertToSentryProfile } from './convertHermesProfile';
+import type { ThreadCpuProfile } from './types';
 
 export type StackFrameId = number;
 export type MicrosecondsSinceBoot = string;
 
 export interface TraceEvent {
-  name: string,
-  ph: string,
-  cat: string,
-  pid: number,
-  ts: MicrosecondsSinceBoot,
-  tid: string,
+  name: string;
+  ph: string;
+  cat: string;
+  pid: number;
+  ts: MicrosecondsSinceBoot;
+  tid: string;
   args: {
-    name?: string,
-  },
+    name?: string;
+  };
 }
 
 export interface Sample {
@@ -64,19 +60,22 @@ export function parseHermesStackFrameName(name: string): HermesStackFrameNamePar
   if (match) {
     result.fileName = match[1];
   }
-  result.function = name.split('(')[0]
+  result.function = name.split('(')[0];
   return result;
 }
 
-
 const MS_TO_NS: number = 1e6;
 
 /**
  * Starts Hermes Sampling Profiler and returns the timestamp when profiling started in nanoseconds.
  */
-export function startProfiling(): number {
+export function startProfiling(): number | null {
+  const started = NATIVE.startProfiling();
+  if (!started) {
+    return null;
+  }
+
   const profileStartTimestampNs = Date.now() * MS_TO_NS;
-  void NATIVE.startProfiling();
   return profileStartTimestampNs;
 }
 
@@ -90,4 +89,3 @@ export function stopProfiling(): ThreadCpuProfile | null {
   }
   return convertToSentryProfile(hermesProfile);
 }
-
diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
index 2d0e694fb..959cc1351 100644
--- a/src/js/profiling/integration.ts
+++ b/src/js/profiling/integration.ts
@@ -1,41 +1,47 @@
-import type { Envelope, EventProcessor, Hub, Integration, Transaction } from '@sentry/types';
+import type { Envelope, Event, EventProcessor, Hub, Integration, Transaction } from '@sentry/types';
 import { logger, uuid4 } from '@sentry/utils';
 
-import type {
-  Profile,
-} from './types';
-import {
-  addProfilesToEnvelope,
-  createProfilingEvent,
-  findProfiledTransactionsFromEnvelope,
-} from './utils';
-import { PROFILING_EVENT_CACHE } from './cache';
+import { isHermesEnabled } from '../utils/environment';
+import { PROFILE_QUEUE } from './cache';
 import { startProfiling, stopProfiling } from './hermes';
+import type { Profile } from './types';
+import { addProfilesToEnvelope, createProfilingEvent, findProfiledTransactionsFromEnvelope } from './utils';
 
 /**
+ * Profiling integration creates a profile for each transaction and adds it to the event envelope.
  *
+ * @experimental
  */
-export class ProfilingIntegration implements Integration {
-
+export class HermesProfiling implements Integration {
   /**
    * @inheritDoc
    */
-  public static id: string = 'ProfilingIntegration';
+  public static id: string = 'HermesProfiling';
 
   /**
    * @inheritDoc
    */
-  public name: string = ProfilingIntegration.id;
+  public name: string = HermesProfiling.id;
+
+  private _getCurrentHub?: () => Hub;
 
-  private _currentProfile: {
-    profile_id: string;
-    startTimestampNs: number;
-  } | undefined;
+  private _currentProfile:
+    | {
+        profile_id: string;
+        startTimestampNs: number;
+      }
+    | undefined;
 
   /**
    * @inheritDoc
    */
   public setupOnce(_: (e: EventProcessor) => void, getCurrentHub: () => Hub): void {
+    if (!isHermesEnabled()) {
+      logger.log('[Profiling] Hermes is not enabled, not adding profiling integration.');
+      return;
+    }
+
+    this._getCurrentHub = getCurrentHub;
     const client = getCurrentHub().getClient();
 
     if (!client || typeof client.on !== 'function') {
@@ -43,87 +49,86 @@ export class ProfilingIntegration implements Integration {
     }
 
     client.on('startTransaction', (transaction: Transaction) => {
-      // TODO: maybeProfile use sample rate or sample to start profiling
-      void this._finishCurrentProfile();
-      // TODO: _startProfileTimeout
-      const profileStartTimestampNs = startProfiling();
-      this._currentProfile = {
-        profile_id: uuid4(),
-        startTimestampNs: profileStartTimestampNs,
-      };
-      transaction.setContext('profile', { profile_id: this._currentProfile.profile_id });
-      // @ts-expect-error profile_id is not part of the metadata type
-      transaction.setMetadata({ profile_id: this._currentProfile.profile_id });
-      logger.log(
-        '[Profiling] started profiling: ',
-        this._currentProfile.profile_id,
-      );
+      this._finishCurrentProfile();
+
+      const shouldStartProfiling = this._shouldStartProfiling(transaction);
+      if (!shouldStartProfiling) {
+        return;
+      }
+
+      this._startNewProfile(transaction);
     });
 
     client.on('finishTransaction', () => {
-      // TODO: _stopProfileTimeout
       this._finishCurrentProfile();
     });
 
     client.on('beforeEnvelope', (envelope: Envelope) => {
-      // if not profiles are in queue, there is nothing to add to the envelope.
-      if (!PROFILING_EVENT_CACHE.size()) {
+      if (!PROFILE_QUEUE.size()) {
         return;
       }
 
-      const profiledTransactionEvents = findProfiledTransactionsFromEnvelope(envelope);
-      if (!profiledTransactionEvents.length) {
-        __DEV__ && logger.log('[Profiling] no profiled transactions found in envelope');
+      const profiledTransactions = findProfiledTransactionsFromEnvelope(envelope);
+      if (!profiledTransactions.length) {
+        logger.log('[Profiling] no profiled transactions found in envelope');
         return;
       }
 
       const profilesToAddToEnvelope: Profile[] = [];
-      // eslint-disable-next-line @typescript-eslint/prefer-for-of
-      for (let i = 0; i < profiledTransactionEvents.length; i++) {
-        const profiledTransaction = profiledTransactionEvents[i];
-        const profile_id = profiledTransaction?.contexts?.['profile']?.['profile_id'];
-
-        if (!profile_id) {
-          logger.log('[Profiling] cannot find profile for a transaction without a profile context');
-          continue;
-        }
-
-        // Remove the profile from the transaction context before sending, relay will take care of the rest.
-        if (profiledTransaction?.contexts?.['.profile']) {
-          delete profiledTransaction.contexts.profile;
-        }
-
-        // We need to find both a profile and a transaction event for the same profile_id.
-        const profileIndex = PROFILE_QUEUE.findIndex((p) => p.profile_id === profile_id);
-        if (profileIndex === -1) {
-          if (__DEV__) {
-            logger.log(`[Profiling] Could not retrieve profile for transaction: ${profile_id}`);
-          }
-          continue;
-        }
-
-        const cpuProfile = PROFILE_QUEUE[profileIndex];
-        if (!cpuProfile) {
-          if (__DEV__) {
-            logger.log(`[Profiling] Could not retrieve profile for transaction: ${profile_id}`);
-          }
-          continue;
-        }
-
-        // Remove the profile from the queue.
-        PROFILE_QUEUE.splice(profileIndex, 1);
-        const profile = createProfilingEvent(cpuProfile, profiledTransaction);
-
+      for (const profiledTransaction of profiledTransactions) {
+        const profile = this._createProfileEventFor(profiledTransaction);
         if (profile) {
           profilesToAddToEnvelope.push(profile);
-          __DEV__ && logger.log(`[Profiling] Added profile ${profile_id} to transaction ${profiledTransaction.event_id}`);
         }
       }
       addProfilesToEnvelope(envelope, profilesToAddToEnvelope);
     });
   }
 
-  private
+  private _shouldStartProfiling = (transaction: Transaction): boolean => {
+    if (!transaction.sampled) {
+      logger.log('[Profiling] Transaction is not sampled, skipping profiling');
+      return false;
+    }
+
+    const client = this._getCurrentHub && this._getCurrentHub().getClient();
+    const options = client && client.getOptions();
+
+    // @ts-ignore not part of the browser options yet
+    const profilesSampleRate = (options && options._experiments && options._experiments.profilesSampleRate) || 0;
+    if (profilesSampleRate === undefined) {
+      logger.log('[Profiling] Profiling disabled, enable it by setting `profilesSampleRate` option to SDK init call.');
+      return false;
+    }
+
+    // Check if we should sample this profile
+    if (Math.random() > profilesSampleRate) {
+      logger.log('[Profiling] Skip profiling transaction due to sampling.');
+      return false;
+    }
+
+    return true;
+  };
+
+  /**
+   * Starts a new profile and links it to the transaction.
+   */
+  private _startNewProfile = (transaction: Transaction): void => {
+    // TODO: _startProfileTimeout
+    const profileStartTimestampNs = startProfiling();
+    if (!profileStartTimestampNs) {
+      return;
+    }
+
+    this._currentProfile = {
+      profile_id: uuid4(),
+      startTimestampNs: profileStartTimestampNs,
+    };
+    transaction.setContext('profile', { profile_id: this._currentProfile.profile_id });
+    // @ts-expect-error profile_id is not part of the metadata type
+    transaction.setMetadata({ profile_id: this._currentProfile.profile_id });
+    logger.log('[Profiling] started profiling: ', this._currentProfile.profile_id);
+  };
 
   /**
    * Stops profiling and adds the profile to the queue to be processed on beforeEnvelope.
@@ -133,6 +138,8 @@ export class ProfilingIntegration implements Integration {
       return;
     }
 
+    // TODO: _stopProfileTimeout
+
     const profile = stopProfiling();
     if (!profile) {
       logger.warn('[Profiling] Stop failed. Cleaning up...');
@@ -141,9 +148,34 @@ export class ProfilingIntegration implements Integration {
     }
 
     profile.profile_id = this._currentProfile.profile_id;
-    addToProfileQueue(profile);
+    PROFILE_QUEUE.add(profile.profile_id, profile);
     logger.log('[Profiling] finished profiling: ', this._currentProfile.profile_id);
     this._currentProfile = undefined;
   };
 
+  private _createProfileEventFor = (profiledTransaction: Event): Profile | null => {
+    const profile_id = profiledTransaction?.contexts?.['profile']?.['profile_id'];
+
+    if (typeof profile_id !== 'string') {
+      logger.log('[Profiling] cannot find profile for a transaction without a profile context');
+      return null;
+    }
+
+    // Remove the profile from the transaction context before sending, relay will take care of the rest.
+    if (profiledTransaction?.contexts?.['.profile']) {
+      delete profiledTransaction.contexts.profile;
+    }
+
+    const cpuProfile = PROFILE_QUEUE.get(profile_id);
+    PROFILE_QUEUE.delete(profile_id);
+
+    if (!cpuProfile) {
+      logger.log(`[Profiling] cannot find profile ${profile_id} for transaction ${profiledTransaction.event_id}`);
+      return null;
+    }
+
+    const profile = createProfilingEvent(cpuProfile, profiledTransaction);
+    logger.log(`[Profiling] Created profile ${profile_id} for transaction ${profiledTransaction.event_id}`);
+    return profile;
+  };
 }
diff --git a/src/js/profiling/types.ts b/src/js/profiling/types.ts
index 1308be6ab..228ff527c 100644
--- a/src/js/profiling/types.ts
+++ b/src/js/profiling/types.ts
@@ -1,4 +1,3 @@
-
 export type ThreadId = string;
 export type FrameId = number;
 export type StackId = number;
diff --git a/src/js/profiling/utils.ts b/src/js/profiling/utils.ts
index eeefe89f8..163d5b03e 100644
--- a/src/js/profiling/utils.ts
+++ b/src/js/profiling/utils.ts
@@ -70,13 +70,13 @@ export function createProfilingEvent(profile: ThreadCpuProfile, event: Event): P
     event_id: event.event_id || '',
     transaction: event.transaction || '',
     start_timestamp: event.start_timestamp ? event.start_timestamp * 1000 : Date.now(),
-    trace_id: event?.contexts?.trace?.trace_id as string ?? '',
+    trace_id: (event?.contexts?.trace?.trace_id as string) ?? '',
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     profile_id: profile.profile_id,
     os_platform: event.contexts?.os?.name || '',
     os_version: event.contexts?.os?.version || '',
     os_build: event.contexts?.os?.build || '',
-    device_locale: event.contexts?.device?.locale as string || '',
+    device_locale: (event.contexts?.device?.locale as string) || '',
     device_model: event.contexts?.device?.model || '',
     device_manufacturer: event.contexts?.device?.manufacturer || '',
     device_architecture: event.contexts?.device?.arch || '',
@@ -122,16 +122,16 @@ function createProfilePayload(
     device_locale: string;
     device_model: string;
     device_manufacturer: string;
-    device_architecture:  string;
+    device_architecture: string;
     device_is_emulator: boolean;
-  }
+  },
 ): Profile {
   // Log a warning if the profile has an invalid traceId (should be uuidv4).
   // All profiles and transactions are rejected if this is the case and we want to
   // warn users that this is happening if they enable debug flag
   if (trace_id && trace_id.length !== 32) {
     if (__DEV__) {
-      logger.log(`[Profiling] Invalid traceId: ${  trace_id  } on profiled event`);
+      logger.log(`[Profiling] Invalid traceId: ${trace_id} on profiled event`);
     }
   }
 
@@ -163,8 +163,8 @@ function createProfilePayload(
       name: transaction,
       id: event_id,
       trace_id: trace_id || '',
-      active_thread_id: ACTIVE_THREAD_ID_STRING
-    }
+      active_thread_id: ACTIVE_THREAD_ID_STRING,
+    },
   };
 
   return profile;
diff --git a/src/js/wrapper.ts b/src/js/wrapper.ts
index 7608b0697..88b535d8a 100644
--- a/src/js/wrapper.ts
+++ b/src/js/wrapper.ts
@@ -509,9 +509,9 @@ export const NATIVE: SentryNativeWrapper = {
 
     const { started, error } = RNSentry.startProfiling();
     if (started) {
-      __DEV__ && logger.log('[NATIVE] Start Profiling');
+      logger.log('[NATIVE] Start Profiling');
     } else {
-      __DEV__ && logger.error('[NATIVE] Start Profiling Failed', error);
+      logger.error('[NATIVE] Start Profiling Failed', error);
     }
 
     return !!started;
@@ -527,14 +527,14 @@ export const NATIVE: SentryNativeWrapper = {
 
     const { profile, error } = RNSentry.stopProfiling();
     if (!profile || error) {
-      __DEV__ && logger.error('[NATIVE] Stop Profiling Failed', error);
+      logger.error('[NATIVE] Stop Profiling Failed', error);
       return null;
     }
 
     try {
-      return JSON.parse( profile) as Hermes.Profile
+      return JSON.parse(profile) as Hermes.Profile;
     } catch (e) {
-      __DEV__ && logger.error('[NATIVE] Failed to parse Hermes Profile JSON', e);
+      logger.error('[NATIVE] Failed to parse Hermes Profile JSON', e);
       return null;
     }
   },
diff --git a/test/integrations/profiling/convertHermesProfile.test.ts b/test/integrations/profiling/convertHermesProfile.test.ts
index a40c7a894..ca744367a 100644
--- a/test/integrations/profiling/convertHermesProfile.test.ts
+++ b/test/integrations/profiling/convertHermesProfile.test.ts
@@ -1,6 +1,6 @@
 import { convertToSentryProfile } from '../../../src/js/profiling/convertHermesProfile';
 import type * as Hermes from '../../../src/js/profiling/hermes';
-import type { ThreadCpuProfile} from '../../../src/js/profiling/types';
+import type { ThreadCpuProfile } from '../../../src/js/profiling/types';
 
 describe('convert hermes profile to sentry profile', () => {
   it('simple test profile', async () => {
@@ -14,7 +14,7 @@ describe('convert hermes profile to sentry profile', () => {
           pid: 54822,
           tid: '14509472',
           weight: '1',
-          sf: 4
+          sf: 4,
         },
         {
           cpu: '-1',
@@ -23,7 +23,7 @@ describe('convert hermes profile to sentry profile', () => {
           pid: 54822,
           tid: '14509472',
           weight: '1',
-          sf: 4
+          sf: 4,
         },
         {
           cpu: '-1',
@@ -32,7 +32,7 @@ describe('convert hermes profile to sentry profile', () => {
           pid: 54822,
           tid: '14509472',
           weight: '1',
-          sf: 1
+          sf: 1,
         },
         {
           cpu: '-1',
@@ -41,13 +41,13 @@ describe('convert hermes profile to sentry profile', () => {
           pid: 54822,
           tid: '14509472',
           weight: '1',
-          sf: 3
+          sf: 3,
         },
       ],
       stackFrames: {
         1: {
           name: '[root]',
-          category: 'root'
+          category: 'root',
         },
         2: {
           line: '1610',
@@ -56,7 +56,7 @@ describe('convert hermes profile to sentry profile', () => {
           funcColumn: '14',
           name: 'fooA(/absolute/path/main.jsbundle:1610:33)',
           category: 'JavaScript',
-          parent: 1
+          parent: 1,
         },
         3: {
           line: '1616',
@@ -65,7 +65,7 @@ describe('convert hermes profile to sentry profile', () => {
           funcColumn: '14',
           name: 'fooB(/absolute/path/main.jsbundle:1616:21)',
           category: 'JavaScript',
-          parent: 1
+          parent: 1,
         },
         4: {
           line: '1627',
@@ -74,7 +74,7 @@ describe('convert hermes profile to sentry profile', () => {
           funcColumn: '16',
           name: 'fooC(/absolute/path/main.jsbundle:1627:18)',
           category: 'JavaScript',
-          parent: 2
+          parent: 2,
         },
       },
     };
@@ -127,22 +127,9 @@ describe('convert hermes profile to sentry profile', () => {
           thread_id: '14509472',
         },
       ],
-      stacks: [
-        [
-          3,
-          1,
-          0,
-        ],
-        [
-          0,
-        ],
-        [
-          2,
-          0,
-        ],
-      ],
+      stacks: [[3, 1, 0], [0], [2, 0]],
       thread_metadata: {
-        '14509472':  {
+        '14509472': {
           name: 'JavaScriptThread',
           priority: 1,
         },
diff --git a/test/integrations/profiling/hermes.test.ts b/test/integrations/profiling/hermes.test.ts
index ff98f3b1a..258ee9164 100644
--- a/test/integrations/profiling/hermes.test.ts
+++ b/test/integrations/profiling/hermes.test.ts
@@ -3,24 +3,28 @@ import { parseHermesStackFrameName } from '../../../src/js/profiling/hermes';
 describe('hermes', () => {
   describe('parseHermesStackFrameName', () => {
     test('parses function name and file name', () => {
-      expect(parseHermesStackFrameName('fooA(/absolute/path/main.jsbundle:1610:33)'))
-      .toEqual({ function: 'fooA', fileName: 'main.jsbundle' });
+      expect(parseHermesStackFrameName('fooA(/absolute/path/main.jsbundle:1610:33)')).toEqual({
+        function: 'fooA',
+        fileName: 'main.jsbundle',
+      });
     });
     test('parse hermes root stack frame', () => {
-      expect(parseHermesStackFrameName('[root]'))
-        .toEqual({ function: '[root]' });
+      expect(parseHermesStackFrameName('[root]')).toEqual({ function: '[root]' });
     });
     test('parse only file name', () => {
-      expect(parseHermesStackFrameName('(/absolute/path/main.jsbundle:1610:33)'))
-        .toEqual({ fileName: 'main.jsbundle', function: '' });
+      expect(parseHermesStackFrameName('(/absolute/path/main.jsbundle:1610:33)')).toEqual({
+        fileName: 'main.jsbundle',
+        function: '',
+      });
     });
     test('parse only file name no line or col num', () => {
-      expect(parseHermesStackFrameName('(/absolute/path/main.jsbundle)'))
-        .toEqual({ fileName: 'main.jsbundle', function: '' });
+      expect(parseHermesStackFrameName('(/absolute/path/main.jsbundle)')).toEqual({
+        fileName: 'main.jsbundle',
+        function: '',
+      });
     });
     test('parse only function name', () => {
-      expect(parseHermesStackFrameName('fooA'))
-        .toEqual({ function: 'fooA' });
+      expect(parseHermesStackFrameName('fooA')).toEqual({ function: 'fooA' });
     });
   });
 });
diff --git a/test/wrapper.test.ts b/test/wrapper.test.ts
index 92f6c0cb8..61335022f 100644
--- a/test/wrapper.test.ts
+++ b/test/wrapper.test.ts
@@ -499,28 +499,33 @@ describe('Tests Native Wrapper', () => {
 
   describe('profiling', () => {
     test('start profiling returns true', () => {
-      (RNSentry.startProfiling as jest.MockedFunction<typeof RNSentry.startProfiling>)
-        .mockReturnValue({ started: true });
+      (RNSentry.startProfiling as jest.MockedFunction<typeof RNSentry.startProfiling>).mockReturnValue({
+        started: true,
+      });
       expect(NATIVE.startProfiling()).toBe(true);
     });
     test('failed start profiling returns false', () => {
-      (RNSentry.startProfiling as jest.MockedFunction<typeof RNSentry.startProfiling>)
-        .mockReturnValue({ error: 'error' });
+      (RNSentry.startProfiling as jest.MockedFunction<typeof RNSentry.startProfiling>).mockReturnValue({
+        error: 'error',
+      });
       expect(NATIVE.startProfiling()).toBe(false);
     });
     test('stop profiling returns profile', () => {
-      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>)
-        .mockReturnValue({ profile: '{ "valid": "json" }' });
+      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>).mockReturnValue({
+        profile: '{ "valid": "json" }',
+      });
       expect(NATIVE.stopProfiling()).toEqual({ valid: 'json' });
     });
     test('failed stop profiling returns null', () => {
-      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>)
-        .mockReturnValue({ error: 'error' });
+      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>).mockReturnValue({
+        error: 'error',
+      });
       expect(NATIVE.stopProfiling()).toBe(null);
     });
     test('stop profiling returns null on invalid json profile', () => {
-      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>)
-        .mockReturnValue({ profile: 'invalid' });
+      (RNSentry.stopProfiling as jest.MockedFunction<typeof RNSentry.stopProfiling>).mockReturnValue({
+        profile: 'invalid',
+      });
       expect(NATIVE.stopProfiling()).toBe(null);
     });
   });

From 0cf766545faeea60bbf79c59cf38883aeb7a6a89 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Fri, 26 May 2023 17:03:56 +0200
Subject: [PATCH 08/40] Fix clean-ios

---
 sample-new-architecture/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample-new-architecture/package.json b/sample-new-architecture/package.json
index 1d7b88147..db43b8802 100644
--- a/sample-new-architecture/package.json
+++ b/sample-new-architecture/package.json
@@ -12,7 +12,7 @@
     "pod-install-production": "cd ios; PRODUCTION=1 RCT_NEW_ARCH_ENABLED=1 bundle exec pod install; cd ..",
     "pod-install-legacy": "cd ios; bundle exec pod install; cd ..",
     "pod-install-legacy-production": "cd ios; PRODUCTION=1 bundle exec pod install; cd ..",
-    "clean-ios": "cd ios; xcodebuild clean; rm -rf Podfile.lock Pods; cd .."
+    "clean-ios": "cd ios; rm -rf Podfile.lock Pods build; cd .."
   },
   "dependencies": {
     "@react-native-community/cli-platform-android": "^10.1.3",

From d11e846e947552ffeacb0c8c648372082097665e Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Fri, 26 May 2023 17:08:02 +0200
Subject: [PATCH 09/40] Set SENTRY_PROFILING_ENABLED using env when installing
 RNSentry pod

---
 RNSentry.podspec | 13 ++++++++++---
 ios/RNSentry.mm  |  8 ++++----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/RNSentry.podspec b/RNSentry.podspec
index 598fe0544..761bc85d9 100644
--- a/RNSentry.podspec
+++ b/RNSentry.podspec
@@ -1,7 +1,14 @@
 require 'json'
 version = JSON.parse(File.read('package.json'))["version"]
 
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+folly_flags = ' -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1'
+folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
+
+is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] == "1"
+new_arch_enabled_flag = (is_new_arch_enabled ? folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED" : "")
+is_sentry_profiling_enabled = ENV["SENTRY_PROFILING_ENABLED"] == "1"
+sentry_profiling_enabled_flag = (is_sentry_profiling_enabled ? " -DSENTRY_PROFILING_ENABLED" : "")
+other_cflags = "$(inherited)" + new_arch_enabled_flag + sentry_profiling_enabled_flag
 
 Pod::Spec.new do |s|
   s.name           = 'RNSentry'
@@ -25,8 +32,8 @@ Pod::Spec.new do |s|
   s.public_header_files = 'ios/RNSentry.h'
 
   # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+  s.compiler_flags = other_cflags
+  if is_new_arch_enabled then
     s.pod_target_xcconfig    = {
         "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
         "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index f48ff8e6b..f180eb5c9 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -12,7 +12,7 @@
 #import <Sentry/SentryOptions+HybridSDKs.h>
 
 // This guard prevents importing Hermes in JSC apps
-#ifdef SENTRY_PROFILING_ENABLED
+#if SENTRY_PROFILING_ENABLED
 #import <hermes/hermes.h>
 #endif
 
@@ -503,11 +503,11 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
     // the 'tracesSampleRate' or 'tracesSampler' option.
 }
 
-static NSString* const enabledProfilingMessage = @"Use SENTRY_PROFILING_ENABLED env to build with enabled profiling";
+static NSString* const enabledProfilingMessage = @"Use SENTRY_PROFILING_ENABLED=1 env when installing RNSentry pod";
 
 RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, startProfiling)
 {
-#ifdef SENTRY_PROFILING_ENABLED
+#if SENTRY_PROFILING_ENABLED
     try {
         facebook::hermes::HermesRuntime::enableSamplingProfiler();
         return @{ @"started": @YES };
@@ -523,7 +523,7 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
 
 RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, stopProfiling)
 {
-#ifdef SENTRY_PROFILING_ENABLED
+#if SENTRY_PROFILING_ENABLED
     try {
         facebook::hermes::HermesRuntime::disableSamplingProfiler();
         std::stringstream ss;

From 38d31bf014858e996cded4c64e2080a7fc42d49a Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Fri, 26 May 2023 17:12:24 +0200
Subject: [PATCH 10/40] Remove unused user defined xcode settings

---
 .../ios/sampleNewArchitecture.xcodeproj/project.pbxproj         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj b/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj
index 72b84872f..f579eb8de 100644
--- a/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj
+++ b/sample-new-architecture/ios/sampleNewArchitecture.xcodeproj/project.pbxproj
@@ -523,7 +523,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = sampleNewArchitecture;
 				RCT_NEW_ARCH_ENABLED = 1;
-				SENTRY_PROFILING_ENABLED = 1;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -550,7 +549,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = sampleNewArchitecture;
 				RCT_NEW_ARCH_ENABLED = 1;
-				SENTRY_PROFILING_ENABLED = 1;
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 			};

From 3baae8af4291d4f5a587a40929a2f53ea336c4fb Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Fri, 26 May 2023 19:23:29 +0200
Subject: [PATCH 11/40] Update Android profiling to use Hermes Profiler
 directly

---
 .../io/sentry/react/RNSentryModuleImpl.java   | 42 +++++++------------
 .../java/io/sentry/react/RNSentryModule.java  |  9 ++--
 .../java/io/sentry/react/RNSentryModule.java  | 11 +++++
 .../MainApplication.java                      | 11 -----
 4 files changed, 31 insertions(+), 42 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index c237be97a..c1b43feb0 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.core.app.FrameMetricsAggregator;
 
+import com.facebook.hermes.instrumentation.HermesSamplingProfiler;
 import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableArray;
@@ -31,7 +31,6 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 import java.util.HashMap;
@@ -72,8 +71,6 @@ public class RNSentryModuleImpl {
 
     public static final String NAME = "RNSentry";
 
-    private static JavaScriptExecutorFactory javaScriptExecutorFactory = null;
-
     private static final String NATIVE_SDK_NAME = "sentry.native.android";
     private static final String ANDROID_SDK_NAME = "sentry.java.android.react-native";
     private static final ILogger logger = new AndroidLogger(NAME);
@@ -95,10 +92,6 @@ public class RNSentryModuleImpl {
 
     private static final int SCREENSHOT_TIMEOUT_SECONDS = 2;
 
-    public static void setJavaScriptExecutorFactory(JavaScriptExecutorFactory javaScriptExecutorFactory) {
-        RNSentryModuleImpl.javaScriptExecutorFactory = javaScriptExecutorFactory;
-    }
-
     public RNSentryModuleImpl(ReactApplicationContext reactApplicationContext) {
         packageInfo = getPackageInfo(reactApplicationContext);
         this.reactApplicationContext = reactApplicationContext;
@@ -625,24 +618,25 @@ public void disableNativeFramesTracking() {
         }
     }
 
-    public void startProfiling(Promise promise) {
+    public WritableMap startProfiling() {
         final WritableMap result = new WritableNativeMap();
         try {
-            RNSentryModuleImpl.javaScriptExecutorFactory.startSamplingProfiler();
-        } catch (UnsupportedOperationException e) {
-            String error = javaScriptExecutorFactory.toString() + "does not support Sampling Profiler";
-            logger.log(SentryLevel.ERROR, error);
-            result.putString("error", error);
+            HermesSamplingProfiler.enable();
+            result.putBoolean("started", true);
+        } catch (Throwable e) {
+            result.putBoolean("started", false);
+            result.putString("error", e.toString());
         }
-        promise.resolve(result);
+        return result;
     }
 
-    public void stopProfiling(Promise promise) {
+    public WritableMap stopProfiling() {
         final WritableMap result = new WritableNativeMap();
         try {
             final File output = File.createTempFile(
         "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
-            RNSentryModuleImpl.javaScriptExecutorFactory.stopSamplingProfiler(output.getPath());
+            HermesSamplingProfiler.disable();
+            HermesSamplingProfiler.dumpSampledTraceToFile(output.getPath());
 
             StringBuilder text = new StringBuilder();
             BufferedReader br = new BufferedReader(new FileReader(output));
@@ -652,17 +646,11 @@ public void stopProfiling(Promise promise) {
                 text.append('\n');
             }
 
-            result.putString("data", text.toString());
-        } catch (IOException e) {
-            final String error = "Could not create temporary file for saving results from Sampling Profiler";
-            logger.log(SentryLevel.ERROR, error);
-            result.putString("error", error);
-        } catch (UnsupportedOperationException e) {
-            final String error = javaScriptExecutorFactory.toString() + "does not support Sampling Profiler";
-            logger.log(SentryLevel.ERROR, error);
-            result.putString("error", error);
+            result.putString("profile", text.toString());
+        } catch (Throwable e) {
+            result.putString("error", e.toString());
         }
-        promise.resolve(result);
+        return result;
     }
 
     private void setEventOriginTag(SentryEvent event) {
diff --git a/android/src/newarch/java/io/sentry/react/RNSentryModule.java b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
index b67c50e15..e980c4b15 100644
--- a/android/src/newarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/newarch/java/io/sentry/react/RNSentryModule.java
@@ -7,6 +7,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.WritableMap;
 
 public class RNSentryModule extends NativeRNSentrySpec {
 
@@ -124,12 +125,12 @@ public void fetchNativeSdkInfo(Promise promise) {
     }
 
     @Override
-    public void startProfiling(Promise promise) {
-        this.impl.startProfiling(promise);
+    public WritableMap startProfiling() {
+        return this.impl.startProfiling();
     }
 
     @Override
-    public void stopProfiling(Promise promise) {
-        this.impl.stopProfiling(promise);
+    public WritableMap stopProfiling() {
+        return this.impl.stopProfiling();
     }
 }
diff --git a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
index c1f09c5c4..0f71f4b1b 100644
--- a/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
+++ b/android/src/oldarch/java/io/sentry/react/RNSentryModule.java
@@ -7,6 +7,7 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
 
 public class RNSentryModule extends ReactContextBaseJavaModule {
 
@@ -121,4 +122,14 @@ public void fetchNativeDeviceContexts(Promise promise) {
     public void fetchNativeSdkInfo(Promise promise) {
         // Not used on android
     }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public WritableMap startProfiling() {
+        return this.impl.startProfiling();
+    }
+
+    @ReactMethod(isBlockingSynchronousMethod = true)
+    public WritableMap stopProfiling() {
+        return this.impl.stopProfiling();
+    }
 }
diff --git a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java
index 444d6418d..ca8e4259f 100644
--- a/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java
+++ b/sample-new-architecture/android/app/src/main/java/com/samplenewarchitecture/MainApplication.java
@@ -15,15 +15,10 @@
 import com.facebook.soloader.SoLoader;
 import java.util.List;
 
-import javax.annotation.Nullable;
-
 import io.sentry.react.RNSentryModuleImpl;
 import io.sentry.react.RNSentryPackage;
 
 public class MainApplication extends Application implements ReactApplication {
-
-  private final JavaScriptExecutorFactory mJavaScriptExecutorFactory = new HermesExecutorFactory();
-
   private final ReactNativeHost mReactNativeHost =
       new DefaultReactNativeHost(this) {
 
@@ -63,12 +58,6 @@ protected boolean isNewArchEnabled() {
         protected Boolean isHermesEnabled() {
           return BuildConfig.IS_HERMES_ENABLED;
         }
-
-        @Override
-        protected @Nullable JavaScriptExecutorFactory getJavaScriptExecutorFactory() {
-            RNSentryModuleImpl.setJavaScriptExecutorFactory(mJavaScriptExecutorFactory);
-            return mJavaScriptExecutorFactory;
-        }
       };
 
   @Override

From f7d55f6fbfba0de72ba478554b13ebd54879d8c9 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Fri, 26 May 2023 20:28:48 +0200
Subject: [PATCH 12/40] Remove profiling test buttons and NATIVE tmp export

---
 .../src/Screens/HomeScreen.tsx                  | 17 -----------------
 src/js/index.ts                                 |  2 --
 2 files changed, 19 deletions(-)

diff --git a/sample-new-architecture/src/Screens/HomeScreen.tsx b/sample-new-architecture/src/Screens/HomeScreen.tsx
index f345a015b..0d57b5191 100644
--- a/sample-new-architecture/src/Screens/HomeScreen.tsx
+++ b/sample-new-architecture/src/Screens/HomeScreen.tsx
@@ -128,23 +128,6 @@ const HomeScreen = (props: Props) => {
           />
         )}
         <Spacer />
-
-        <Button
-          title="Start profiling"
-          onPress={() => {
-            Sentry.NATIVE.startProfiling();
-          }}
-        />
-
-        <Button
-          title="Stop profiling"
-          onPress={() => {
-            Sentry.NATIVE.stopProfiling();
-          }}
-        />
-
-        <Spacer />
-
         <Sentry.ErrorBoundary fallback={errorBoundaryFallback}>
           <Button
             title="Activate Error Boundary"
diff --git a/src/js/index.ts b/src/js/index.ts
index c42d27df0..3c033fcab 100644
--- a/src/js/index.ts
+++ b/src/js/index.ts
@@ -50,8 +50,6 @@ import { SDK_NAME, SDK_VERSION } from './version';
 export { ReactNativeOptions } from './options';
 export { ReactNativeClient } from './client';
 
-export { NATIVE } from './wrapper';
-
 export {
   init,
   wrap,

From 8d9613d328fcff0f81d5efcb5e253e0ee3132930 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Tue, 30 May 2023 16:53:13 +0200
Subject: [PATCH 13/40] Remove rn sentry package unused changes

---
 android/src/main/java/io/sentry/react/RNSentryPackage.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryPackage.java b/android/src/main/java/io/sentry/react/RNSentryPackage.java
index c9ccdbde9..eb2fd90f2 100644
--- a/android/src/main/java/io/sentry/react/RNSentryPackage.java
+++ b/android/src/main/java/io/sentry/react/RNSentryPackage.java
@@ -5,7 +5,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.facebook.react.bridge.JavaScriptExecutorFactory;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.module.model.ReactModuleInfo;
@@ -18,7 +17,7 @@ public class RNSentryPackage extends TurboReactPackage {
   @Override
   public NativeModule getModule(String name, ReactApplicationContext reactContext) {
     if (name.equals(RNSentryModuleImpl.NAME)) {
-      return new io.sentry.react.RNSentryModule(reactContext);
+      return new RNSentryModule(reactContext);
     } else {
       return null;
     }

From 1cee74e119403781dc3dc7d152ffb5c58deb02d2 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Tue, 30 May 2023 18:22:31 +0200
Subject: [PATCH 14/40] Use profiles sample rate to add profiling integration

---
 sample-new-architecture/src/App.tsx |  4 ----
 src/js/profiling/integration.ts     |  3 ++-
 src/js/sdk.tsx                      |  4 ++++
 test/sdk.test.ts                    | 20 ++++++++++++++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/sample-new-architecture/src/App.tsx b/sample-new-architecture/src/App.tsx
index a95a5afa6..6c52b98ed 100644
--- a/sample-new-architecture/src/App.tsx
+++ b/sample-new-architecture/src/App.tsx
@@ -20,9 +20,6 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
 import GesturesTracingScreen from './Screens/GesturesTracingScreen';
 import { StyleSheet } from 'react-native';
 import { HttpClient } from '@sentry/integrations';
-import { Integrations } from '@sentry/react-native';
-
-const { HermesProfiling } = Integrations;
 
 const reactNavigationInstrumentation =
   new Sentry.ReactNavigationInstrumentation({
@@ -68,7 +65,6 @@ Sentry.init({
         // default: [/.*/]
         failedRequestTargets: [/.*/],
       }),
-      new HermesProfiling(),
     );
     return integrations.filter(i => i.name !== 'Dedupe');
   },
diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
index 959cc1351..6e3e923e6 100644
--- a/src/js/profiling/integration.ts
+++ b/src/js/profiling/integration.ts
@@ -95,7 +95,8 @@ export class HermesProfiling implements Integration {
     const options = client && client.getOptions();
 
     // @ts-ignore not part of the browser options yet
-    const profilesSampleRate = (options && options._experiments && options._experiments.profilesSampleRate) || 0;
+    const profilesSampleRate: number =
+      (options && options._experiments && typeof options._experiments.profilesSampleRate === 'number') || 0;
     if (profilesSampleRate === undefined) {
       logger.log('[Profiling] Profiling disabled, enable it by setting `profilesSampleRate` option to SDK init call.');
       return false;
diff --git a/src/js/sdk.tsx b/src/js/sdk.tsx
index ade48936b..2dd67c1d1 100644
--- a/src/js/sdk.tsx
+++ b/src/js/sdk.tsx
@@ -16,6 +16,7 @@ import {
   DebugSymbolicator,
   DeviceContext,
   EventOrigin,
+  HermesProfiling,
   ModulesLoader,
   ReactNativeErrorHandlers,
   ReactNativeInfo,
@@ -126,6 +127,9 @@ export function init(passedOptions: ReactNativeOptions): void {
     if (options.enableCaptureFailedRequests) {
       defaultIntegrations.push(new HttpClient());
     }
+    if (options._experiments && typeof options._experiments.profilesSampleRate === 'number') {
+      defaultIntegrations.push(new HermesProfiling());
+    }
   }
 
   options.integrations = getIntegrationsToSetup({
diff --git a/test/sdk.test.ts b/test/sdk.test.ts
index 089e17814..d1ee196e4 100644
--- a/test/sdk.test.ts
+++ b/test/sdk.test.ts
@@ -434,6 +434,26 @@ describe('Tests the SDK functionality', () => {
       expect(actualIntegrations).toEqual(expect.arrayContaining([expect.objectContaining({ name: 'ViewHierarchy' })]));
     });
 
+    it('no profiling integration by default', () => {
+      init({});
+
+      const actualOptions = mockedInitAndBind.mock.calls[0][secondArg] as ReactNativeClientOptions;
+      const actualIntegrations = actualOptions.integrations;
+      expect(actualIntegrations).toEqual(expect.not.arrayContaining([expect.objectContaining({ name: 'HermesProfiling' })]));
+    });
+
+    it('adds profiling integration', () => {
+      init({
+        _experiments: {
+          profilesSampleRate: 0.7,
+        },
+      });
+
+      const actualOptions = mockedInitAndBind.mock.calls[0][secondArg] as ReactNativeClientOptions;
+      const actualIntegrations = actualOptions.integrations;
+      expect(actualIntegrations).toEqual(expect.arrayContaining([expect.objectContaining({ name: 'HermesProfiling' })]));
+    });
+
     it('no default integrations', () => {
       init({
         defaultIntegrations: false,

From f44b1a626560e5eb519b5b5a4fa775ec8109ca64 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 31 May 2023 13:59:35 +0200
Subject: [PATCH 15/40] Add profiling integration tests

---
 .../io/sentry/react/RNSentryModuleImpl.java   |  10 +-
 sample-new-architecture/src/App.tsx           |   2 +-
 src/js/profiling/integration.ts               |  10 +-
 src/js/sdk.tsx                                |   2 +-
 test/mockDsn.ts                               |   1 +
 test/mockWrapper.ts                           |  71 +++++++++++
 .../profiling/convertHermesProfile.test.ts    |   6 +-
 .../profiling/hermes.test.ts                  |   2 +-
 test/profiling/integration.test.ts            | 119 ++++++++++++++++++
 test/sdk.test.ts                              |  10 +-
 test/testutils.ts                             |   4 +
 11 files changed, 219 insertions(+), 18 deletions(-)
 create mode 100644 test/mockDsn.ts
 create mode 100644 test/mockWrapper.ts
 rename test/{integrations => }/profiling/convertHermesProfile.test.ts (93%)
 rename test/{integrations => }/profiling/hermes.test.ts (92%)
 create mode 100644 test/profiling/integration.test.ts

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 24b21eef9..01e6739e5 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -633,14 +633,14 @@ public WritableMap startProfiling() {
 
     public WritableMap stopProfiling() {
         final WritableMap result = new WritableNativeMap();
-        try {
-            final File output = File.createTempFile(
-        "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
+        try (final File output = File.createTempFile(
+                "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
+            final BufferedReader br = new BufferedReader(new FileReader(output));
+        ) {
             HermesSamplingProfiler.disable();
             HermesSamplingProfiler.dumpSampledTraceToFile(output.getPath());
 
-            StringBuilder text = new StringBuilder();
-            BufferedReader br = new BufferedReader(new FileReader(output));
+            final StringBuilder text = new StringBuilder();
             String line;
             while ((line = br.readLine()) != null) {
                 text.append(line);
diff --git a/sample-new-architecture/src/App.tsx b/sample-new-architecture/src/App.tsx
index 6c52b98ed..71ae93cf6 100644
--- a/sample-new-architecture/src/App.tsx
+++ b/sample-new-architecture/src/App.tsx
@@ -86,7 +86,7 @@ Sentry.init({
   // release: 'myapp@1.2.3+1',
   // dist: `1`,
   _experiments: {
-    profilesSampleRate: 1,
+    profileSampleRate: 1,
   },
 });
 
diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
index 6e3e923e6..eb71b5e00 100644
--- a/src/js/profiling/integration.ts
+++ b/src/js/profiling/integration.ts
@@ -95,15 +95,17 @@ export class HermesProfiling implements Integration {
     const options = client && client.getOptions();
 
     // @ts-ignore not part of the browser options yet
-    const profilesSampleRate: number =
-      (options && options._experiments && typeof options._experiments.profilesSampleRate === 'number') || 0;
-    if (profilesSampleRate === undefined) {
+    const profileSampleRate =
+      options && options._experiments && typeof options._experiments.profileSampleRate === 'number'
+        ? options._experiments.profileSampleRate
+        : undefined;
+    if (profileSampleRate === undefined) {
       logger.log('[Profiling] Profiling disabled, enable it by setting `profilesSampleRate` option to SDK init call.');
       return false;
     }
 
     // Check if we should sample this profile
-    if (Math.random() > profilesSampleRate) {
+    if (Math.random() > profileSampleRate) {
       logger.log('[Profiling] Skip profiling transaction due to sampling.');
       return false;
     }
diff --git a/src/js/sdk.tsx b/src/js/sdk.tsx
index 2dd67c1d1..03a0d3728 100644
--- a/src/js/sdk.tsx
+++ b/src/js/sdk.tsx
@@ -127,7 +127,7 @@ export function init(passedOptions: ReactNativeOptions): void {
     if (options.enableCaptureFailedRequests) {
       defaultIntegrations.push(new HttpClient());
     }
-    if (options._experiments && typeof options._experiments.profilesSampleRate === 'number') {
+    if (options._experiments && typeof options._experiments.profileSampleRate === 'number') {
       defaultIntegrations.push(new HermesProfiling());
     }
   }
diff --git a/test/mockDsn.ts b/test/mockDsn.ts
new file mode 100644
index 000000000..a20e7d3e4
--- /dev/null
+++ b/test/mockDsn.ts
@@ -0,0 +1 @@
+export const MOCK_DSN = 'https://6890c2f6677340daa4804f8194804ea2@o19635.ingest.sentry.io/148053';
diff --git a/test/mockWrapper.ts b/test/mockWrapper.ts
new file mode 100644
index 000000000..0d2c6da08
--- /dev/null
+++ b/test/mockWrapper.ts
@@ -0,0 +1,71 @@
+import type { NATIVE as ORIGINAL_NATIVE } from '../src/js/wrapper';
+import type { MockInterface } from './testutils';
+
+type NativeType = typeof ORIGINAL_NATIVE;
+
+const NATIVE: MockInterface<NativeType> = {
+  enableNative: true,
+  nativeIsReady: true,
+  platform: 'ios',
+
+  _NativeClientError: new Error('MockNative client is not available'),
+  _DisabledNativeError: new Error('MockNative is disabled'),
+
+  _processItem: jest.fn(),
+  _processLevels: jest.fn(),
+  _processLevel: jest.fn(),
+  _serializeObject: jest.fn(),
+  _isModuleLoaded: <NativeType['_isModuleLoaded'] & jest.Mock>jest.fn(),
+  _getBreadcrumbs: jest.fn(),
+
+  isNativeAvailable: jest.fn(),
+
+  initNativeSdk: jest.fn(),
+  closeNativeSdk: jest.fn(),
+
+  sendEnvelope: jest.fn(),
+  captureScreenshot: jest.fn(),
+
+  fetchNativeRelease: jest.fn(),
+  fetchNativeDeviceContexts: jest.fn(),
+  fetchNativeAppStart: jest.fn(),
+  fetchNativeFrames: jest.fn(),
+  fetchNativeSdkInfo: jest.fn(),
+
+  disableNativeFramesTracking: jest.fn(),
+  enableNativeFramesTracking: jest.fn(),
+
+  addBreadcrumb: jest.fn(),
+  setContext: jest.fn(),
+  clearBreadcrumbs: jest.fn(),
+  setExtra: jest.fn(),
+  setUser: jest.fn(),
+  setTag: jest.fn(),
+
+  nativeCrash: jest.fn(),
+
+  fetchModules: jest.fn(),
+  fetchViewHierarchy: jest.fn(),
+
+  startProfiling: jest.fn(),
+  stopProfiling: jest.fn(),
+};
+
+NATIVE.isNativeAvailable.mockReturnValue(true);
+NATIVE.initNativeSdk.mockResolvedValue(true);
+NATIVE.captureScreenshot.mockResolvedValue(null);
+NATIVE.fetchNativeRelease.mockResolvedValue({
+  version: 'mock-native-version',
+  build: 'mock-native-build',
+  id: 'mock-native-id',
+});
+NATIVE.fetchNativeDeviceContexts.mockResolvedValue({});
+NATIVE.fetchNativeAppStart.mockResolvedValue(null);
+NATIVE.fetchNativeFrames.mockResolvedValue(null);
+NATIVE.fetchNativeSdkInfo.mockResolvedValue(null);
+NATIVE.fetchModules.mockResolvedValue(null);
+NATIVE.fetchViewHierarchy.mockResolvedValue(null);
+NATIVE.startProfiling.mockReturnValue(false);
+NATIVE.stopProfiling.mockReturnValue(null);
+
+export { NATIVE };
diff --git a/test/integrations/profiling/convertHermesProfile.test.ts b/test/profiling/convertHermesProfile.test.ts
similarity index 93%
rename from test/integrations/profiling/convertHermesProfile.test.ts
rename to test/profiling/convertHermesProfile.test.ts
index ca744367a..33c37f88a 100644
--- a/test/integrations/profiling/convertHermesProfile.test.ts
+++ b/test/profiling/convertHermesProfile.test.ts
@@ -1,6 +1,6 @@
-import { convertToSentryProfile } from '../../../src/js/profiling/convertHermesProfile';
-import type * as Hermes from '../../../src/js/profiling/hermes';
-import type { ThreadCpuProfile } from '../../../src/js/profiling/types';
+import { convertToSentryProfile } from '../../src/js/profiling/convertHermesProfile';
+import type * as Hermes from '../../src/js/profiling/hermes';
+import type { ThreadCpuProfile } from '../../src/js/profiling/types';
 
 describe('convert hermes profile to sentry profile', () => {
   it('simple test profile', async () => {
diff --git a/test/integrations/profiling/hermes.test.ts b/test/profiling/hermes.test.ts
similarity index 92%
rename from test/integrations/profiling/hermes.test.ts
rename to test/profiling/hermes.test.ts
index 258ee9164..fb5c0bc59 100644
--- a/test/integrations/profiling/hermes.test.ts
+++ b/test/profiling/hermes.test.ts
@@ -1,4 +1,4 @@
-import { parseHermesStackFrameName } from '../../../src/js/profiling/hermes';
+import { parseHermesStackFrameName } from '../../src/js/profiling/hermes';
 
 describe('hermes', () => {
   describe('parseHermesStackFrameName', () => {
diff --git a/test/profiling/integration.test.ts b/test/profiling/integration.test.ts
new file mode 100644
index 000000000..5e74d0cfb
--- /dev/null
+++ b/test/profiling/integration.test.ts
@@ -0,0 +1,119 @@
+import * as mockWrapper from '../mockWrapper';
+jest.mock('../../../src/js/wrapper', () => mockWrapper);
+jest.mock('../../../src/js/utils/environment');
+
+import type { Envelope, Event, Transaction, Transport } from '@sentry/types';
+
+import * as Sentry from '../../src/js';
+import type * as Hermes from '../../src/js/profiling/hermes';
+import type { Profile, ThreadCpuProfile } from '../../src/js/profiling/types';
+import { isHermesEnabled } from '../../src/js/utils/environment';
+import { MOCK_DSN } from '../mockDsn';
+import { envelopeItemPayload, envelopeItems } from '../testutils';
+
+describe('profiling integration', () => {
+  let mock: {
+    transportSendMock: jest.Mock<ReturnType<Transport['send']>, Parameters<Transport['send']>>;
+  };
+
+  beforeEach(() => {
+    (isHermesEnabled as jest.Mock).mockReturnValue(true);
+    mockWrapper.NATIVE.startProfiling.mockReturnValue(true);
+    mockWrapper.NATIVE.stopProfiling.mockReturnValue(createMockMinimalValidHermesProfile());
+    jest.useFakeTimers();
+    mock = initTestClient();
+    jest.runAllTimers();
+    jest.clearAllMocks();
+  });
+
+  afterEach(() => {
+    jest.runAllTimers();
+    jest.useRealTimers();
+  });
+
+  test('should create a new profile and add in to the transaction envelope', () => {
+    const transaction: Transaction = Sentry.startTransaction({
+      name: 'test-name',
+      op: 'test-op',
+    });
+    transaction.finish();
+
+    jest.runAllTimers();
+
+    const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0];
+    const transactionEnvelopeItemPayload = envelope?.[envelopeItems][0][envelopeItemPayload] as Event;
+    const profileEnvelopeItem = envelope?.[envelopeItems][1] as [{ type: 'profile' }, Profile];
+    expect(profileEnvelopeItem).toEqual([
+      { type: 'profile' },
+      expect.objectContaining<Partial<Profile>>({
+        event_id: profileEnvelopeItem?.[envelopeItemPayload]?.profile?.profile_id,
+        transaction: expect.objectContaining({
+          name: 'test-name',
+          id: transactionEnvelopeItemPayload.event_id,
+          trace_id: transaction.traceId,
+        }),
+        profile: expect.objectContaining<Partial<ThreadCpuProfile>>({
+          profile_id: expect.any(String),
+        }),
+      }),
+    ]);
+  });
+
+  test('should finish previous profile when a new transaction starts', () => {});
+});
+
+function initTestClient(): {
+  transportSendMock: jest.Mock<ReturnType<Transport['send']>, Parameters<Transport['send']>>;
+} {
+  const transportSendMock = jest.fn<ReturnType<Transport['send']>, Parameters<Transport['send']>>();
+  Sentry.init({
+    dsn: MOCK_DSN,
+    _experiments: {
+      profileSampleRate: 1,
+    },
+    transport: () => ({
+      send: transportSendMock.mockResolvedValue(undefined),
+      flush: jest.fn().mockResolvedValue(true),
+    }),
+  });
+
+  return {
+    transportSendMock,
+  };
+}
+
+/**
+ * Creates a mock Hermes profile that is valid enough to be added to an envelope.
+ * Min 2 samples are required by Sentry to be valid.
+ */
+function createMockMinimalValidHermesProfile(): Hermes.Profile {
+  return {
+    samples: [
+      {
+        cpu: '-1',
+        name: '',
+        ts: '10',
+        pid: 54822,
+        tid: '14509472',
+        weight: '1',
+        sf: 1,
+      },
+      {
+        cpu: '-1',
+        name: '',
+        ts: '20',
+        pid: 54822,
+        tid: '14509472',
+        weight: '1',
+        sf: 1,
+      },
+    ],
+    stackFrames: {
+      1: {
+        name: '[root]',
+        category: 'root',
+      },
+    },
+    traceEvents: [],
+  };
+}
diff --git a/test/sdk.test.ts b/test/sdk.test.ts
index d1ee196e4..92f011275 100644
--- a/test/sdk.test.ts
+++ b/test/sdk.test.ts
@@ -439,19 +439,23 @@ describe('Tests the SDK functionality', () => {
 
       const actualOptions = mockedInitAndBind.mock.calls[0][secondArg] as ReactNativeClientOptions;
       const actualIntegrations = actualOptions.integrations;
-      expect(actualIntegrations).toEqual(expect.not.arrayContaining([expect.objectContaining({ name: 'HermesProfiling' })]));
+      expect(actualIntegrations).toEqual(
+        expect.not.arrayContaining([expect.objectContaining({ name: 'HermesProfiling' })]),
+      );
     });
 
     it('adds profiling integration', () => {
       init({
         _experiments: {
-          profilesSampleRate: 0.7,
+          profileSampleRate: 0.7,
         },
       });
 
       const actualOptions = mockedInitAndBind.mock.calls[0][secondArg] as ReactNativeClientOptions;
       const actualIntegrations = actualOptions.integrations;
-      expect(actualIntegrations).toEqual(expect.arrayContaining([expect.objectContaining({ name: 'HermesProfiling' })]));
+      expect(actualIntegrations).toEqual(
+        expect.arrayContaining([expect.objectContaining({ name: 'HermesProfiling' })]),
+      );
     });
 
     it('no default integrations', () => {
diff --git a/test/testutils.ts b/test/testutils.ts
index 49e7dd0b1..5e2ec0f68 100644
--- a/test/testutils.ts
+++ b/test/testutils.ts
@@ -4,6 +4,10 @@ import { rejectedSyncPromise } from '@sentry/utils';
 
 import { getBlankTransactionContext } from '../src/js/tracing/utils';
 
+export type MockInterface<T> = {
+  [K in keyof T]: T[K] extends (...args: infer A) => infer B ? jest.Mock<B, A> : T[K];
+} & T;
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function mockFunction<T extends (...args: any[]) => any>(fn: T): jest.MockedFunction<T> {
   return fn as jest.MockedFunction<T>;

From 19679d70ab57372a9e06e48217901d7188111bd5 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 31 May 2023 15:16:21 +0200
Subject: [PATCH 16/40] Fix mocks paths

---
 test/profiling/integration.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/profiling/integration.test.ts b/test/profiling/integration.test.ts
index 5e74d0cfb..b3b787e5c 100644
--- a/test/profiling/integration.test.ts
+++ b/test/profiling/integration.test.ts
@@ -1,6 +1,6 @@
 import * as mockWrapper from '../mockWrapper';
-jest.mock('../../../src/js/wrapper', () => mockWrapper);
-jest.mock('../../../src/js/utils/environment');
+jest.mock('../../src/js/wrapper', () => mockWrapper);
+jest.mock('../../src/js/utils/environment');
 
 import type { Envelope, Event, Transaction, Transport } from '@sentry/types';
 

From 2e27a20830b4a6235d26124593b66509ee07fcda Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Thu, 1 Jun 2023 14:00:19 +0200
Subject: [PATCH 17/40] Add yalc add javascript

---
 package.json | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 78a0e1a43..0c87a1a3c 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,8 @@
     "lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
     "test:watch": "jest --watch",
     "run-ios": "cd sample && yarn react-native run-ios",
-    "run-android": "cd sample && yarn react-native run-android"
+    "run-android": "cd sample && yarn react-native run-android",
+    "yalc:add:sentry-javascript": "yalc add @sentry/browser @sentry/core @sentry/hub @sentry/integrations @sentry/react @sentry/types @sentry/utils"
   },
   "keywords": [
     "react-native",
@@ -55,14 +56,14 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.52.1",
+    "@sentry/browser": "file:.yalc/@sentry/browser",
     "@sentry/cli": "2.17.5",
-    "@sentry/core": "7.52.1",
-    "@sentry/hub": "7.52.1",
-    "@sentry/integrations": "7.52.1",
-    "@sentry/react": "7.52.1",
-    "@sentry/types": "7.52.1",
-    "@sentry/utils": "7.52.1"
+    "@sentry/core": "file:.yalc/@sentry/core",
+    "@sentry/hub": "file:.yalc/@sentry/hub",
+    "@sentry/integrations": "file:.yalc/@sentry/integrations",
+    "@sentry/react": "file:.yalc/@sentry/react",
+    "@sentry/types": "file:.yalc/@sentry/types",
+    "@sentry/utils": "file:.yalc/@sentry/utils"
   },
   "devDependencies": {
     "@sentry-internal/eslint-config-sdk": "7.52.1",

From c8458cb05161096358a495ae72ec5719cba5a60e Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Thu, 1 Jun 2023 14:21:30 +0200
Subject: [PATCH 18/40] Add integrations test and use profiling types and cache
 from js sdk

---
 RNSentry.podspec                         |   2 +-
 src/js/profiling/cache.ts                |  76 +-------------
 src/js/profiling/convertHermesProfile.ts |  25 +++--
 src/js/profiling/hermes.ts               |   4 +-
 src/js/profiling/integration.ts          |  16 ++-
 src/js/profiling/types.ts                |  67 +------------
 src/js/profiling/utils.ts                |  10 +-
 test/profiling/integration.test.ts       | 122 +++++++++++++++++++++--
 8 files changed, 152 insertions(+), 170 deletions(-)

diff --git a/RNSentry.podspec b/RNSentry.podspec
index 761bc85d9..ebc35e251 100644
--- a/RNSentry.podspec
+++ b/RNSentry.podspec
@@ -31,8 +31,8 @@ Pod::Spec.new do |s|
   s.source_files = 'ios/**/*.{h,mm}'
   s.public_header_files = 'ios/RNSentry.h'
 
-  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
   s.compiler_flags = other_cflags
+  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
   if is_new_arch_enabled then
     s.pod_target_xcconfig    = {
         "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
diff --git a/src/js/profiling/cache.ts b/src/js/profiling/cache.ts
index 16a0d409b..90cd818ba 100644
--- a/src/js/profiling/cache.ts
+++ b/src/js/profiling/cache.ts
@@ -1,75 +1,5 @@
-import type { ThreadCpuProfile } from './types';
+import { makeProfilingCache } from '@sentry/utils';
 
-/**
- * Creates a cache that evicts keys in fifo order
- * @param size {Number}
- */
-// sentry-javascript/packages/browser/src/profiling/cache.ts
-// https://github.com/getsentry/sentry-javascript/blob/bf8c0551e2a969083199f014d07ac2a617e323fc/packages/browser/src/profiling/cache.ts#L7
-// TODO: Remove after exporting from @sentry/utils
-export function makeProfilingCache<Key extends string, Value>(
-  size: number,
-): {
-  get: (key: Key) => Value | undefined;
-  add: (key: Key, value: Value) => void;
-  delete: (key: Key) => boolean;
-  clear: () => void;
-  size: () => number;
-} {
-  // Maintain a fifo queue of keys, we cannot rely on Object.keys as the browser may not support it.
-  let evictionOrder: Key[] = [];
-  let cache: Record<string, Value> = {};
+import type { RawThreadCpuProfile } from './types';
 
-  return {
-    add(key: Key, value: Value) {
-      while (evictionOrder.length >= size) {
-        // shift is O(n) but this is small size and only happens if we are
-        // exceeding the cache size so it should be fine.
-        const evictCandidate = evictionOrder.shift();
-
-        if (evictCandidate !== undefined) {
-          // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-          delete cache[evictCandidate];
-        }
-      }
-
-      // in case we have a collision, delete the old key.
-      if (cache[key]) {
-        this.delete(key);
-      }
-
-      evictionOrder.push(key);
-      cache[key] = value;
-    },
-    clear() {
-      cache = {};
-      evictionOrder = [];
-    },
-    get(key: Key): Value | undefined {
-      return cache[key];
-    },
-    size() {
-      return evictionOrder.length;
-    },
-    // Delete cache key and return true if it existed, false otherwise.
-    delete(key: Key): boolean {
-      if (!cache[key]) {
-        return false;
-      }
-
-      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
-      delete cache[key];
-
-      for (let i = 0; i < evictionOrder.length; i++) {
-        if (evictionOrder[i] === key) {
-          evictionOrder.splice(i, 1);
-          break;
-        }
-      }
-
-      return true;
-    },
-  };
-}
-
-export const PROFILE_QUEUE = makeProfilingCache<string, ThreadCpuProfile>(20);
+export const PROFILE_QUEUE = makeProfilingCache<string, RawThreadCpuProfile>(20);
diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index 8f54ba669..334e8eae1 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -1,6 +1,9 @@
+import type { StackId, ThreadCpuFrame,ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types';
+import { logger } from '@sentry/utils';
+
 import type * as Hermes from './hermes';
 import { parseHermesStackFrameName } from './hermes';
-import type { Frame, Sample, Stack, StackId, ThreadCpuProfile, ThreadId } from './types';
+import type { RawThreadCpuProfile } from './types';
 
 const UNKNOWN_FRAME_FUNCTION_NAME = '<unknown>';
 const UNKNOWN_STACK_ID = -1;
@@ -8,19 +11,19 @@ const JS_THREAD_NAME = 'JavaScriptThread';
 const JS_THREAD_PRIORITY = 1;
 
 /**
- *
+ * Converts a Hermes profile to a Sentry profile.
  */
-export function convertToSentryProfile(hermesProfile: Hermes.Profile): ThreadCpuProfile {
+export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThreadCpuProfile | null {
   const jsThreads = new Set<ThreadId>();
   const hermesStacks = new Set<Hermes.StackFrameId>();
 
   if (hermesProfile.samples.length === 0) {
-    throw new Error('Empty profile');
-    // TODO: handle empty profile
+    logger.warn('[Profiling] No samples found in profile.');
+    return null;
   }
 
   const start = Number(hermesProfile.samples[0].ts);
-  const samples = hermesProfile.samples.map((hermesSample: Hermes.Sample): Sample => {
+  const samples = hermesProfile.samples.map((hermesSample: Hermes.Sample): ThreadCpuSample => {
     jsThreads.add(hermesSample.tid);
     hermesStacks.add(hermesSample.sf);
 
@@ -34,7 +37,7 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): ThreadCpu
   });
 
   const hermesFrameChildToParentMap = new Map<Hermes.StackFrameId, Hermes.StackFrameId>();
-  const framesMap = new Map<string, Frame>();
+  const framesMap = new Map<string, ThreadCpuFrame>();
   for (const key in hermesProfile.stackFrames) {
     if (!Object.prototype.hasOwnProperty.call(hermesProfile.stackFrames, key)) {
       continue;
@@ -55,11 +58,11 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): ThreadCpu
   }
 
   const hermesStackToSentryStackMap = new Map<Hermes.StackFrameId, StackId>();
-  const stacks: Stack[] = [];
+  const stacks: ThreadCpuStack[] = [];
   for (const hermesStackFunctionFrameId of hermesStacks) {
     const stackId = stacks.length;
     hermesStackToSentryStackMap.set(hermesStackFunctionFrameId, stackId);
-    const stack: Stack = [];
+    const stack: ThreadCpuStack = [];
     let currentHermesFrameId: Hermes.StackFrameId | undefined = hermesStackFunctionFrameId;
     while (currentHermesFrameId !== undefined) {
       stack.push(currentHermesFrameId - 1); // Sentry frames are indexed from 0
@@ -83,8 +86,8 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): ThreadCpu
   return {
     samples,
     frames: Array.from(framesMap.entries())
-      .sort(([aKey]: [string, Frame], [bKey]: [string, Frame]) => Number(aKey) - Number(bKey))
-      .map(([_, frame]: [string, Frame]) => frame),
+      .sort(([aKey]: [string, ThreadCpuFrame], [bKey]: [string, ThreadCpuFrame]) => Number(aKey) - Number(bKey))
+      .map(([_, frame]: [string, ThreadCpuFrame]) => frame),
     stacks,
     thread_metadata,
   };
diff --git a/src/js/profiling/hermes.ts b/src/js/profiling/hermes.ts
index 33ba8a105..e97425019 100644
--- a/src/js/profiling/hermes.ts
+++ b/src/js/profiling/hermes.ts
@@ -1,6 +1,6 @@
 import { NATIVE } from '../wrapper';
 import { convertToSentryProfile } from './convertHermesProfile';
-import type { ThreadCpuProfile } from './types';
+import type { RawThreadCpuProfile } from './types';
 
 export type StackFrameId = number;
 export type MicrosecondsSinceBoot = string;
@@ -82,7 +82,7 @@ export function startProfiling(): number | null {
 /**
  * Stops Hermes Sampling Profiler and returns the profile.
  */
-export function stopProfiling(): ThreadCpuProfile | null {
+export function stopProfiling(): RawThreadCpuProfile | null {
   const hermesProfile = NATIVE.stopProfiling();
   if (!hermesProfile) {
     return null;
diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
index eb71b5e00..5e989112b 100644
--- a/src/js/profiling/integration.ts
+++ b/src/js/profiling/integration.ts
@@ -1,12 +1,13 @@
-import type { Envelope, Event, EventProcessor, Hub, Integration, Transaction } from '@sentry/types';
+import type { Envelope, Event, EventProcessor, Hub, Integration, Profile, Transaction  } from '@sentry/types';
 import { logger, uuid4 } from '@sentry/utils';
 
 import { isHermesEnabled } from '../utils/environment';
 import { PROFILE_QUEUE } from './cache';
 import { startProfiling, stopProfiling } from './hermes';
-import type { Profile } from './types';
 import { addProfilesToEnvelope, createProfilingEvent, findProfiledTransactionsFromEnvelope } from './utils';
 
+export const MAX_PROFILE_DURATION_MS = 30 * 1e6;
+
 /**
  * Profiling integration creates a profile for each transaction and adds it to the event envelope.
  *
@@ -32,6 +33,8 @@ export class HermesProfiling implements Integration {
       }
     | undefined;
 
+  private _currentProfileTimeout: number | undefined;
+
   /**
    * @inheritDoc
    */
@@ -49,6 +52,7 @@ export class HermesProfiling implements Integration {
     }
 
     client.on('startTransaction', (transaction: Transaction) => {
+      typeof this._currentProfileTimeout === 'number' && clearTimeout(this._currentProfileTimeout);
       this._finishCurrentProfile();
 
       const shouldStartProfiling = this._shouldStartProfiling(transaction);
@@ -57,9 +61,14 @@ export class HermesProfiling implements Integration {
       }
 
       this._startNewProfile(transaction);
+      setTimeout(
+        this._finishCurrentProfile,
+        MAX_PROFILE_DURATION_MS,
+      );
     });
 
     client.on('finishTransaction', () => {
+      typeof this._currentProfileTimeout === 'number' && clearTimeout(this._currentProfileTimeout);
       this._finishCurrentProfile();
     });
 
@@ -117,7 +126,6 @@ export class HermesProfiling implements Integration {
    * Starts a new profile and links it to the transaction.
    */
   private _startNewProfile = (transaction: Transaction): void => {
-    // TODO: _startProfileTimeout
     const profileStartTimestampNs = startProfiling();
     if (!profileStartTimestampNs) {
       return;
@@ -141,8 +149,6 @@ export class HermesProfiling implements Integration {
       return;
     }
 
-    // TODO: _stopProfileTimeout
-
     const profile = stopProfiling();
     if (!profile) {
       logger.warn('[Profiling] Stop failed. Cleaning up...');
diff --git a/src/js/profiling/types.ts b/src/js/profiling/types.ts
index 228ff527c..0f4c3bda4 100644
--- a/src/js/profiling/types.ts
+++ b/src/js/profiling/types.ts
@@ -1,68 +1,5 @@
-export type ThreadId = string;
-export type FrameId = number;
-export type StackId = number;
+import type { ThreadCpuProfile } from '@sentry/types';
 
-export interface Sample {
-  stack_id: number;
-  thread_id: ThreadId;
-  elapsed_since_start_ns: string;
-}
-
-export type Stack = FrameId[];
-
-export type Frame = {
-  function: string;
-  file?: string;
-  line?: number;
-  column?: number;
-};
-
-export interface ThreadCpuProfile {
+export interface RawThreadCpuProfile extends ThreadCpuProfile {
   profile_id?: string;
-  samples: Sample[];
-  stacks: Stack[];
-  frames: Frame[];
-  thread_metadata: Record<ThreadId, { name?: string; priority?: number }>;
-}
-
-export interface Profile {
-  event_id: string;
-  version: string;
-  os: {
-    name: string;
-    version: string;
-    build_number?: string;
-  };
-  runtime: {
-    name: string;
-    version: string;
-  };
-  device: {
-    architecture: string;
-    is_emulator: boolean;
-    locale: string;
-    manufacturer: string;
-    model: string;
-  };
-  timestamp: string;
-  release: string;
-  environment: string;
-  platform: string;
-  profile: ThreadCpuProfile;
-  debug_meta?: {
-    images: {
-      debug_id: string;
-      image_addr: string;
-      code_file: string;
-      type: string;
-      image_size: number;
-      image_vmaddr: string;
-    }[];
-  };
-  transaction: {
-    name: string;
-    id: string;
-    trace_id: string;
-    active_thread_id: string;
-  };
 }
diff --git a/src/js/profiling/utils.ts b/src/js/profiling/utils.ts
index 163d5b03e..13ac4af76 100644
--- a/src/js/profiling/utils.ts
+++ b/src/js/profiling/utils.ts
@@ -1,14 +1,14 @@
-import type { Envelope, Event } from '@sentry/types';
+import type { Envelope, Event, Profile } from '@sentry/types';
 import { forEachEnvelopeItem, logger } from '@sentry/utils';
 
-import type { Profile, ThreadCpuProfile } from './types';
+import type { RawThreadCpuProfile } from './types';
 
 const ACTIVE_THREAD_ID_STRING = '0';
 
 /**
  *
  */
-export function isValidProfile(profile: ThreadCpuProfile): profile is ThreadCpuProfile & { profile_id: string } {
+export function isValidProfile(profile: RawThreadCpuProfile): profile is RawThreadCpuProfile & { profile_id: string } {
   if (profile.samples.length <= 1) {
     if (__DEV__) {
       // Log a warning if the profile has less than 2 samples so users can know why
@@ -59,7 +59,7 @@ export function findProfiledTransactionsFromEnvelope(envelope: Envelope): Event[
  * @param event
  * @returns {Profile | null}
  */
-export function createProfilingEvent(profile: ThreadCpuProfile, event: Event): Profile | null {
+export function createProfilingEvent(profile: RawThreadCpuProfile, event: Event): Profile | null {
   if (!isValidProfile(profile)) {
     return null;
   }
@@ -91,7 +91,7 @@ export function createProfilingEvent(profile: ThreadCpuProfile, event: Event): P
  * @returns
  */
 function createProfilePayload(
-  cpuProfile: ThreadCpuProfile,
+  cpuProfile: RawThreadCpuProfile,
   {
     release,
     environment,
diff --git a/test/profiling/integration.test.ts b/test/profiling/integration.test.ts
index b3b787e5c..0fbecbdf6 100644
--- a/test/profiling/integration.test.ts
+++ b/test/profiling/integration.test.ts
@@ -2,15 +2,17 @@ import * as mockWrapper from '../mockWrapper';
 jest.mock('../../src/js/wrapper', () => mockWrapper);
 jest.mock('../../src/js/utils/environment');
 
-import type { Envelope, Event, Transaction, Transport } from '@sentry/types';
+import type { Envelope, Event, Profile, Transaction, Transport } from '@sentry/types';
 
 import * as Sentry from '../../src/js';
 import type * as Hermes from '../../src/js/profiling/hermes';
-import type { Profile, ThreadCpuProfile } from '../../src/js/profiling/types';
 import { isHermesEnabled } from '../../src/js/utils/environment';
+import { RN_GLOBAL_OBJ } from '../../src/js/utils/worldwide';
 import { MOCK_DSN } from '../mockDsn';
 import { envelopeItemPayload, envelopeItems } from '../testutils';
 
+const SEC_TO_MS = 1e6;
+
 describe('profiling integration', () => {
   let mock: {
     transportSendMock: jest.Mock<ReturnType<Transport['send']>, Parameters<Transport['send']>>;
@@ -26,15 +28,16 @@ describe('profiling integration', () => {
     jest.clearAllMocks();
   });
 
-  afterEach(() => {
+  afterEach(async() => {
     jest.runAllTimers();
     jest.useRealTimers();
+    RN_GLOBAL_OBJ.__SENTRY__.globalEventProcessors = []; // resets integrations
+    await Sentry.close();
   });
 
   test('should create a new profile and add in to the transaction envelope', () => {
     const transaction: Transaction = Sentry.startTransaction({
       name: 'test-name',
-      op: 'test-op',
     });
     transaction.finish();
 
@@ -46,20 +49,115 @@ describe('profiling integration', () => {
     expect(profileEnvelopeItem).toEqual([
       { type: 'profile' },
       expect.objectContaining<Partial<Profile>>({
-        event_id: profileEnvelopeItem?.[envelopeItemPayload]?.profile?.profile_id,
+        event_id: expect.any(String),
         transaction: expect.objectContaining({
           name: 'test-name',
           id: transactionEnvelopeItemPayload.event_id,
           trace_id: transaction.traceId,
         }),
-        profile: expect.objectContaining<Partial<ThreadCpuProfile>>({
-          profile_id: expect.any(String),
+      }),
+    ]);
+  });
+
+  test('should finish previous profile when a new transaction starts', () => {
+    const transaction1: Transaction = Sentry.startTransaction({
+      name: 'test-name-1',
+    });
+    const transaction2: Transaction = Sentry.startTransaction({
+      name: 'test-name-2',
+    });
+    transaction1.finish();
+    transaction2.finish();
+
+    jest.runAllTimers();
+
+    const envelopeTransaction1: Envelope | undefined = mock.transportSendMock.mock.calls[0][0];
+    const transaction1EnvelopeItemPayload = envelopeTransaction1?.[envelopeItems][0][envelopeItemPayload] as Event;
+    const profile1EnvelopeItem = envelopeTransaction1?.[envelopeItems][1] as [{ type: 'profile' }, Profile] | undefined;
+
+    const envelopeTransaction2: Envelope | undefined = mock.transportSendMock.mock.calls[1][0];
+    const transaction2EnvelopeItemPayload = envelopeTransaction2?.[envelopeItems][0][envelopeItemPayload] as Event;
+    const profile2EnvelopeItem = envelopeTransaction2?.[envelopeItems][1] as [{ type: 'profile' }, Profile] | undefined;
+
+    expect(profile1EnvelopeItem).toEqual([
+      { type: 'profile' },
+      expect.objectContaining<Partial<Profile>>({
+        event_id: expect.any(String),
+        transaction: expect.objectContaining({
+          name: 'test-name-1',
+          id: transaction1EnvelopeItemPayload.event_id,
+          trace_id: transaction1.traceId,
         }),
       }),
     ]);
+    expect(profile2EnvelopeItem).toEqual([
+      { type: 'profile' },
+      expect.objectContaining<Partial<Profile>>({
+        event_id: expect.any(String),
+        transaction: expect.objectContaining({
+          name: 'test-name-2',
+          id: transaction2EnvelopeItemPayload.event_id,
+          trace_id: transaction2.traceId,
+        }),
+      }),
+    ]);
+  });
+
+  test('profile should start at the same time as transaction', () => {
+    const transaction: Transaction = Sentry.startTransaction({
+      name: 'test-name',
+    });
+    transaction.finish();
+
+    jest.runAllTimers();
+
+    const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0];
+    const transactionEnvelopeItemPayload = envelope?.[envelopeItems][0][envelopeItemPayload] as Event;
+    const profileEnvelopeItemPayload = envelope?.[envelopeItems][1][envelopeItemPayload] as unknown as Profile;
+    const transactionStart = Math.floor(transactionEnvelopeItemPayload.start_timestamp! * SEC_TO_MS);
+    const profileStart = (new Date(profileEnvelopeItemPayload.timestamp)).getTime();
+    expect(profileStart - transactionStart).toBeLessThan(10);
+  });
+
+  test('profile is only recorded until max duration is reached', () => {
+    const transaction: Transaction = Sentry.startTransaction({
+      name: 'test-name',
+    });
+    jest.clearAllMocks();
+
+    jest.advanceTimersByTime(40 * 1e6);
+
+    expect(mockWrapper.NATIVE.stopProfiling.mock.calls.length).toEqual(1);
+
+    transaction.finish();
   });
 
-  test('should finish previous profile when a new transaction starts', () => {});
+  test('profile that reached max duration is sent', () => {
+    const transaction: Transaction = Sentry.startTransaction({
+      name: 'test-name',
+    });
+
+    jest.advanceTimersByTime(40 * 1e6);
+
+    transaction.finish();
+
+    jest.runAllTimers();
+
+    const envelope: Envelope | undefined = mock.transportSendMock.mock.lastCall?.[0];
+    const transactionEnvelopeItemPayload = envelope?.[envelopeItems][0][envelopeItemPayload] as Event;
+    const profileEnvelopeItem = envelope?.[envelopeItems][1] as [{ type: 'profile' }, Profile];
+    expect(profileEnvelopeItem).toEqual([
+      { type: 'profile' },
+      expect.objectContaining<Partial<Profile>>({
+        event_id: expect.any(String),
+        transaction: expect.objectContaining({
+          name: 'test-name',
+          id: transactionEnvelopeItemPayload.event_id,
+          trace_id: transaction.traceId,
+        }),
+      }),
+    ]);
+  });
 });
 
 function initTestClient(): {
@@ -77,6 +175,14 @@ function initTestClient(): {
     }),
   });
 
+  // In production integrations are setup only once, but in the tests we want them to setup on every init
+  const integrations = Sentry.getCurrentHub().getClient()?.getOptions().integrations
+  if (integrations) {
+    for (const integration of integrations) {
+      integration.setupOnce(Sentry.addGlobalEventProcessor, Sentry.getCurrentHub);
+    }
+  }
+
   return {
     transportSendMock,
   };

From 87bf20d3c89d2fb1da6f233cb08bf21792f81189 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Thu, 1 Jun 2023 15:23:24 +0200
Subject: [PATCH 19/40] Close buffered reader

---
 .../main/java/io/sentry/react/RNSentryModuleImpl.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 01e6739e5..03ea7b196 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -633,11 +633,13 @@ public WritableMap startProfiling() {
 
     public WritableMap stopProfiling() {
         final WritableMap result = new WritableNativeMap();
-        try (final File output = File.createTempFile(
+        try {
+            HermesSamplingProfiler.disable();
+
+            final File output = File.createTempFile(
                 "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
             final BufferedReader br = new BufferedReader(new FileReader(output));
-        ) {
-            HermesSamplingProfiler.disable();
+
             HermesSamplingProfiler.dumpSampledTraceToFile(output.getPath());
 
             final StringBuilder text = new StringBuilder();
@@ -646,6 +648,7 @@ public WritableMap stopProfiling() {
                 text.append(line);
                 text.append('\n');
             }
+            br.close();
 
             result.putString("profile", text.toString());
         } catch (Throwable e) {

From 11ab73752331eb40918174de20c0793c7e262cfb Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Thu, 1 Jun 2023 15:24:18 +0200
Subject: [PATCH 20/40] Remove compiler flag and use dynamic flag based on
 hermes.h

---
 RNSentry.podspec | 4 +---
 ios/RNSentry.mm  | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/RNSentry.podspec b/RNSentry.podspec
index 4c96f7fb6..8ff19039d 100644
--- a/RNSentry.podspec
+++ b/RNSentry.podspec
@@ -6,9 +6,7 @@ folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
 
 is_new_arch_enabled = ENV["RCT_NEW_ARCH_ENABLED"] == "1"
 new_arch_enabled_flag = (is_new_arch_enabled ? folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED" : "")
-is_sentry_profiling_enabled = ENV["SENTRY_PROFILING_ENABLED"] == "1"
-sentry_profiling_enabled_flag = (is_sentry_profiling_enabled ? " -DSENTRY_PROFILING_ENABLED" : "")
-other_cflags = "$(inherited)" + new_arch_enabled_flag + sentry_profiling_enabled_flag
+other_cflags = "$(inherited)" + new_arch_enabled_flag
 
 Pod::Spec.new do |s|
   s.name           = 'RNSentry'
diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index f180eb5c9..4f6daa377 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -11,6 +11,12 @@
 #import <Sentry/SentryScreenFrames.h>
 #import <Sentry/SentryOptions+HybridSDKs.h>
 
+#if __has_include(<hermes/hermes.h>)
+#define SENTRY_PROFILING_ENABLED 1
+#else
+#define SENTRY_PROFILING_ENABLED 0
+#endif
+
 // This guard prevents importing Hermes in JSC apps
 #if SENTRY_PROFILING_ENABLED
 #import <hermes/hermes.h>

From 918eef015b8b1061d9465a81ecac555f8eb9fc0e Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 19 Jun 2023 18:01:27 +0200
Subject: [PATCH 21/40] Add clear current profile timeout

---
 src/js/profiling/integration.ts    | 10 +++++++---
 test/profiling/integration.test.ts | 31 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
index 5e989112b..6ec9e4aa7 100644
--- a/src/js/profiling/integration.ts
+++ b/src/js/profiling/integration.ts
@@ -52,7 +52,6 @@ export class HermesProfiling implements Integration {
     }
 
     client.on('startTransaction', (transaction: Transaction) => {
-      typeof this._currentProfileTimeout === 'number' && clearTimeout(this._currentProfileTimeout);
       this._finishCurrentProfile();
 
       const shouldStartProfiling = this._shouldStartProfiling(transaction);
@@ -61,14 +60,13 @@ export class HermesProfiling implements Integration {
       }
 
       this._startNewProfile(transaction);
-      setTimeout(
+      this._currentProfileTimeout = setTimeout(
         this._finishCurrentProfile,
         MAX_PROFILE_DURATION_MS,
       );
     });
 
     client.on('finishTransaction', () => {
-      typeof this._currentProfileTimeout === 'number' && clearTimeout(this._currentProfileTimeout);
       this._finishCurrentProfile();
     });
 
@@ -145,6 +143,7 @@ export class HermesProfiling implements Integration {
    * Stops profiling and adds the profile to the queue to be processed on beforeEnvelope.
    */
   private _finishCurrentProfile = (): void => {
+    this._clearCurrentProfileTimeout();
     if (this._currentProfile === undefined) {
       return;
     }
@@ -187,4 +186,9 @@ export class HermesProfiling implements Integration {
     logger.log(`[Profiling] Created profile ${profile_id} for transaction ${profiledTransaction.event_id}`);
     return profile;
   };
+
+  private _clearCurrentProfileTimeout = (): void => {
+    this._currentProfileTimeout !== undefined && clearTimeout(this._currentProfileTimeout);
+    this._currentProfileTimeout = undefined;
+  }
 }
diff --git a/test/profiling/integration.test.ts b/test/profiling/integration.test.ts
index 0fbecbdf6..53c478bc3 100644
--- a/test/profiling/integration.test.ts
+++ b/test/profiling/integration.test.ts
@@ -5,6 +5,7 @@ jest.mock('../../src/js/utils/environment');
 import type { Envelope, Event, Profile, Transaction, Transport } from '@sentry/types';
 
 import * as Sentry from '../../src/js';
+import { HermesProfiling } from '../../src/js/integrations';
 import type * as Hermes from '../../src/js/profiling/hermes';
 import { isHermesEnabled } from '../../src/js/utils/environment';
 import { RN_GLOBAL_OBJ } from '../../src/js/utils/worldwide';
@@ -158,8 +159,38 @@ describe('profiling integration', () => {
       }),
     ]);
   });
+
+  test('profile timeout is reset when transaction is finished', () => {
+    const integration = getCurrentHermesProfilingIntegration();
+    const transaction: Transaction = Sentry.startTransaction({
+      name: 'test-name',
+    });
+    const timeoutAfterProfileStarted = integration._currentProfileTimeout;
+
+    jest.advanceTimersByTime(40 * 1e6);
+
+    transaction.finish();
+    const timeoutAfterProfileFinished = integration._currentProfileTimeout;
+
+    jest.runAllTimers();
+
+    expect(timeoutAfterProfileStarted).toBeDefined();
+    expect(timeoutAfterProfileFinished).toBeUndefined();
+  });
 });
 
+
+type TestHermesIntegration = Omit<HermesProfiling, '_currentProfileTimeout'> & {
+  _currentProfileTimeout: number | undefined;
+};
+function getCurrentHermesProfilingIntegration(): TestHermesIntegration {
+  const integration = Sentry.getCurrentHub().getClient()?.getIntegration(HermesProfiling);
+  if (!integration) {
+    throw new Error('HermesProfiling integration is not installed');
+  }
+  return integration as unknown as TestHermesIntegration;
+}
+
 function initTestClient(): {
   transportSendMock: jest.Mock<ReturnType<Transport['send']>, Parameters<Transport['send']>>;
 } {

From 49de5d27cdc1529278c4766ade14e03650a5ae01 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 19 Jun 2023 18:01:56 +0200
Subject: [PATCH 22/40] Use try with resource for profile file read buffer

---
 .../io/sentry/react/RNSentryModuleImpl.java   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 03ea7b196..12c9a9654 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -638,19 +638,19 @@ public WritableMap stopProfiling() {
 
             final File output = File.createTempFile(
                 "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
-            final BufferedReader br = new BufferedReader(new FileReader(output));
 
-            HermesSamplingProfiler.dumpSampledTraceToFile(output.getPath());
+            try (final BufferedReader br = new BufferedReader(new FileReader(output));) {
+                HermesSamplingProfiler.dumpSampledTraceToFile(output.getPath());
 
-            final StringBuilder text = new StringBuilder();
-            String line;
-            while ((line = br.readLine()) != null) {
-                text.append(line);
-                text.append('\n');
-            }
-            br.close();
+                final StringBuilder text = new StringBuilder();
+                String line;
+                while ((line = br.readLine()) != null) {
+                    text.append(line);
+                    text.append('\n');
+                }
 
-            result.putString("profile", text.toString());
+                result.putString("profile", text.toString());
+            }
         } catch (Throwable e) {
             result.putString("error", e.toString());
         }

From a47c012870953bc2e950edcc929f7e8995b19f56 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 19 Jun 2023 18:04:14 +0200
Subject: [PATCH 23/40] Use plural profilesSampleRate

---
 sample-new-architecture/src/App.tsx |  2 +-
 src/js/profiling/integration.ts     | 10 +++++-----
 src/js/sdk.tsx                      |  2 +-
 test/profiling/integration.test.ts  |  2 +-
 test/sdk.test.ts                    |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sample-new-architecture/src/App.tsx b/sample-new-architecture/src/App.tsx
index 71ae93cf6..6c52b98ed 100644
--- a/sample-new-architecture/src/App.tsx
+++ b/sample-new-architecture/src/App.tsx
@@ -86,7 +86,7 @@ Sentry.init({
   // release: 'myapp@1.2.3+1',
   // dist: `1`,
   _experiments: {
-    profileSampleRate: 1,
+    profilesSampleRate: 1,
   },
 });
 
diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
index 6ec9e4aa7..a25755525 100644
--- a/src/js/profiling/integration.ts
+++ b/src/js/profiling/integration.ts
@@ -102,17 +102,17 @@ export class HermesProfiling implements Integration {
     const options = client && client.getOptions();
 
     // @ts-ignore not part of the browser options yet
-    const profileSampleRate =
-      options && options._experiments && typeof options._experiments.profileSampleRate === 'number'
-        ? options._experiments.profileSampleRate
+    const profilesSampleRate =
+      options && options._experiments && typeof options._experiments.profilesSampleRate === 'number'
+        ? options._experiments.profilesSampleRate
         : undefined;
-    if (profileSampleRate === undefined) {
+    if (profilesSampleRate === undefined) {
       logger.log('[Profiling] Profiling disabled, enable it by setting `profilesSampleRate` option to SDK init call.');
       return false;
     }
 
     // Check if we should sample this profile
-    if (Math.random() > profileSampleRate) {
+    if (Math.random() > profilesSampleRate) {
       logger.log('[Profiling] Skip profiling transaction due to sampling.');
       return false;
     }
diff --git a/src/js/sdk.tsx b/src/js/sdk.tsx
index 03a0d3728..2dd67c1d1 100644
--- a/src/js/sdk.tsx
+++ b/src/js/sdk.tsx
@@ -127,7 +127,7 @@ export function init(passedOptions: ReactNativeOptions): void {
     if (options.enableCaptureFailedRequests) {
       defaultIntegrations.push(new HttpClient());
     }
-    if (options._experiments && typeof options._experiments.profileSampleRate === 'number') {
+    if (options._experiments && typeof options._experiments.profilesSampleRate === 'number') {
       defaultIntegrations.push(new HermesProfiling());
     }
   }
diff --git a/test/profiling/integration.test.ts b/test/profiling/integration.test.ts
index 53c478bc3..478c75acf 100644
--- a/test/profiling/integration.test.ts
+++ b/test/profiling/integration.test.ts
@@ -198,7 +198,7 @@ function initTestClient(): {
   Sentry.init({
     dsn: MOCK_DSN,
     _experiments: {
-      profileSampleRate: 1,
+      profilesSampleRate: 1,
     },
     transport: () => ({
       send: transportSendMock.mockResolvedValue(undefined),
diff --git a/test/sdk.test.ts b/test/sdk.test.ts
index 92f011275..16c232038 100644
--- a/test/sdk.test.ts
+++ b/test/sdk.test.ts
@@ -447,7 +447,7 @@ describe('Tests the SDK functionality', () => {
     it('adds profiling integration', () => {
       init({
         _experiments: {
-          profileSampleRate: 0.7,
+          profilesSampleRate: 0.7,
         },
       });
 

From df586fe04790653d9cc472cf1fa9d16a3f017974 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 19 Jun 2023 20:29:37 +0200
Subject: [PATCH 24/40] Refactor convert hermes profiles to smaller functions
 and add js docs with mapping explanation

---
 src/js/profiling/convertHermesProfile.ts | 118 ++++++++++++++++-------
 1 file changed, 85 insertions(+), 33 deletions(-)

diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index 334e8eae1..68811e49d 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -12,18 +12,63 @@ const JS_THREAD_PRIORITY = 1;
 
 /**
  * Converts a Hermes profile to a Sentry profile.
+ *
+ * Maps Hermes samples to Sentry samples.
+ * Maps Hermes stack frames to Sentry frames.
+ * Hermes stack frame is an object representing a function call in the stack
+ * with a link to its parent stack frame. Root of the represented stack tree
+ * is main function call in Hermes that is [root] stack frame.
+ *
+ * @returns Sentry profile or null if no samples are found.
  */
 export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThreadCpuProfile | null {
-  const jsThreads = new Set<ThreadId>();
-  const hermesStacks = new Set<Hermes.StackFrameId>();
-
   if (hermesProfile.samples.length === 0) {
     logger.warn('[Profiling] No samples found in profile.');
     return null;
   }
 
-  const start = Number(hermesProfile.samples[0].ts);
-  const samples = hermesProfile.samples.map((hermesSample: Hermes.Sample): ThreadCpuSample => {
+  const { samples, hermesStacks, jsThreads } = mapSamples(hermesProfile.samples);
+
+  const frames = mapFrames(hermesProfile.stackFrames);
+
+  const { stacks, hermesStackToSentryStackMap } = mapStacks(hermesStacks, hermesProfile.stackFrames);
+
+  for (const sample of samples) {
+    sample.stack_id = hermesStackToSentryStackMap.get(sample.stack_id) ?? UNKNOWN_STACK_ID;
+  }
+
+  const thread_metadata: Record<ThreadId, { name?: string; priority?: number }> = {};
+  for (const jsThreadId of jsThreads) {
+    thread_metadata[jsThreadId] = {
+      name: JS_THREAD_NAME,
+      priority: JS_THREAD_PRIORITY,
+    };
+  }
+
+  return {
+    samples,
+    frames,
+    stacks,
+    thread_metadata,
+  };
+}
+
+/**
+ * Maps Hermes samples to Sentry samples.
+ * Calculates the elapsed time since the first sample based on the absolute timestamps of the Hermes samples.
+ * Hermes stack frame IDs represent the last (leaf, furthest from the main func) frame of the call stack.
+ * @returns the mapped Sentry samples, the set of Hermes stack frame IDs, and the set of JS thread IDs
+ */
+function mapSamples(hermesSamples: Hermes.Sample[]): {
+  samples: ThreadCpuSample[];
+  hermesStacks: Set<Hermes.StackFrameId>;
+  jsThreads: Set<ThreadId>;
+} {
+  const jsThreads = new Set<ThreadId>();
+  const hermesStacks = new Set<Hermes.StackFrameId>();
+
+  const start = Number(hermesSamples[0].ts);
+  const samples = hermesSamples.map((hermesSample: Hermes.Sample): ThreadCpuSample => {
     jsThreads.add(hermesSample.tid);
     hermesStacks.add(hermesSample.sf);
 
@@ -36,20 +81,28 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThread
     };
   });
 
-  const hermesFrameChildToParentMap = new Map<Hermes.StackFrameId, Hermes.StackFrameId>();
-  const framesMap = new Map<string, ThreadCpuFrame>();
-  for (const key in hermesProfile.stackFrames) {
-    if (!Object.prototype.hasOwnProperty.call(hermesProfile.stackFrames, key)) {
-      continue;
-    }
-    const hermesFrame = hermesProfile.stackFrames[key];
+  return {
+    samples,
+    hermesStacks,
+    jsThreads,
+  };
+};
 
-    if (hermesFrame.parent !== undefined) {
-      hermesFrameChildToParentMap.set(Number(key), hermesFrame.parent);
+/**
+ * Maps Hermes StackFrames tree represented as an JS object to a Sentry frames array.
+ * Converts line and columns strings to numbers.
+ * @returns the mapped Sentry frames
+ */
+function mapFrames(hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFrame>): ThreadCpuFrame[] {
+  const frames: ThreadCpuFrame[] = [];
+  for (const key in hermesStackFrames) {
+    if (!Object.prototype.hasOwnProperty.call(hermesStackFrames, key)) {
+      continue;
     }
+    const hermesFrame = hermesStackFrames[key];
 
     const stackFrameName = parseHermesStackFrameName(hermesFrame.name);
-    framesMap.set(key, {
+    frames.push({
       function: stackFrameName.function || UNKNOWN_FRAME_FUNCTION_NAME,
       file: stackFrameName.fileName,
       line: hermesFrame.line !== undefined ? Number(hermesFrame.line) : undefined,
@@ -57,6 +110,21 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThread
     });
   }
 
+  return frames;
+}
+
+/**
+ * Maps Hermes stack frame IDs to Sentry stack arrays.
+ * Hermes stack frame IDs represent the last (leaf, furthest from the main func) frame of the call stack.
+ * @returns the mapped Sentry stacks and a map from Hermes stack IDs to Sentry stack IDs (indices in the stacks array)
+ */
+function mapStacks(
+  hermesStacks: Set<Hermes.StackFrameId>,
+  hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFrame>,
+): {
+  stacks: ThreadCpuStack[];
+  hermesStackToSentryStackMap: Map<Hermes.StackFrameId, StackId>;
+} {
   const hermesStackToSentryStackMap = new Map<Hermes.StackFrameId, StackId>();
   const stacks: ThreadCpuStack[] = [];
   for (const hermesStackFunctionFrameId of hermesStacks) {
@@ -66,29 +134,13 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThread
     let currentHermesFrameId: Hermes.StackFrameId | undefined = hermesStackFunctionFrameId;
     while (currentHermesFrameId !== undefined) {
       stack.push(currentHermesFrameId - 1); // Sentry frames are indexed from 0
-      currentHermesFrameId = hermesFrameChildToParentMap.get(currentHermesFrameId);
+      currentHermesFrameId = hermesStackFrames[currentHermesFrameId] && hermesStackFrames[currentHermesFrameId].parent;
     }
     stacks.push(stack);
   }
 
-  for (const sample of samples) {
-    sample.stack_id = hermesStackToSentryStackMap.get(sample.stack_id) ?? UNKNOWN_STACK_ID;
-  }
-
-  const thread_metadata: Record<ThreadId, { name?: string; priority?: number }> = {};
-  for (const jsThreadId of jsThreads) {
-    thread_metadata[jsThreadId] = {
-      name: JS_THREAD_NAME,
-      priority: JS_THREAD_PRIORITY,
-    };
-  }
-
   return {
-    samples,
-    frames: Array.from(framesMap.entries())
-      .sort(([aKey]: [string, ThreadCpuFrame], [bKey]: [string, ThreadCpuFrame]) => Number(aKey) - Number(bKey))
-      .map(([_, frame]: [string, ThreadCpuFrame]) => frame),
     stacks,
-    thread_metadata,
+    hermesStackToSentryStackMap,
   };
 }

From 9a19971d963532c0c2fcbab39c2729f641ff590e Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 19 Jun 2023 20:55:42 +0200
Subject: [PATCH 25/40] hermesStackFrameIdToSentryFrameIdMap to ensure correct
 sentry frame id looping over keys is not guaranteed to be ordered

---
 src/js/profiling/convertHermesProfile.ts | 28 ++++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index 68811e49d..ca39e82e6 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -1,4 +1,4 @@
-import type { StackId, ThreadCpuFrame,ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types';
+import type { FrameId, StackId, ThreadCpuFrame,ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types';
 import { logger } from '@sentry/utils';
 
 import type * as Hermes from './hermes';
@@ -29,9 +29,13 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThread
 
   const { samples, hermesStacks, jsThreads } = mapSamples(hermesProfile.samples);
 
-  const frames = mapFrames(hermesProfile.stackFrames);
+  const { frames, hermesStackFrameIdToSentryFrameIdMap } = mapFrames(hermesProfile.stackFrames);
 
-  const { stacks, hermesStackToSentryStackMap } = mapStacks(hermesStacks, hermesProfile.stackFrames);
+  const { stacks, hermesStackToSentryStackMap } = mapStacks(
+    hermesStacks,
+    hermesProfile.stackFrames,
+    hermesStackFrameIdToSentryFrameIdMap,
+);
 
   for (const sample of samples) {
     sample.stack_id = hermesStackToSentryStackMap.get(sample.stack_id) ?? UNKNOWN_STACK_ID;
@@ -93,12 +97,17 @@ function mapSamples(hermesSamples: Hermes.Sample[]): {
  * Converts line and columns strings to numbers.
  * @returns the mapped Sentry frames
  */
-function mapFrames(hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFrame>): ThreadCpuFrame[] {
+function mapFrames(hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFrame>): {
+  frames: ThreadCpuFrame[];
+  hermesStackFrameIdToSentryFrameIdMap: Map<Hermes.StackFrameId, FrameId>;
+} {
   const frames: ThreadCpuFrame[] = [];
-  for (const key in hermesStackFrames) {
+  const hermesStackFrameIdToSentryFrameIdMap = new Map<Hermes.StackFrameId, FrameId>();
+  for (const key in hermesStackFrames) { // asc order based on the key is not guaranteed
     if (!Object.prototype.hasOwnProperty.call(hermesStackFrames, key)) {
       continue;
     }
+    hermesStackFrameIdToSentryFrameIdMap.set(Number(key), frames.length);
     const hermesFrame = hermesStackFrames[key];
 
     const stackFrameName = parseHermesStackFrameName(hermesFrame.name);
@@ -110,7 +119,10 @@ function mapFrames(hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFr
     });
   }
 
-  return frames;
+  return {
+    frames,
+    hermesStackFrameIdToSentryFrameIdMap,
+  };
 }
 
 /**
@@ -121,6 +133,7 @@ function mapFrames(hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFr
 function mapStacks(
   hermesStacks: Set<Hermes.StackFrameId>,
   hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFrame>,
+  hermesStackFrameIdToSentryFrameIdMap: Map<Hermes.StackFrameId, FrameId>,
 ): {
   stacks: ThreadCpuStack[];
   hermesStackToSentryStackMap: Map<Hermes.StackFrameId, StackId>;
@@ -133,7 +146,8 @@ function mapStacks(
     const stack: ThreadCpuStack = [];
     let currentHermesFrameId: Hermes.StackFrameId | undefined = hermesStackFunctionFrameId;
     while (currentHermesFrameId !== undefined) {
-      stack.push(currentHermesFrameId - 1); // Sentry frames are indexed from 0
+      const sentryFrameId = hermesStackFrameIdToSentryFrameIdMap.get(currentHermesFrameId);
+      sentryFrameId !== undefined && stack.push(sentryFrameId);
       currentHermesFrameId = hermesStackFrames[currentHermesFrameId] && hermesStackFrames[currentHermesFrameId].parent;
     }
     stacks.push(stack);

From 7e45cc9177857f4b5fd0b49a2858b85c4fcda03b Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Tue, 20 Jun 2023 15:51:12 +0200
Subject: [PATCH 26/40] Update iOS Sentry Profiling disabled error message

---
 ios/RNSentry.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index 4f6daa377..964898a6a 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -509,7 +509,7 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
     // the 'tracesSampleRate' or 'tracesSampler' option.
 }
 
-static NSString* const enabledProfilingMessage = @"Use SENTRY_PROFILING_ENABLED=1 env when installing RNSentry pod";
+static NSString* const enabledProfilingMessage = @"Enable Hermes to use Sentry Profiling.";
 
 RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, startProfiling)
 {

From 65155adaeae43dfd3c8bb732dfa528d7a89beb21 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Tue, 20 Jun 2023 17:54:46 +0200
Subject: [PATCH 27/40] Correctly name anonymous function during Hermes Sentry
 Profile conversion

---
 src/js/profiling/convertHermesProfile.ts    | 4 ++--
 test/profiling/convertHermesProfile.test.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index ca39e82e6..f4ccc216a 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -5,7 +5,7 @@ import type * as Hermes from './hermes';
 import { parseHermesStackFrameName } from './hermes';
 import type { RawThreadCpuProfile } from './types';
 
-const UNKNOWN_FRAME_FUNCTION_NAME = '<unknown>';
+const ANONYMOUS_FUNCTION_NAME = 'anonymous';
 const UNKNOWN_STACK_ID = -1;
 const JS_THREAD_NAME = 'JavaScriptThread';
 const JS_THREAD_PRIORITY = 1;
@@ -112,7 +112,7 @@ function mapFrames(hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFr
 
     const stackFrameName = parseHermesStackFrameName(hermesFrame.name);
     frames.push({
-      function: stackFrameName.function || UNKNOWN_FRAME_FUNCTION_NAME,
+      function: stackFrameName.function || ANONYMOUS_FUNCTION_NAME,
       file: stackFrameName.fileName,
       line: hermesFrame.line !== undefined ? Number(hermesFrame.line) : undefined,
       column: hermesFrame.column !== undefined ? Number(hermesFrame.column) : undefined,
diff --git a/test/profiling/convertHermesProfile.test.ts b/test/profiling/convertHermesProfile.test.ts
index 33c37f88a..4a8450b5c 100644
--- a/test/profiling/convertHermesProfile.test.ts
+++ b/test/profiling/convertHermesProfile.test.ts
@@ -72,7 +72,7 @@ describe('convert hermes profile to sentry profile', () => {
           column: '18',
           funcLine: '1623',
           funcColumn: '16',
-          name: 'fooC(/absolute/path/main.jsbundle:1627:18)',
+          name: '(/absolute/path/main.jsbundle:1627:18)',
           category: 'JavaScript',
           parent: 2,
         },
@@ -101,7 +101,7 @@ describe('convert hermes profile to sentry profile', () => {
         {
           column: 18,
           file: 'main.jsbundle',
-          function: 'fooC',
+          function: 'anonymous',
           line: 1627,
         },
       ],

From b44830c2936eb786303b22af5834574a035a05b0 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 21 Jun 2023 13:54:12 +0200
Subject: [PATCH 28/40] Add debug raw profile file log

---
 .../main/java/io/sentry/react/RNSentryModuleImpl.java |  6 ++++++
 ios/RNSentry.mm                                       | 11 +++++++++++
 2 files changed, 17 insertions(+)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 12c9a9654..0841a2b65 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -82,6 +82,7 @@ public class RNSentryModuleImpl {
     private final PackageInfo packageInfo;
     private FrameMetricsAggregator frameMetricsAggregator = null;
     private boolean androidXAvailable;
+    private boolean debugEnabled = false;
 
     private static boolean didFetchAppStart;
 
@@ -121,6 +122,7 @@ public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
 
             if (rnOptions.hasKey("debug") && rnOptions.getBoolean("debug")) {
                 options.setDebug(true);
+                this.debugEnabled = true;
             }
             if (rnOptions.hasKey("dsn") && rnOptions.getString("dsn") != null) {
                 String dsn = rnOptions.getString("dsn");
@@ -639,6 +641,10 @@ public WritableMap stopProfiling() {
             final File output = File.createTempFile(
                 "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
 
+            if (this.debugEnabled) {
+                logger.log(SentryLevel.INFO, "Profile saved to: " + output.getAbsolutePath());
+            }
+
             try (final BufferedReader br = new BufferedReader(new FileReader(output));) {
                 HermesSamplingProfiler.dumpSampledTraceToFile(output.getPath());
 
diff --git a/ios/RNSentry.mm b/ios/RNSentry.mm
index 964898a6a..29db596f9 100644
--- a/ios/RNSentry.mm
+++ b/ios/RNSentry.mm
@@ -538,6 +538,17 @@ - (void)setEventEnvironmentTag:(SentryEvent *)event
         std::string s = ss.str();
         NSString *data = [NSString stringWithCString:s.c_str() encoding:[NSString defaultCStringEncoding]];
 
+#if SENTRY_PROFILING_DEBUG_ENABLED
+        NSString *rawProfileFileName = @"hermes.profile";
+        NSError *error = nil;
+        NSString *rawProfileFilePath = [NSTemporaryDirectory() stringByAppendingPathComponent:rawProfileFileName];
+        if (![data writeToFile:rawProfileFilePath atomically:YES encoding:NSUTF8StringEncoding error:&error]) {
+            NSLog(@"Error writing Raw Hermes Profile to %@: %@", rawProfileFilePath, error);
+        } else {
+            NSLog(@"Raw Hermes Profile saved to %@", rawProfileFilePath);
+        }
+#endif
+
         return @{ @"profile": data };
     } catch (const std::exception& ex) {
         return @{ @"error": [NSString stringWithCString: ex.what() encoding:[NSString defaultCStringEncoding]] };

From 0c470651353f63a8bd52257fd2348df6563342fa Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 21 Jun 2023 14:12:58 +0200
Subject: [PATCH 29/40] Add profiling changelog

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index baa0e3c42..59ed93f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 ## Unreleased
 
+### Features
+
+- Alpha support for Hermes JavaScript Profiling ([#3057](https://github.com/getsentry/sentry-react-native/pull/3057))
+
+  Profiling is disabled by default. To enable it, configure both
+  `tracesSampleRate` and `profilesSampleRate` when initializing the SDK:
+
+  ```javascript
+  Sentry.init({
+    dsn: '__DSN__',
+    tracesSampleRate: 1.0,
+    _experiments: {
+      // The sampling rate for profiling is relative to TracesSampleRate.
+      // In this case, we'll capture profiles for 100% of transactions.
+      profilesSampleRate: 1.0,
+    },
+  });
+  ```
+
+  More documentation on profiling and current limitations [can be found here](https://docs.sentry.io/platforms/react-native/profiling/).
+
 ### Dependencies
 
 - Bump JavaScript SDK from v7.54.0 to v7.56.0 ([#3119](https://github.com/getsentry/sentry-react-native/pull/3119))

From a4b7cee31f47dc1734ffb0f76afdbed580d21b75 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 21 Jun 2023 14:29:06 +0200
Subject: [PATCH 30/40] Update changelog

---
 CHANGELOG.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59ed93f9e..eab7fa913 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,15 +10,15 @@
   `tracesSampleRate` and `profilesSampleRate` when initializing the SDK:
 
   ```javascript
-  Sentry.init({
-    dsn: '__DSN__',
-    tracesSampleRate: 1.0,
-    _experiments: {
-      // The sampling rate for profiling is relative to TracesSampleRate.
-      // In this case, we'll capture profiles for 100% of transactions.
-      profilesSampleRate: 1.0,
-    },
-  });
+    Sentry.init({
+      dsn: '__DSN__',
+      tracesSampleRate: 1.0,
+      _experiments: {
+        // The sampling rate for profiling is relative to TracesSampleRate.
+        // In this case, we'll capture profiles for 100% of transactions.
+        profilesSampleRate: 1.0,
+      },
+    });
   ```
 
   More documentation on profiling and current limitations [can be found here](https://docs.sentry.io/platforms/react-native/profiling/).

From bfe91bbf99ddaeb333e3a50121057fd3388ca7c4 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Thu, 22 Jun 2023 13:21:25 +0200
Subject: [PATCH 31/40] Add log when hermes stack id not found in the map when
 mapping to sentry stack id

---
 src/js/profiling/convertHermesProfile.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index f4ccc216a..9b05e8e0b 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -38,7 +38,13 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThread
 );
 
   for (const sample of samples) {
-    sample.stack_id = hermesStackToSentryStackMap.get(sample.stack_id) ?? UNKNOWN_STACK_ID;
+    const sentryStackId = hermesStackToSentryStackMap.get(sample.stack_id)
+    if (sentryStackId === undefined) {
+      logger.error(`[Profiling] Hermes Stack ID ${sample.stack_id} not found when mapping to Sentry Stack ID.`);
+      sample.stack_id = UNKNOWN_STACK_ID;
+    } else {
+      sample.stack_id = sentryStackId;
+    }
   }
 
   const thread_metadata: Record<ThreadId, { name?: string; priority?: number }> = {};

From f56dac0c0c1ca605947719caaef84804d6557304 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 28 Jun 2023 13:21:31 +0200
Subject: [PATCH 32/40] Remove bundle file name regex to speed up the profile
 conversion

---
 src/js/integrations/rewriteframes.ts        |  4 +--
 src/js/profiling/convertHermesProfile.ts    | 40 ++++++++++++++++-----
 src/js/profiling/hermes.ts                  | 20 +++--------
 src/js/profiling/integration.ts             |  4 +--
 test/profiling/convertHermesProfile.test.ts | 12 +++----
 test/profiling/hermes.test.ts               | 26 +++++---------
 6 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/src/js/integrations/rewriteframes.ts b/src/js/integrations/rewriteframes.ts
index 7fbf250e9..2c9ad2a9d 100644
--- a/src/js/integrations/rewriteframes.ts
+++ b/src/js/integrations/rewriteframes.ts
@@ -4,8 +4,8 @@ import { Platform } from 'react-native';
 
 import { isExpo } from '../utils/environment';
 
-const ANDROID_DEFAULT_BUNDLE_NAME = 'app:///index.android.bundle';
-const IOS_DEFAULT_BUNDLE_NAME = 'app:///main.jsbundle';
+export const ANDROID_DEFAULT_BUNDLE_NAME = 'app:///index.android.bundle';
+export const IOS_DEFAULT_BUNDLE_NAME = 'app:///main.jsbundle';
 
 /**
  * Creates React Native default rewrite frames integration
diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index 9b05e8e0b..e4aafa9db 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -1,14 +1,25 @@
 import type { FrameId, StackId, ThreadCpuFrame,ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types';
 import { logger } from '@sentry/utils';
+import { Platform } from 'react-native';
 
+import { ANDROID_DEFAULT_BUNDLE_NAME, IOS_DEFAULT_BUNDLE_NAME } from '../integrations/rewriteframes';
 import type * as Hermes from './hermes';
-import { parseHermesStackFrameName } from './hermes';
+import { parseHermesStackFrameFunctionName } from './hermes';
+import { MAX_PROFILE_DURATION_MS } from './integration';
 import type { RawThreadCpuProfile } from './types';
 
+const MS_TO_NS = 1e3;
+const MAX_PROFILE_DURATION_NS = MAX_PROFILE_DURATION_MS * MS_TO_NS;
 const ANONYMOUS_FUNCTION_NAME = 'anonymous';
 const UNKNOWN_STACK_ID = -1;
 const JS_THREAD_NAME = 'JavaScriptThread';
 const JS_THREAD_PRIORITY = 1;
+const DEFAULT_BUNDLE_NAME =
+    Platform.OS === 'android'
+  ? ANDROID_DEFAULT_BUNDLE_NAME
+  : Platform.OS === 'ios'
+  ? IOS_DEFAULT_BUNDLE_NAME
+  : undefined;
 
 /**
  * Converts a Hermes profile to a Sentry profile.
@@ -69,7 +80,10 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThread
  * Hermes stack frame IDs represent the last (leaf, furthest from the main func) frame of the call stack.
  * @returns the mapped Sentry samples, the set of Hermes stack frame IDs, and the set of JS thread IDs
  */
-function mapSamples(hermesSamples: Hermes.Sample[]): {
+function mapSamples(
+  hermesSamples: Hermes.Sample[],
+  maxElapsedSinceStartNs: number = MAX_PROFILE_DURATION_NS,
+): {
   samples: ThreadCpuSample[];
   hermesStacks: Set<Hermes.StackFrameId>;
   jsThreads: Set<ThreadId>;
@@ -78,18 +92,26 @@ function mapSamples(hermesSamples: Hermes.Sample[]): {
   const hermesStacks = new Set<Hermes.StackFrameId>();
 
   const start = Number(hermesSamples[0].ts);
-  const samples = hermesSamples.map((hermesSample: Hermes.Sample): ThreadCpuSample => {
+  const samples: ThreadCpuSample[] = [];
+  for (const hermesSample of hermesSamples) {
     jsThreads.add(hermesSample.tid);
     hermesStacks.add(hermesSample.sf);
 
     const elapsed_since_start_ns = (Number(hermesSample.ts) - start) * 1e3;
+    if (elapsed_since_start_ns >= maxElapsedSinceStartNs) {
+      logger.warn(
+        `[Profiling] Sample has elapsed time since start ${elapsed_since_start_ns}ns ` +
+          `greater than the max elapsed time ${maxElapsedSinceStartNs}ns.`,
+      );
+      break;
+    }
 
-    return {
+    samples.push({
       stack_id: hermesSample.sf,
       thread_id: hermesSample.tid,
       elapsed_since_start_ns: elapsed_since_start_ns.toFixed(0),
-    };
-  });
+    });
+  }
 
   return {
     samples,
@@ -116,10 +138,10 @@ function mapFrames(hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFr
     hermesStackFrameIdToSentryFrameIdMap.set(Number(key), frames.length);
     const hermesFrame = hermesStackFrames[key];
 
-    const stackFrameName = parseHermesStackFrameName(hermesFrame.name);
+    const functionName = parseHermesStackFrameFunctionName(hermesFrame.name);
     frames.push({
-      function: stackFrameName.function || ANONYMOUS_FUNCTION_NAME,
-      file: stackFrameName.fileName,
+      function: functionName || ANONYMOUS_FUNCTION_NAME,
+      file: hermesFrame.category == 'JavaScript' ? DEFAULT_BUNDLE_NAME : undefined,
       line: hermesFrame.line !== undefined ? Number(hermesFrame.line) : undefined,
       column: hermesFrame.column !== undefined ? Number(hermesFrame.column) : undefined,
     });
diff --git a/src/js/profiling/hermes.ts b/src/js/profiling/hermes.ts
index e97425019..cee35924b 100644
--- a/src/js/profiling/hermes.ts
+++ b/src/js/profiling/hermes.ts
@@ -43,25 +43,15 @@ export interface Profile {
   stackFrames: Record<string, StackFrame>;
 }
 
-export interface HermesStackFrameNameParsed {
-  function?: string;
-  fileName?: string;
-}
-
-const FILE_NAME_REGEX = /([a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+)(?::(\d+:\d+))?\)/;
 /**
  * Hermes Profile Stack Frame Name contains function name and file path.
  *
- * `foo(/path/to/file.js:1:2)` -> `{ function: 'foo', fileName: 'file.js' }`
+ * `foo(/path/to/file.js:1:2)` -> `foo`
  */
-export function parseHermesStackFrameName(name: string): HermesStackFrameNameParsed {
-  const result: HermesStackFrameNameParsed = {};
-  const match = FILE_NAME_REGEX.exec(name);
-  if (match) {
-    result.fileName = match[1];
-  }
-  result.function = name.split('(')[0];
-  return result;
+export function parseHermesStackFrameFunctionName(hermesName: string): string {
+  const indexOfLeftParenthesis = hermesName.indexOf('(');
+  const name = indexOfLeftParenthesis !== -1 ? hermesName.substring(0, indexOfLeftParenthesis) : hermesName;
+  return name;
 }
 
 const MS_TO_NS: number = 1e6;
diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
index a25755525..0173aabe0 100644
--- a/src/js/profiling/integration.ts
+++ b/src/js/profiling/integration.ts
@@ -6,7 +6,7 @@ import { PROFILE_QUEUE } from './cache';
 import { startProfiling, stopProfiling } from './hermes';
 import { addProfilesToEnvelope, createProfilingEvent, findProfiledTransactionsFromEnvelope } from './utils';
 
-export const MAX_PROFILE_DURATION_MS = 30 * 1e6;
+export const MAX_PROFILE_DURATION_MS = 30 * 1e3;
 
 /**
  * Profiling integration creates a profile for each transaction and adds it to the event envelope.
@@ -59,11 +59,11 @@ export class HermesProfiling implements Integration {
         return;
       }
 
-      this._startNewProfile(transaction);
       this._currentProfileTimeout = setTimeout(
         this._finishCurrentProfile,
         MAX_PROFILE_DURATION_MS,
       );
+      this._startNewProfile(transaction);
     });
 
     client.on('finishTransaction', () => {
diff --git a/test/profiling/convertHermesProfile.test.ts b/test/profiling/convertHermesProfile.test.ts
index 4a8450b5c..08a83440c 100644
--- a/test/profiling/convertHermesProfile.test.ts
+++ b/test/profiling/convertHermesProfile.test.ts
@@ -54,7 +54,7 @@ describe('convert hermes profile to sentry profile', () => {
           column: '33',
           funcLine: '1605',
           funcColumn: '14',
-          name: 'fooA(/absolute/path/main.jsbundle:1610:33)',
+          name: 'fooA(/absolute/path/app:///main.jsbundle:1610:33)',
           category: 'JavaScript',
           parent: 1,
         },
@@ -63,7 +63,7 @@ describe('convert hermes profile to sentry profile', () => {
           column: '21',
           funcLine: '1614',
           funcColumn: '14',
-          name: 'fooB(/absolute/path/main.jsbundle:1616:21)',
+          name: 'fooB(/absolute/path/app:///main.jsbundle:1616:21)',
           category: 'JavaScript',
           parent: 1,
         },
@@ -72,7 +72,7 @@ describe('convert hermes profile to sentry profile', () => {
           column: '18',
           funcLine: '1623',
           funcColumn: '16',
-          name: '(/absolute/path/main.jsbundle:1627:18)',
+          name: '(/absolute/path/app:///main.jsbundle:1627:18)',
           category: 'JavaScript',
           parent: 2,
         },
@@ -88,19 +88,19 @@ describe('convert hermes profile to sentry profile', () => {
         },
         {
           column: 33,
-          file: 'main.jsbundle',
+          file: 'app:///main.jsbundle',
           function: 'fooA',
           line: 1610,
         },
         {
           column: 21,
-          file: 'main.jsbundle',
+          file: 'app:///main.jsbundle',
           function: 'fooB',
           line: 1616,
         },
         {
           column: 18,
-          file: 'main.jsbundle',
+          file: 'app:///main.jsbundle',
           function: 'anonymous',
           line: 1627,
         },
diff --git a/test/profiling/hermes.test.ts b/test/profiling/hermes.test.ts
index fb5c0bc59..94f3a8263 100644
--- a/test/profiling/hermes.test.ts
+++ b/test/profiling/hermes.test.ts
@@ -1,30 +1,22 @@
-import { parseHermesStackFrameName } from '../../src/js/profiling/hermes';
+import { parseHermesStackFrameFunctionName } from '../../src/js/profiling/hermes';
 
 describe('hermes', () => {
   describe('parseHermesStackFrameName', () => {
     test('parses function name and file name', () => {
-      expect(parseHermesStackFrameName('fooA(/absolute/path/main.jsbundle:1610:33)')).toEqual({
-        function: 'fooA',
-        fileName: 'main.jsbundle',
-      });
+      expect(parseHermesStackFrameFunctionName('fooA(/absolute/path/main.jsbundle:1610:33)'))
+        .toEqual('fooA');
     });
     test('parse hermes root stack frame', () => {
-      expect(parseHermesStackFrameName('[root]')).toEqual({ function: '[root]' });
+      expect(parseHermesStackFrameFunctionName('[root]'))
+        .toEqual('[root]');
     });
     test('parse only file name', () => {
-      expect(parseHermesStackFrameName('(/absolute/path/main.jsbundle:1610:33)')).toEqual({
-        fileName: 'main.jsbundle',
-        function: '',
-      });
-    });
-    test('parse only file name no line or col num', () => {
-      expect(parseHermesStackFrameName('(/absolute/path/main.jsbundle)')).toEqual({
-        fileName: 'main.jsbundle',
-        function: '',
-      });
+      expect(parseHermesStackFrameFunctionName('(/absolute/path/jsbundle:1610:33)'))
+        .toEqual('');
     });
     test('parse only function name', () => {
-      expect(parseHermesStackFrameName('fooA')).toEqual({ function: 'fooA' });
+      expect(parseHermesStackFrameFunctionName('fooA'))
+        .toEqual('fooA');
     });
   });
 });

From 0eb553ef8b8b166dd448175f725783b7cc8f990c Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 28 Jun 2023 13:38:26 +0200
Subject: [PATCH 33/40] Update to JS SDK 7.57.0-beta.0

---
 CHANGELOG.md              |   6 +-
 package.json              |  18 ++--
 src/js/profiling/cache.ts |   4 +-
 yarn.lock                 | 173 ++++++++++++++++++++------------------
 4 files changed, 103 insertions(+), 98 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eab7fa913..0ca9beec8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,9 +25,9 @@
 
 ### Dependencies
 
-- Bump JavaScript SDK from v7.54.0 to v7.56.0 ([#3119](https://github.com/getsentry/sentry-react-native/pull/3119))
-  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#7560)
-  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.54.0...7.56.0)
+- Bump JavaScript SDK from v7.54.0 to v7.57.0-beta.0 ([#3119](https://github.com/getsentry/sentry-react-native/pull/3119), [#3057](https://github.com/getsentry/sentry-react-native/pull/3057))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/7.57.0-beta.0/CHANGELOG.md#7570-beta0)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.54.0...7.57.0-beta.0)
 
 ## 5.6.0
 
diff --git a/package.json b/package.json
index d99c7ff92..d1dc7dc3c 100644
--- a/package.json
+++ b/package.json
@@ -56,18 +56,18 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.56.0",
+    "@sentry/browser": "7.57.0-beta.0",
     "@sentry/cli": "2.18.1",
-    "@sentry/core": "7.56.0",
-    "@sentry/hub": "7.56.0",
-    "@sentry/integrations": "7.56.0",
-    "@sentry/react": "7.56.0",
-    "@sentry/types": "7.56.0",
-    "@sentry/utils": "7.56.0"
+    "@sentry/core": "7.57.0-beta.0",
+    "@sentry/hub": "7.57.0-beta.0",
+    "@sentry/integrations": "7.57.0-beta.0",
+    "@sentry/react": "7.57.0-beta.0",
+    "@sentry/types": "7.57.0-beta.0",
+    "@sentry/utils": "7.57.0-beta.0"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.56.0",
-    "@sentry-internal/eslint-plugin-sdk": "7.56.0",
+    "@sentry-internal/eslint-config-sdk": "7.57.0-beta.0",
+    "@sentry-internal/eslint-plugin-sdk": "7.57.0-beta.0",
     "@sentry/typescript": "^5.20.1",
     "@sentry/wizard": "3.2.3",
     "@types/jest": "^29.2.5",
diff --git a/src/js/profiling/cache.ts b/src/js/profiling/cache.ts
index 90cd818ba..ef64b18c2 100644
--- a/src/js/profiling/cache.ts
+++ b/src/js/profiling/cache.ts
@@ -1,5 +1,5 @@
-import { makeProfilingCache } from '@sentry/utils';
+import { makeFifoCache } from '@sentry/utils';
 
 import type { RawThreadCpuProfile } from './types';
 
-export const PROFILE_QUEUE = makeProfilingCache<string, RawThreadCpuProfile>(20);
+export const PROFILE_QUEUE = makeFifoCache<string, RawThreadCpuProfile>(20);
diff --git a/yarn.lock b/yarn.lock
index 52617d3a6..c7959393f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1679,13 +1679,13 @@
   resolved "https://registry.yarnpkg.com/@react-native/polyfills/-/polyfills-2.0.0.tgz#4c40b74655c83982c8cf47530ee7dc13d957b6aa"
   integrity sha512-K0aGNn1TjalKj+65D7ycc1//H9roAQ51GJVk5ZJQFb2teECGmzd86bYDC0aYdbRf7gtovescq4Zt6FR0tgXiHQ==
 
-"@sentry-internal/eslint-config-sdk@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/eslint-config-sdk/-/eslint-config-sdk-7.56.0.tgz#0fdbe12f51b7c4388e106d9525f91e77ba2715b0"
-  integrity sha512-dPhtZotg3WK3/ReJ4xuPFH66EcvJSPmRLOcXsqA2CCyo7emi827SKGnaRYv/hAVIKER8FwffSqyXcvGAn6grNw==
+"@sentry-internal/eslint-config-sdk@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/eslint-config-sdk/-/eslint-config-sdk-7.57.0-beta.0.tgz#5d14c4ccf85eae870013097c7c3a59e377a49dd5"
+  integrity sha512-+tjJszEDoIteLf7ZmMc5khj8s+gL4nXdA1HWuNaVNUJEWCNE2RCiTszsZQBlLP1F6G3s+zzILq3qLjyxD0QO3Q==
   dependencies:
-    "@sentry-internal/eslint-plugin-sdk" "7.56.0"
-    "@sentry-internal/typescript" "7.56.0"
+    "@sentry-internal/eslint-plugin-sdk" "7.57.0-beta.0"
+    "@sentry-internal/typescript" "7.57.0-beta.0"
     "@typescript-eslint/eslint-plugin" "^5.48.0"
     "@typescript-eslint/parser" "^5.48.0"
     eslint-config-prettier "^6.11.0"
@@ -1694,39 +1694,39 @@
     eslint-plugin-jsdoc "^30.0.3"
     eslint-plugin-simple-import-sort "^5.0.3"
 
-"@sentry-internal/eslint-plugin-sdk@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/eslint-plugin-sdk/-/eslint-plugin-sdk-7.56.0.tgz#d64d37232616ea3484e5098b5fb8b38b0e14e687"
-  integrity sha512-U1wOifuf1zK+kKrT3XtFfiY4Kr1F7tAKkIbuHL400wkAdyqIoB2ZiTS9JYv/qhHpK5acAHKzb2gqJVC3hXf9QA==
+"@sentry-internal/eslint-plugin-sdk@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/eslint-plugin-sdk/-/eslint-plugin-sdk-7.57.0-beta.0.tgz#1e3b82fef71278a4478310b08bc9eeb4a7677cfd"
+  integrity sha512-vpGNPi/mmVeqIWlbAro84tsbPCKXHJghjh9LQd9BRwXqORzDwjBo3In0cXcOR9JRng9a4hdsLfF3khONtFsnhg==
   dependencies:
     requireindex "~1.1.0"
 
-"@sentry-internal/tracing@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.56.0.tgz#ba709258f2f0f3d8a36f9740403088b39212b843"
-  integrity sha512-OKI4Pz/O13gng8hT9rNc+gRV3+P7nnk1HnHlV8fgaQydS6DsRxoDL1sHa42tZGbh7K9jqNAP3TC6VjBOsr2tXA==
-  dependencies:
-    "@sentry/core" "7.56.0"
-    "@sentry/types" "7.56.0"
-    "@sentry/utils" "7.56.0"
-    tslib "^1.9.3"
-
-"@sentry-internal/typescript@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry-internal/typescript/-/typescript-7.56.0.tgz#69268a37a434e09daacb76867f39268cd8ea0c06"
-  integrity sha512-ETpJFWi4EImXay6uMaXauaJGMnhCUDMcD2pI18ZhqObVWPotpH+kfyEKT8h+rey36PL1aFVYsHsfpmTkhGspvA==
-
-"@sentry/browser@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.56.0.tgz#6bf3ff21bc2e9b66a72ea0c7dcc3572fdeb3bd8f"
-  integrity sha512-qpyyw+NM/psbNAYMlTCCdWwxHHcogppEQ+Q40jGE4sKP2VRIjjyteJkUcaEMoGpbJXx9puzTWbpzqlQ8r15Now==
-  dependencies:
-    "@sentry-internal/tracing" "7.56.0"
-    "@sentry/core" "7.56.0"
-    "@sentry/replay" "7.56.0"
-    "@sentry/types" "7.56.0"
-    "@sentry/utils" "7.56.0"
-    tslib "^1.9.3"
+"@sentry-internal/tracing@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/tracing/-/tracing-7.57.0-beta.0.tgz#acb3373e069e44645b1369704cb53c74a41c873b"
+  integrity sha512-jlCXsUZhAJ8VJRIPsQcDK3mXrz5wBgbeaXHKQU7ieS/fefXZkuR/wp70+am9v2lnRxF9XlAb4YqEqCXRRCKR5Q==
+  dependencies:
+    "@sentry/core" "7.57.0-beta.0"
+    "@sentry/types" "7.57.0-beta.0"
+    "@sentry/utils" "7.57.0-beta.0"
+    tslib "^2.4.1 || ^1.9.3"
+
+"@sentry-internal/typescript@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry-internal/typescript/-/typescript-7.57.0-beta.0.tgz#df75145dafc56689a29b11ed54d8706260b903cc"
+  integrity sha512-SSyMJEA+Sk2saDzVanEh50tGDsE6NoY4k3e9I24zY6uaaoUFWXmbfW64Y/rqQKISPc4J6xuwLvKS5K0l5T00Uw==
+
+"@sentry/browser@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.57.0-beta.0.tgz#cbd315246c5ee719cdac01546d204d8db10445eb"
+  integrity sha512-NwrXdOrVjM45Tzra6RsGMM//qfXsERASzu7Mc+F0UPsje/LZ5i/fVKhxRaegyeLOhHJV2+qAZ85ba+4Oa/AO0A==
+  dependencies:
+    "@sentry-internal/tracing" "7.57.0-beta.0"
+    "@sentry/core" "7.57.0-beta.0"
+    "@sentry/replay" "7.57.0-beta.0"
+    "@sentry/types" "7.57.0-beta.0"
+    "@sentry/utils" "7.57.0-beta.0"
+    tslib "^2.4.1 || ^1.9.3"
 
 "@sentry/cli@2.18.1":
   version "2.18.1"
@@ -1752,59 +1752,59 @@
     proxy-from-env "^1.1.0"
     which "^2.0.2"
 
-"@sentry/core@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.56.0.tgz#f4253e0d61f55444180a63e5278b62e57303f7cf"
-  integrity sha512-Nuyyfh09Yz27kPo74fXHlrdmZeK6zrlJVtxQ6LkwuoaTBcNcesNXVaOtr6gjvUGUmsfriVPP3Jero5LXufV7GQ==
+"@sentry/core@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.57.0-beta.0.tgz#697f7aa4f61d62b2c19c4fae072f8e26060adb98"
+  integrity sha512-rVmlgBzj4gTFBCNO+vt6mqOE+4qfTJFQLuTyLrD8afjILsureQsU/6re70xMiUmOnl61OIfCqaHIvMiZ4rQMyw==
   dependencies:
-    "@sentry/types" "7.56.0"
-    "@sentry/utils" "7.56.0"
-    tslib "^1.9.3"
+    "@sentry/types" "7.57.0-beta.0"
+    "@sentry/utils" "7.57.0-beta.0"
+    tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/hub@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.56.0.tgz#840f4df37945ac2230570366f8913c0406cfa827"
-  integrity sha512-d5AnPHk7PNhPFHyIuyMEnG+dtC8SHbCBffm05jMqL0+ocU1rSAJb4K6r5D1wrfQtHxPHNV+R3uwkvOWDekF+VA==
+"@sentry/hub@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-7.57.0-beta.0.tgz#c794d790966166c91cf25a6db87b4d07fb8165b9"
+  integrity sha512-y2f6I3LNyuzgM/bmHghHWQYXZ0XRAg0gUjpDnZLKlXAQL4LfQG6+X51t8qW5Umvf463VJFka1j1Uk5gRlR/FpA==
   dependencies:
-    "@sentry/core" "7.56.0"
-    "@sentry/types" "7.56.0"
-    "@sentry/utils" "7.56.0"
-    tslib "^1.9.3"
+    "@sentry/core" "7.57.0-beta.0"
+    "@sentry/types" "7.57.0-beta.0"
+    "@sentry/utils" "7.57.0-beta.0"
+    tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/integrations@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.56.0.tgz#6fe812454fbccf00810f65667eb393b3bf298b92"
-  integrity sha512-0d/E/R3MW+5bQ9wcHPD0h/B2KFOpUt+wQgN1kNk7atY12auDzHKuGCjPP87D/xVyRoma3ErFqZCRqwtvCj1cfQ==
+"@sentry/integrations@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-7.57.0-beta.0.tgz#97f510046ff7fc47c0c80274d649a35154aaa6b3"
+  integrity sha512-G35QGVehIBjX0pQ3RFEqXI7rCJwUj3NbrPvymxo3Bi9UgrLaPfcvqk6vyj4hNv89t/g/mSUtgvj2MqhEgtnX+Q==
   dependencies:
-    "@sentry/types" "7.56.0"
-    "@sentry/utils" "7.56.0"
+    "@sentry/types" "7.57.0-beta.0"
+    "@sentry/utils" "7.57.0-beta.0"
     localforage "^1.8.1"
-    tslib "^1.9.3"
+    tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/react@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.56.0.tgz#7e2e9363a76c7d67854bdb179142a2f7f910d476"
-  integrity sha512-dRnkZwspef5aEHV/eiLS/mhomFCXItylU8s78fzAn5QMTDGHmu5Pnhl5dxh/zbPUcdXqFA6GwJVucV4gzsNEJw==
+"@sentry/react@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/react/-/react-7.57.0-beta.0.tgz#48a04fb6221429f722b71c70c1b05f5404276458"
+  integrity sha512-8gKMq42R/RSwooGsd7a0JL1gaSw2cUxTqujsAyiwPAoj13SbB1/Is3e7O1ABDtRtpYFoqSPXQ0Mrp/7QI83QQg==
   dependencies:
-    "@sentry/browser" "7.56.0"
-    "@sentry/types" "7.56.0"
-    "@sentry/utils" "7.56.0"
+    "@sentry/browser" "7.57.0-beta.0"
+    "@sentry/types" "7.57.0-beta.0"
+    "@sentry/utils" "7.57.0-beta.0"
     hoist-non-react-statics "^3.3.2"
-    tslib "^1.9.3"
+    tslib "^2.4.1 || ^1.9.3"
 
-"@sentry/replay@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.56.0.tgz#8a49dcb45e9ea83bf905cec0d9b42fed4b8085bd"
-  integrity sha512-bvjiJK1+SM/paLapuL+nEJ8CIF1bJqi0nnFyxUIi2L5L6yb2uMwfyT3IQ+kz0cXJsLdb3HN4WMphVjyiU9pFdg==
+"@sentry/replay@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.57.0-beta.0.tgz#5a915d743317c301df5d00cf1fbb8ef1b8fa69dc"
+  integrity sha512-t/YTmxWzIPyzQrdGWnt534CLzGffxuRv75af+gh3JJ8697dcplIj1MraxhxVkTZLFzfvDNEvZfiT5+F7co/V/A==
   dependencies:
-    "@sentry/core" "7.56.0"
-    "@sentry/types" "7.56.0"
-    "@sentry/utils" "7.56.0"
+    "@sentry/core" "7.57.0-beta.0"
+    "@sentry/types" "7.57.0-beta.0"
+    "@sentry/utils" "7.57.0-beta.0"
 
-"@sentry/types@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.56.0.tgz#9042a099cf9e8816d081886d24b88082a5d9f87a"
-  integrity sha512-5WjhVOQm75ItOytOx2jTx+5yw8/qJ316+g1Di8dS9+kgIi1zniqdMcX00C2yYe3FMUgFB49PegCUYulm9Evapw==
+"@sentry/types@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.57.0-beta.0.tgz#7d3a1cec320ffbb1488ce6d440bc01a316558b92"
+  integrity sha512-GtVfY5RIq31pnKOXDNlC1MPwnzpWgkgB2H7xS1Vc1OQCJfKijopJKIDE80kgTMdJaLUmE7MR3+JomXu64zC2FA==
 
 "@sentry/typescript@^5.20.1":
   version "5.20.1"
@@ -1814,13 +1814,13 @@
     tslint-config-prettier "^1.18.0"
     tslint-consistent-codestyle "^1.15.1"
 
-"@sentry/utils@7.56.0":
-  version "7.56.0"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.56.0.tgz#e60e4935d17b2197584abf6ce61b522ad055352c"
-  integrity sha512-wgeX7bufxc//TjjSIE+gCMm8hVId7Jzvc+f441bYrWnNZBuzPIDW2BummCcPrKzSYe5GeYZDTZGV8YZGMLGBjw==
+"@sentry/utils@7.57.0-beta.0":
+  version "7.57.0-beta.0"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.57.0-beta.0.tgz#f2faba3c29380f3b526baed442efe3b7d75292bd"
+  integrity sha512-jlWJdQ3HjyZe/wxCTX77Gyq4u7G/HIXGzlwlYcOlWFIG3+uv55XnAQimAy29TAjHIeK5v4jva5kMC4siyQzFXg==
   dependencies:
-    "@sentry/types" "7.56.0"
-    tslib "^1.9.3"
+    "@sentry/types" "7.57.0-beta.0"
+    tslib "^2.4.1 || ^1.9.3"
 
 "@sentry/wizard@3.2.3":
   version "3.2.3"
@@ -8185,7 +8185,7 @@ tsconfig-paths@^3.9.0:
     minimist "^1.2.0"
     strip-bom "^3.0.0"
 
-tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.7.1, tslib@^1.8.1, tslib@^1.9.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
@@ -8195,6 +8195,11 @@ tslib@^2.0.1:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e"
   integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==
 
+"tslib@^2.4.1 || ^1.9.3":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3"
+  integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==
+
 tslint-config-prettier@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37"

From 1e55aaff009e8e38b4a55af7844f4f034e3151c5 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 28 Jun 2023 13:38:44 +0200
Subject: [PATCH 34/40] Fix lint

---
 src/js/profiling/convertHermesProfile.ts    | 17 +++++++----------
 src/js/profiling/integration.ts             |  9 +++------
 test/profiling/convertHermesProfile.test.ts |  7 +++++++
 test/profiling/hermes.test.ts               | 12 ++++--------
 test/profiling/integration.test.ts          |  7 +++----
 5 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index e4aafa9db..0330dd893 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -1,4 +1,4 @@
-import type { FrameId, StackId, ThreadCpuFrame,ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types';
+import type { FrameId, StackId, ThreadCpuFrame, ThreadCpuSample, ThreadCpuStack, ThreadId } from '@sentry/types';
 import { logger } from '@sentry/utils';
 import { Platform } from 'react-native';
 
@@ -15,11 +15,7 @@ const UNKNOWN_STACK_ID = -1;
 const JS_THREAD_NAME = 'JavaScriptThread';
 const JS_THREAD_PRIORITY = 1;
 const DEFAULT_BUNDLE_NAME =
-    Platform.OS === 'android'
-  ? ANDROID_DEFAULT_BUNDLE_NAME
-  : Platform.OS === 'ios'
-  ? IOS_DEFAULT_BUNDLE_NAME
-  : undefined;
+  Platform.OS === 'android' ? ANDROID_DEFAULT_BUNDLE_NAME : Platform.OS === 'ios' ? IOS_DEFAULT_BUNDLE_NAME : undefined;
 
 /**
  * Converts a Hermes profile to a Sentry profile.
@@ -46,10 +42,10 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThread
     hermesStacks,
     hermesProfile.stackFrames,
     hermesStackFrameIdToSentryFrameIdMap,
-);
+  );
 
   for (const sample of samples) {
-    const sentryStackId = hermesStackToSentryStackMap.get(sample.stack_id)
+    const sentryStackId = hermesStackToSentryStackMap.get(sample.stack_id);
     if (sentryStackId === undefined) {
       logger.error(`[Profiling] Hermes Stack ID ${sample.stack_id} not found when mapping to Sentry Stack ID.`);
       sample.stack_id = UNKNOWN_STACK_ID;
@@ -118,7 +114,7 @@ function mapSamples(
     hermesStacks,
     jsThreads,
   };
-};
+}
 
 /**
  * Maps Hermes StackFrames tree represented as an JS object to a Sentry frames array.
@@ -131,7 +127,8 @@ function mapFrames(hermesStackFrames: Record<Hermes.StackFrameId, Hermes.StackFr
 } {
   const frames: ThreadCpuFrame[] = [];
   const hermesStackFrameIdToSentryFrameIdMap = new Map<Hermes.StackFrameId, FrameId>();
-  for (const key in hermesStackFrames) { // asc order based on the key is not guaranteed
+  for (const key in hermesStackFrames) {
+    // asc order based on the key is not guaranteed
     if (!Object.prototype.hasOwnProperty.call(hermesStackFrames, key)) {
       continue;
     }
diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
index 0173aabe0..a129dc1bd 100644
--- a/src/js/profiling/integration.ts
+++ b/src/js/profiling/integration.ts
@@ -1,4 +1,4 @@
-import type { Envelope, Event, EventProcessor, Hub, Integration, Profile, Transaction  } from '@sentry/types';
+import type { Envelope, Event, EventProcessor, Hub, Integration, Profile, Transaction } from '@sentry/types';
 import { logger, uuid4 } from '@sentry/utils';
 
 import { isHermesEnabled } from '../utils/environment';
@@ -59,10 +59,7 @@ export class HermesProfiling implements Integration {
         return;
       }
 
-      this._currentProfileTimeout = setTimeout(
-        this._finishCurrentProfile,
-        MAX_PROFILE_DURATION_MS,
-      );
+      this._currentProfileTimeout = setTimeout(this._finishCurrentProfile, MAX_PROFILE_DURATION_MS);
       this._startNewProfile(transaction);
     });
 
@@ -190,5 +187,5 @@ export class HermesProfiling implements Integration {
   private _clearCurrentProfileTimeout = (): void => {
     this._currentProfileTimeout !== undefined && clearTimeout(this._currentProfileTimeout);
     this._currentProfileTimeout = undefined;
-  }
+  };
 }
diff --git a/test/profiling/convertHermesProfile.test.ts b/test/profiling/convertHermesProfile.test.ts
index 08a83440c..a4fc60f60 100644
--- a/test/profiling/convertHermesProfile.test.ts
+++ b/test/profiling/convertHermesProfile.test.ts
@@ -1,3 +1,4 @@
+import { ThreadCpuSample } from '@sentry/types';
 import { convertToSentryProfile } from '../../src/js/profiling/convertHermesProfile';
 import type * as Hermes from '../../src/js/profiling/hermes';
 import type { ThreadCpuProfile } from '../../src/js/profiling/types';
@@ -137,4 +138,10 @@ describe('convert hermes profile to sentry profile', () => {
     };
     expect(convertToSentryProfile(hermesProfile)).toStrictEqual(expectedSentryProfile);
   });
+
+  it('removes samples that are over the max duration of profile', () => {
+    const hermesSamples: Hermes.Sample[] = [];
+    const expectedSentrySamples: ThreadCpuSample = [];
+
+  });
 });
diff --git a/test/profiling/hermes.test.ts b/test/profiling/hermes.test.ts
index 94f3a8263..f9fb9a6b4 100644
--- a/test/profiling/hermes.test.ts
+++ b/test/profiling/hermes.test.ts
@@ -3,20 +3,16 @@ import { parseHermesStackFrameFunctionName } from '../../src/js/profiling/hermes
 describe('hermes', () => {
   describe('parseHermesStackFrameName', () => {
     test('parses function name and file name', () => {
-      expect(parseHermesStackFrameFunctionName('fooA(/absolute/path/main.jsbundle:1610:33)'))
-        .toEqual('fooA');
+      expect(parseHermesStackFrameFunctionName('fooA(/absolute/path/main.jsbundle:1610:33)')).toEqual('fooA');
     });
     test('parse hermes root stack frame', () => {
-      expect(parseHermesStackFrameFunctionName('[root]'))
-        .toEqual('[root]');
+      expect(parseHermesStackFrameFunctionName('[root]')).toEqual('[root]');
     });
     test('parse only file name', () => {
-      expect(parseHermesStackFrameFunctionName('(/absolute/path/jsbundle:1610:33)'))
-        .toEqual('');
+      expect(parseHermesStackFrameFunctionName('(/absolute/path/jsbundle:1610:33)')).toEqual('');
     });
     test('parse only function name', () => {
-      expect(parseHermesStackFrameFunctionName('fooA'))
-        .toEqual('fooA');
+      expect(parseHermesStackFrameFunctionName('fooA')).toEqual('fooA');
     });
   });
 });
diff --git a/test/profiling/integration.test.ts b/test/profiling/integration.test.ts
index 478c75acf..5fc83df27 100644
--- a/test/profiling/integration.test.ts
+++ b/test/profiling/integration.test.ts
@@ -29,7 +29,7 @@ describe('profiling integration', () => {
     jest.clearAllMocks();
   });
 
-  afterEach(async() => {
+  afterEach(async () => {
     jest.runAllTimers();
     jest.useRealTimers();
     RN_GLOBAL_OBJ.__SENTRY__.globalEventProcessors = []; // resets integrations
@@ -116,7 +116,7 @@ describe('profiling integration', () => {
     const transactionEnvelopeItemPayload = envelope?.[envelopeItems][0][envelopeItemPayload] as Event;
     const profileEnvelopeItemPayload = envelope?.[envelopeItems][1][envelopeItemPayload] as unknown as Profile;
     const transactionStart = Math.floor(transactionEnvelopeItemPayload.start_timestamp! * SEC_TO_MS);
-    const profileStart = (new Date(profileEnvelopeItemPayload.timestamp)).getTime();
+    const profileStart = new Date(profileEnvelopeItemPayload.timestamp).getTime();
     expect(profileStart - transactionStart).toBeLessThan(10);
   });
 
@@ -179,7 +179,6 @@ describe('profiling integration', () => {
   });
 });
 
-
 type TestHermesIntegration = Omit<HermesProfiling, '_currentProfileTimeout'> & {
   _currentProfileTimeout: number | undefined;
 };
@@ -207,7 +206,7 @@ function initTestClient(): {
   });
 
   // In production integrations are setup only once, but in the tests we want them to setup on every init
-  const integrations = Sentry.getCurrentHub().getClient()?.getOptions().integrations
+  const integrations = Sentry.getCurrentHub().getClient()?.getOptions().integrations;
   if (integrations) {
     for (const integration of integrations) {
       integration.setupOnce(Sentry.addGlobalEventProcessor, Sentry.getCurrentHub);

From d90eb10348692e819066e29953f20a14d45f5e7a Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 28 Jun 2023 14:51:08 +0200
Subject: [PATCH 35/40] Add remove over duration samples tests

---
 src/js/profiling/convertHermesProfile.ts    |  2 +-
 test/profiling/convertHermesProfile.test.ts | 70 +++++++++++++++++++--
 2 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index 0330dd893..7357c45fe 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -76,7 +76,7 @@ export function convertToSentryProfile(hermesProfile: Hermes.Profile): RawThread
  * Hermes stack frame IDs represent the last (leaf, furthest from the main func) frame of the call stack.
  * @returns the mapped Sentry samples, the set of Hermes stack frame IDs, and the set of JS thread IDs
  */
-function mapSamples(
+export function mapSamples(
   hermesSamples: Hermes.Sample[],
   maxElapsedSinceStartNs: number = MAX_PROFILE_DURATION_NS,
 ): {
diff --git a/test/profiling/convertHermesProfile.test.ts b/test/profiling/convertHermesProfile.test.ts
index a4fc60f60..4e9a72247 100644
--- a/test/profiling/convertHermesProfile.test.ts
+++ b/test/profiling/convertHermesProfile.test.ts
@@ -1,7 +1,7 @@
-import { ThreadCpuSample } from '@sentry/types';
-import { convertToSentryProfile } from '../../src/js/profiling/convertHermesProfile';
+import type { ThreadCpuProfile, ThreadCpuSample } from '@sentry/types';
+
+import { convertToSentryProfile, mapSamples } from '../../src/js/profiling/convertHermesProfile';
 import type * as Hermes from '../../src/js/profiling/hermes';
-import type { ThreadCpuProfile } from '../../src/js/profiling/types';
 
 describe('convert hermes profile to sentry profile', () => {
   it('simple test profile', async () => {
@@ -139,9 +139,67 @@ describe('convert hermes profile to sentry profile', () => {
     expect(convertToSentryProfile(hermesProfile)).toStrictEqual(expectedSentryProfile);
   });
 
-  it('removes samples that are over the max duration of profile', () => {
-    const hermesSamples: Hermes.Sample[] = [];
-    const expectedSentrySamples: ThreadCpuSample = [];
+  describe('converts profile samples', () => {
+    it('removes samples that are over the max duration of profile', () => {
+      const TEST_MAX_PROFILE_DURATION = 1000;
+      const hermesSamples: Hermes.Sample[] = [
+        {
+          ...getMinimumHermesSample(),
+          ts: '1',
+        },
+        {
+          ...getMinimumHermesSample(),
+          ts: '3',
+        },
+      ];
+      const expectedSentrySamples: ThreadCpuSample[] = [
+        {
+          ...getMinimumSentrySample(),
+          elapsed_since_start_ns: '0',
+        },
+      ];
+      expect(mapSamples(hermesSamples, TEST_MAX_PROFILE_DURATION).samples).toStrictEqual(expectedSentrySamples);
+    });
+
+    it('removes samples that are equal the max duration of profile', () => {
+      const TEST_MAX_PROFILE_DURATION = 1000;
+      const hermesSamples: Hermes.Sample[] = [
+        {
+          ...getMinimumHermesSample(),
+          ts: '1',
+        },
+        {
+          ...getMinimumHermesSample(),
+          ts: '2',
+        },
+      ];
+      const expectedSentrySamples: ThreadCpuSample[] = [
+        {
+          ...getMinimumSentrySample(),
+          elapsed_since_start_ns: '0',
+        },
+      ];
+      expect(mapSamples(hermesSamples, TEST_MAX_PROFILE_DURATION).samples).toStrictEqual(expectedSentrySamples);
+    });
+
+    function getMinimumHermesSample(): Hermes.Sample {
+      return {
+        cpu: '-1',
+        name: '',
+        ts: '1',
+        pid: 54822,
+        tid: '14509472',
+        weight: '1',
+        sf: 4,
+      };
+    }
 
+    function getMinimumSentrySample(): ThreadCpuSample {
+      return {
+        elapsed_since_start_ns: '0',
+        stack_id: 4,
+        thread_id: '14509472',
+      };
+    }
   });
 });

From ffe4aab60b2fcbecae1e4bf51e85e7e04e936d57 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 3 Jul 2023 18:08:43 +0200
Subject: [PATCH 36/40] Remove debugEnabled helper var

---
 android/src/main/java/io/sentry/react/RNSentryModuleImpl.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 0841a2b65..a9b699aca 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -82,7 +82,6 @@ public class RNSentryModuleImpl {
     private final PackageInfo packageInfo;
     private FrameMetricsAggregator frameMetricsAggregator = null;
     private boolean androidXAvailable;
-    private boolean debugEnabled = false;
 
     private static boolean didFetchAppStart;
 
@@ -122,7 +121,6 @@ public void initNativeSdk(final ReadableMap rnOptions, Promise promise) {
 
             if (rnOptions.hasKey("debug") && rnOptions.getBoolean("debug")) {
                 options.setDebug(true);
-                this.debugEnabled = true;
             }
             if (rnOptions.hasKey("dsn") && rnOptions.getString("dsn") != null) {
                 String dsn = rnOptions.getString("dsn");
@@ -641,7 +639,7 @@ public WritableMap stopProfiling() {
             final File output = File.createTempFile(
                 "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
 
-            if (this.debugEnabled) {
+            if (HubAdapter.getInstance().getOptions().isDebug()) {
                 logger.log(SentryLevel.INFO, "Profile saved to: " + output.getAbsolutePath());
             }
 

From 91cb0369ece935d8a2dae013533ec49ef95345ac Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 3 Jul 2023 18:22:46 +0200
Subject: [PATCH 37/40] Delete profile file after reading it

---
 .../java/io/sentry/react/RNSentryModuleImpl.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index a9b699aca..529c966ec 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -632,14 +632,16 @@ public WritableMap startProfiling() {
     }
 
     public WritableMap stopProfiling() {
+        final boolean isDebug = HubAdapter.getInstance().getOptions().isDebug();
         final WritableMap result = new WritableNativeMap();
+        File output = null;
         try {
             HermesSamplingProfiler.disable();
 
-            final File output = File.createTempFile(
+            output = File.createTempFile(
                 "sampling-profiler-trace", ".cpuprofile", reactApplicationContext.getCacheDir());
 
-            if (HubAdapter.getInstance().getOptions().isDebug()) {
+            if (isDebug) {
                 logger.log(SentryLevel.INFO, "Profile saved to: " + output.getAbsolutePath());
             }
 
@@ -657,6 +659,13 @@ public WritableMap stopProfiling() {
             }
         } catch (Throwable e) {
             result.putString("error", e.toString());
+        } finally {
+            if (output != null && !isDebug) {
+                final boolean wasProfileSuccessfullyDeleted = output.delete();
+                if (!wasProfileSuccessfullyDeleted) {
+                    logger.log(SentryLevel.WARNING, "Profile not deleted from:" + output.getAbsolutePath());
+                }
+            }
         }
         return result;
     }

From c14d4a7b1f1db3b54caec90f57bed2f1a6fce4b4 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Mon, 3 Jul 2023 21:00:32 +0200
Subject: [PATCH 38/40] Fix ms to ns conversion

---
 src/js/profiling/convertHermesProfile.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/profiling/convertHermesProfile.ts b/src/js/profiling/convertHermesProfile.ts
index 7357c45fe..286b09e6f 100644
--- a/src/js/profiling/convertHermesProfile.ts
+++ b/src/js/profiling/convertHermesProfile.ts
@@ -8,7 +8,7 @@ import { parseHermesStackFrameFunctionName } from './hermes';
 import { MAX_PROFILE_DURATION_MS } from './integration';
 import type { RawThreadCpuProfile } from './types';
 
-const MS_TO_NS = 1e3;
+const MS_TO_NS = 1e6;
 const MAX_PROFILE_DURATION_NS = MAX_PROFILE_DURATION_MS * MS_TO_NS;
 const ANONYMOUS_FUNCTION_NAME = 'anonymous';
 const UNKNOWN_STACK_ID = -1;

From d636449bf967b28ffe9a0d016a4c53078f113e44 Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Tue, 4 Jul 2023 14:42:29 +0200
Subject: [PATCH 39/40] Delete profile file in debug and catch thrown errors
 during delete

---
 .../main/java/io/sentry/react/RNSentryModuleImpl.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
index 529c966ec..d9d1101dc 100644
--- a/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
+++ b/android/src/main/java/io/sentry/react/RNSentryModuleImpl.java
@@ -660,9 +660,13 @@ public WritableMap stopProfiling() {
         } catch (Throwable e) {
             result.putString("error", e.toString());
         } finally {
-            if (output != null && !isDebug) {
-                final boolean wasProfileSuccessfullyDeleted = output.delete();
-                if (!wasProfileSuccessfullyDeleted) {
+            if (output != null) {
+                try {
+                    final boolean wasProfileSuccessfullyDeleted = output.delete();
+                    if (!wasProfileSuccessfullyDeleted) {
+                       logger.log(SentryLevel.WARNING, "Profile not deleted from:" + output.getAbsolutePath());
+                    }
+                } catch (Throwable e) {
                     logger.log(SentryLevel.WARNING, "Profile not deleted from:" + output.getAbsolutePath());
                 }
             }

From a71b774867dfac114785490a66d5cf961b891c8b Mon Sep 17 00:00:00 2001
From: Krystof Woldrich <krystof.woldrich@sentry.io>
Date: Wed, 19 Jul 2023 13:20:25 +0200
Subject: [PATCH 40/40] fix changelog

---
 CHANGELOG.md | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53ee0f274..9918c3f3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 ## Unreleased
 
+### Features
+
+- Alpha support for Hermes JavaScript Profiling ([#3057](https://github.com/getsentry/sentry-react-native/pull/3057))
+
+  Profiling is disabled by default. To enable it, configure both
+  `tracesSampleRate` and `profilesSampleRate` when initializing the SDK:
+
+  ```javascript
+    Sentry.init({
+      dsn: '__DSN__',
+      tracesSampleRate: 1.0,
+      _experiments: {
+        // The sampling rate for profiling is relative to TracesSampleRate.
+        // In this case, we'll capture profiles for 100% of transactions.
+        profilesSampleRate: 1.0,
+      },
+    });
+  ```
+
+  More documentation on profiling and current limitations [can be found here](https://docs.sentry.io/platforms/react-native/profiling/).
+
 ### Fixes
 
 - Warn users about multiple versions of `promise` package which can cause unexpected behavior like undefined `Promise.allSettled` ([#3162](https://github.com/getsentry/sentry-react-native/pull/3162))
@@ -32,24 +53,6 @@
 ### Features
 
 - Use `android.namespace` for AGP 8 and RN 0.73 ([#3133](https://github.com/getsentry/sentry-react-native/pull/3133))
-- Alpha support for Hermes JavaScript Profiling ([#3057](https://github.com/getsentry/sentry-react-native/pull/3057))
-
-  Profiling is disabled by default. To enable it, configure both
-  `tracesSampleRate` and `profilesSampleRate` when initializing the SDK:
-
-  ```javascript
-    Sentry.init({
-      dsn: '__DSN__',
-      tracesSampleRate: 1.0,
-      _experiments: {
-        // The sampling rate for profiling is relative to TracesSampleRate.
-        // In this case, we'll capture profiles for 100% of transactions.
-        profilesSampleRate: 1.0,
-      },
-    });
-  ```
-
-  More documentation on profiling and current limitations [can be found here](https://docs.sentry.io/platforms/react-native/profiling/).
 
 ### Dependencies