fix(profiling): Create profiles for start up transactions (#3281)

getsentry · Sep 15, 2023 · 4cc74aa · 4cc74aa
1 parent be4595b
commit 4cc74aa
Show file tree

Hide file tree

Showing 4 changed files with 180 additions and 118 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Fixes
+
+- Create profiles for start up transactions ([#3281](https://github.com/getsentry/sentry-react-native/pull/3281))
+
 ### Dependencies
 
 - Bump CLI from v2.20.5 to v2.20.7 ([#3265](https://github.com/getsentry/sentry-react-native/pull/3265), [#3273](https://github.com/getsentry/sentry-react-native/pull/3273))

diff --git a/src/js/profiling/integration.ts b/src/js/profiling/integration.ts
@@ -1,4 +1,6 @@
-import type { Envelope, Event, EventProcessor, Hub, Integration, Profile, Transaction } from '@sentry/types';
+import type { Hub } from '@sentry/core';
+import { getActiveTransaction } from '@sentry/core';
+import type { Envelope, Event, EventProcessor, Integration, Profile, Transaction } from '@sentry/types';
 import { logger, uuid4 } from '@sentry/utils';
 
 import { isHermesEnabled } from '../utils/environment';
@@ -51,21 +53,10 @@ export class HermesProfiling implements Integration {
       return;
     }
 
-    client.on('startTransaction', (transaction: Transaction) => {
-      this._finishCurrentProfile();
+    this._startCurrentProfileForActiveTransaction();
+    client.on('startTransaction', this._startCurrentProfile);
 
-      const shouldStartProfiling = this._shouldStartProfiling(transaction);
-      if (!shouldStartProfiling) {
-        return;
-      }
-
-      this._currentProfileTimeout = setTimeout(this._finishCurrentProfile, MAX_PROFILE_DURATION_MS);
-      this._startNewProfile(transaction);
-    });
-
-    client.on('finishTransaction', () => {
-      this._finishCurrentProfile();
-    });
+    client.on('finishTransaction', this._finishCurrentProfile);
 
     client.on('beforeEnvelope', (envelope: Envelope) => {
       if (!PROFILE_QUEUE.size()) {
@@ -89,6 +80,26 @@ export class HermesProfiling implements Integration {
     });
   }
 
+  private _startCurrentProfileForActiveTransaction = (): void => {
+    if (this._currentProfile) {
+      return;
+    }
+    const transaction = this._getCurrentHub && getActiveTransaction(this._getCurrentHub());
+    transaction && this._startCurrentProfile(transaction);
+  };
+
+  private _startCurrentProfile = (transaction: Transaction): void => {
+    this._finishCurrentProfile();
+
+    const shouldStartProfiling = this._shouldStartProfiling(transaction);
+    if (!shouldStartProfiling) {
+      return;
+    }
+
+    this._currentProfileTimeout = setTimeout(this._finishCurrentProfile, MAX_PROFILE_DURATION_MS);
+    this._startNewProfile(transaction);
+  };
+
   private _shouldStartProfiling = (transaction: Transaction): boolean => {
     if (!transaction.sampled) {
       logger.log('[Profiling] Transaction is not sampled, skipping profiling');

diff --git a/src/js/sdk.tsx b/src/js/sdk.tsx
@@ -121,6 +121,9 @@ export function init(passedOptions: ReactNativeOptions): void {
     if (options.enableNative) {
       defaultIntegrations.push(new DeviceContext());
     }
+    if (options._experiments && typeof options._experiments.profilesSampleRate === 'number') {
+      defaultIntegrations.push(new HermesProfiling());
+    }
     if (hasTracingEnabled(options) && options.enableAutoPerformanceTracing) {
       defaultIntegrations.push(new ReactNativeTracing());
     }
@@ -133,9 +136,6 @@ 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({