@sentry/react-native 5.13.1-beta.1 → 5.14.0

package/ios/RNSentry.mm

@@ -7,6 +7,14 @@
 #import "RCTConvert.h"
 #endif
 
+#if __has_include(<hermes/hermes.h>)
+#define SENTRY_PROFILING_ENABLED 1
+#import <Sentry/SentryProfilingConditionals.h>
+#else
+#define SENTRY_PROFILING_ENABLED 0
+#define SENTRY_TARGET_PROFILING_SUPPORTED 0
+#endif
+
 #import <Sentry/Sentry.h>
 #import <Sentry/PrivateSentrySDKOnly.h>
 #import <Sentry/SentryScreenFrames.h>
@@ -14,12 +22,7 @@
 #import <Sentry/SentryBinaryImageCache.h>
 #import <Sentry/SentryDependencyContainer.h>
 #import <Sentry/SentryFormatter.h>
-
-#if __has_include(<hermes/hermes.h>)
-#define SENTRY_PROFILING_ENABLED 1
-#else
-#define SENTRY_PROFILING_ENABLED 0
-#endif
+#import <Sentry/SentryCurrentDateProvider.h>
 
 // This guard prevents importing Hermes in JSC apps
 #if SENTRY_PROFILING_ENABLED
@@ -594,16 +597,40 @@ RCT_EXPORT_METHOD(enableNativeFramesTracking)
 }
 
 static NSString* const enabledProfilingMessage = @"Enable Hermes to use Sentry Profiling.";
+static SentryId* nativeProfileTraceId = nil;
+static uint64_t nativeProfileStartTime = 0;
 
 RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, startProfiling)
 {
 #if SENTRY_PROFILING_ENABLED
     try {
         facebook::hermes::HermesRuntime::enableSamplingProfiler();
+        if (nativeProfileTraceId == nil && nativeProfileStartTime == 0) {
+#if SENTRY_TARGET_PROFILING_SUPPORTED
+            nativeProfileTraceId = [[SentryId alloc] init];
+            nativeProfileStartTime = [PrivateSentrySDKOnly startProfilerForTrace: nativeProfileTraceId];
+#endif
+        } else {
+            NSLog(@"Native profiling already in progress. Currently existing trace: %@", nativeProfileTraceId);
+        }
         return @{ @"started": @YES };
     } catch (const std::exception& ex) {
+        if (nativeProfileTraceId != nil) {
+#if SENTRY_TARGET_PROFILING_SUPPORTED
+            [PrivateSentrySDKOnly discardProfilerForTrace: nativeProfileTraceId];
+#endif
+            nativeProfileTraceId = nil;
+        }
+        nativeProfileStartTime = 0;
         return @{ @"error": [NSString stringWithCString: ex.what() encoding:[NSString defaultCStringEncoding]] };
     } catch (...) {
+        if (nativeProfileTraceId != nil) {
+#if SENTRY_TARGET_PROFILING_SUPPORTED
+            [PrivateSentrySDKOnly discardProfilerForTrace: nativeProfileTraceId];
+#endif
+            nativeProfileTraceId = nil;
+        }
+        nativeProfileStartTime = 0;
         return @{ @"error": @"Failed to start profiling" };
     }
 #else
@@ -615,6 +642,17 @@ RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, stopProfiling)
 {
 #if SENTRY_PROFILING_ENABLED
     try {
+        NSDictionary<NSString *, id> * nativeProfile = nil;
+        if (nativeProfileTraceId != nil && nativeProfileStartTime != 0) {
+#if SENTRY_TARGET_PROFILING_SUPPORTED
+            uint64_t nativeProfileStopTime = [[[SentryDependencyContainer sharedInstance] dateProvider] systemTime];
+            nativeProfile = [PrivateSentrySDKOnly collectProfileBetween:nativeProfileStartTime and:nativeProfileStopTime forTrace:nativeProfileTraceId];
+#endif
+        }
+        // Cleanup native profiles
+        nativeProfileTraceId = nil;
+        nativeProfileStartTime = 0;
+
         facebook::hermes::HermesRuntime::disableSamplingProfiler();
         std::stringstream ss;
         facebook::hermes::HermesRuntime::dumpSampledTraceToStream(ss);
@@ -633,10 +671,35 @@ RCT_EXPORT_SYNCHRONOUS_TYPED_METHOD(NSDictionary *, stopProfiling)
         }
 #endif
 
-        return @{ @"profile": data };
+        if (data == nil) {
+          return @{ @"error": @"Failed to retrieve Hermes profile." };
+        }
+
+        if (nativeProfile == nil) {
+          return @{ @"profile": data };
+        }
+
+        return @{
+          @"profile": data,
+          @"nativeProfile": nativeProfile,
+        };
     } catch (const std::exception& ex) {
+        if (nativeProfileTraceId != nil) {
+#if SENTRY_TARGET_PROFILING_SUPPORTED
+          [PrivateSentrySDKOnly discardProfilerForTrace: nativeProfileTraceId];
+#endif
+          nativeProfileTraceId = nil;
+        }
+        nativeProfileStartTime = 0;
         return @{ @"error": [NSString stringWithCString: ex.what() encoding:[NSString defaultCStringEncoding]] };
     } catch (...) {
+        if (nativeProfileTraceId != nil) {
+#if SENTRY_TARGET_PROFILING_SUPPORTED
+          [PrivateSentrySDKOnly discardProfilerForTrace: nativeProfileTraceId];
+#endif
+          nativeProfileTraceId = nil;
+        }
+        nativeProfileStartTime = 0;
         return @{ @"error": @"Failed to stop profiling" };
     }
 #else

package/package.json

@@ -2,7 +2,7 @@
   "name": "@sentry/react-native",
   "homepage": "https://github.com/getsentry/sentry-react-native",
   "repository": "https://github.com/getsentry/sentry-react-native",
-  "version": "5.13.1-beta.1",
+  "version": "5.14.0",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
@@ -58,21 +58,22 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.80.0",
+    "@sentry/browser": "7.81.1",
     "@sentry/cli": "2.21.3",
-    "@sentry/core": "7.80.0",
-    "@sentry/hub": "7.80.0",
-    "@sentry/integrations": "7.80.0",
-    "@sentry/react": "7.80.0",
-    "@sentry/types": "7.80.0",
-    "@sentry/utils": "7.80.0"
+    "@sentry/core": "7.81.1",
+    "@sentry/hub": "7.81.1",
+    "@sentry/integrations": "7.81.1",
+    "@sentry/react": "7.81.1",
+    "@sentry/types": "7.81.1",
+    "@sentry/utils": "7.81.1"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.80.0",
-    "@sentry-internal/eslint-plugin-sdk": "7.80.0",
+    "@sentry-internal/eslint-config-sdk": "7.81.1",
+    "@sentry-internal/eslint-plugin-sdk": "7.81.1",
     "@sentry/typescript": "^5.20.1",
     "@sentry/wizard": "3.16.3",
     "@types/jest": "^29.5.3",
+    "@types/node": "^20.9.3",
     "@types/react": "^18.2.14",
     "@types/uglify-js": "^3.17.2",
     "@types/uuid": "^9.0.4",

package/src/js/NativeRNSentry.ts

@@ -32,7 +32,7 @@ export interface Spec extends TurboModule {
   fetchModules(): Promise<string | undefined | null>;
   fetchViewHierarchy(): Promise<number[] | undefined | null>;
   startProfiling(): { started?: boolean; error?: string };
-  stopProfiling(): { profile?: string; error?: string };
+  stopProfiling(): { profile?: string; nativeProfile?: UnsafeObject; error?: string };
   fetchNativePackageName(): Promise<string | undefined | null>;
   fetchNativeStackFramesBy(instructionsAddr: number[]): Promise<NativeStackFrames | undefined | null>;
 }

package/ts3.8/dist/js/NativeRNSentry.d.ts

@@ -30,6 +30,7 @@ export interface Spec extends TurboModule {
     };
     stopProfiling(): {
         profile?: string;
+        nativeProfile?: UnsafeObject;
         error?: string;
     };
     fetchNativePackageName(): Promise<string | undefined | null>;

package/ts3.8/dist/js/profiling/cache.d.ts

@@ -1,7 +1,7 @@
-import type { RawThreadCpuProfile } from './types';
+import type { CombinedProfileEvent } from './types';
 export declare const PROFILE_QUEUE: {
-    get: (key: string) => RawThreadCpuProfile | undefined;
-    add: (key: string, value: RawThreadCpuProfile) => void;
+    get: (key: string) => CombinedProfileEvent | undefined;
+    add: (key: string, value: CombinedProfileEvent) => void;
     delete: (key: string) => boolean;
     clear: () => void;
     size: () => number;

package/ts3.8/dist/js/profiling/debugid.d.ts

@@ -0,0 +1,6 @@
+import type { DebugImage } from '@sentry/types';
+/**
+ * Returns debug meta images of the loaded bundle.
+ */
+export declare function getDebugMetadata(): DebugImage[];
+//# sourceMappingURL=debugid.d.ts.map

package/ts3.8/dist/js/profiling/hermes.d.ts

@@ -1,4 +1,3 @@
-import type { RawThreadCpuProfile } from './types';
 export type StackFrameId = number;
 export type MicrosecondsSinceBoot = string;
 export interface TraceEvent {
@@ -38,12 +37,4 @@ export interface Profile {
     stackFrames: Record<string, StackFrame>;
 }
 export declare const DEFAULT_BUNDLE_NAME: string | undefined;
-/**
- * Starts Hermes Sampling Profiler and returns the timestamp when profiling started in nanoseconds.
- */
-export declare function startProfiling(): number | null;
-/**
- * Stops Hermes Sampling Profiler and returns the profile.
- */
-export declare function stopProfiling(): RawThreadCpuProfile | null;
 //# sourceMappingURL=hermes.d.ts.map

package/ts3.8/dist/js/profiling/integration.d.ts

@@ -1,5 +1,7 @@
 import type { Hub } from '@sentry/core';
-import type { EventProcessor, Integration } from '@sentry/types';
+import type { EventProcessor, Integration, ThreadCpuProfile } from '@sentry/types';
+import type { NativeProfileEvent } from './nativeTypes';
+import type { CombinedProfileEvent, HermesProfileEvent } from './types';
 export declare const MAX_PROFILE_DURATION_MS: number;
 /**
  * Profiling integration creates a profile for each transaction and adds it to the event envelope.
@@ -36,4 +38,20 @@ export declare class HermesProfiling implements Integration {
     private _createProfileEventFor;
     private _clearCurrentProfileTimeout;
 }
+/**
+ * Starts Profilers and returns the timestamp when profiling started in nanoseconds.
+ */
+export declare function startProfiling(): number | null;
+/**
+ * Stops Profilers and returns collected combined profile.
+ */
+export declare function stopProfiling(): CombinedProfileEvent | null;
+/**
+ * Merges Hermes and Native profile events into one.
+ */
+export declare function addNativeProfileToHermesProfile(hermes: HermesProfileEvent, native: NativeProfileEvent): CombinedProfileEvent;
+/**
+ * Merges Hermes And Native profiles into one.
+ */
+export declare function addNativeThreadCpuProfileToHermes(hermes: ThreadCpuProfile, native: ThreadCpuProfile, hermes_active_thread_id: string | undefined): CombinedProfileEvent['profile'];
 //# sourceMappingURL=integration.d.ts.map

package/ts3.8/dist/js/profiling/nativeTypes.d.ts

@@ -0,0 +1,43 @@
+export interface NativeProfileEvent {
+    profile_id: string;
+    profile: {
+        samples: {
+            stack_id: number;
+            thread_id: string;
+            queue_address?: string;
+            elapsed_since_start_ns: string;
+        }[];
+        stacks: number[][];
+        frames: {
+            function?: string;
+            instruction_addr?: string;
+        }[];
+        thread_metadata: Record<string, {
+            name?: string;
+            priority?: number;
+        }>;
+        queue_metadata?: Record<string, {
+            label: string;
+        }>;
+    };
+    transaction: {
+        active_thread_id: string;
+    };
+    measurements: Record<string, {
+        values: {
+            elapsed_since_start_ns: number;
+            value: number;
+        }[];
+        unit: string;
+    }>;
+    debug_meta: {
+        images: {
+            type: 'macho';
+            debug_id: string;
+            image_addr: string;
+            image_size: number;
+            code_file: string;
+        }[];
+    };
+}
+//# sourceMappingURL=nativeTypes.d.ts.map

package/ts3.8/dist/js/profiling/types.d.ts

@@ -1,7 +1,18 @@
-import type { ThreadCpuFrame, ThreadCpuProfile } from '@sentry/types';
+import type { Profile, ThreadCpuFrame, ThreadCpuProfile } from '@sentry/types';
+import type { NativeProfileEvent } from './nativeTypes';
 export interface RawThreadCpuProfile extends ThreadCpuProfile {
     frames: ThreadCpuFrame[];
     profile_id?: string;
     active_thread_id: string;
 }
+export type HermesProfileEvent = {
+    platform: 'javascript';
+    version: '1';
+    profile: ThreadCpuProfile;
+    transaction: {
+        active_thread_id: string;
+    };
+};
+export type ProfileEvent = Profile;
+export type CombinedProfileEvent = HermesProfileEvent & Partial<NativeProfileEvent>;
 //# sourceMappingURL=types.d.ts.map

package/ts3.8/dist/js/profiling/utils.d.ts

@@ -1,9 +1,9 @@
-import type { DebugImage, Envelope, Event, Profile } from '@sentry/types';
-import type { RawThreadCpuProfile } from './types';
+import type { Envelope, Event, Profile, ThreadCpuProfile } from '@sentry/types';
+import type { CombinedProfileEvent, HermesProfileEvent, RawThreadCpuProfile } from './types';
 /**
  *
  */
-export declare function isValidProfile(profile: RawThreadCpuProfile): profile is RawThreadCpuProfile & {
+export declare function isValidProfile(profile: ThreadCpuProfile): profile is RawThreadCpuProfile & {
     profile_id: string;
 };
 /**
@@ -17,11 +17,11 @@ export declare function findProfiledTransactionsFromEnvelope(envelope: Envelope)
  * @param event
  * @returns {Profile | null}
  */
-export declare function createProfilingEvent(profile: RawThreadCpuProfile, event: Event): Profile | null;
+export declare function enrichCombinedProfileWithEventContext(profile_id: string, profile: CombinedProfileEvent, event: Event): Profile | null;
 /**
- * Returns debug meta images of the loaded bundle.
+ * Creates profiling event compatible carrier Object from raw Hermes profile.
  */
-export declare function getDebugMetadata(): DebugImage[];
+export declare function createHermesProfilingEvent(profile: RawThreadCpuProfile): HermesProfileEvent;
 /**
  * Adds items to envelope if they are not already present - mutates the envelope.
  * @param envelope

package/ts3.8/dist/js/version.d.ts

@@ -1,4 +1,4 @@
 export declare const SDK_PACKAGE_NAME = "npm:@sentry/react-native";
 export declare const SDK_NAME = "sentry.javascript.react-native";
-export declare const SDK_VERSION = "5.13.1-beta.1";
+export declare const SDK_VERSION = "5.14.0";
 //# sourceMappingURL=version.d.ts.map

package/ts3.8/dist/js/wrapper.d.ts

@@ -3,6 +3,7 @@ import { Platform } from 'react-native';
 import type { NativeAppStartResponse, NativeDeviceContextsResponse, NativeFramesResponse, NativeReleaseResponse, NativeStackFrames, Spec } from './NativeRNSentry';
 import type { ReactNativeClientOptions } from './options';
 import type * as Hermes from './profiling/hermes';
+import type { NativeProfileEvent } from './profiling/nativeTypes';
 export interface Screenshot {
     data: Uint8Array;
     contentType: string;
@@ -47,7 +48,10 @@ interface SentryNativeWrapper {
     fetchModules(): Promise<Record<string, string> | null>;
     fetchViewHierarchy(): PromiseLike<Uint8Array | null>;
     startProfiling(): boolean;
-    stopProfiling(): Hermes.Profile | null;
+    stopProfiling(): {
+        hermesProfile: Hermes.Profile;
+        nativeProfile?: NativeProfileEvent;
+    } | null;
     fetchNativePackageName(): Promise<string | null>;
     /**
      * Fetches native stack frames and debug images for the instructions addresses.