[Flask] bitrise pipelines

app/components/Nav/App/index.js

@@ -32,7 +32,7 @@ import branch from 'react-native-branch';
 import AppConstants from '../../../core/AppConstants';
 import Logger from '../../../util/Logger';
 import { trackErrorAsAnalytics } from '../../../util/analyticsV2';
-import { routingInstrumentation } from '../../../util/sentryUtils';
+import { routingInstrumentation } from '../../../util/sentry/sentryUtils';
 import Analytics from '../../../core/Analytics/Analytics';
 import { connect, useSelector, useDispatch } from 'react-redux';
 import {

app/util/sentryUtils.js → app/util/sentry/sentryUtils.js

@@ -1,12 +1,12 @@
 /* eslint-disable import/no-namespace */
 import * as Sentry from '@sentry/react-native';
 import { Dedupe, ExtraErrorData } from '@sentry/integrations';
-import extractEthJsErrorMessage from './extractEthJsErrorMessage';
+import extractEthJsErrorMessage from '../extractEthJsErrorMessage';
 import DefaultPreference from 'react-native-default-preference';
-import { AGREED, METRICS_OPT_IN } from '../constants/storage';
+import { AGREED, METRICS_OPT_IN } from '../../constants/storage';
 
 const METAMASK_ENVIRONMENT = process.env['METAMASK_ENVIRONMENT'] || 'local'; // eslint-disable-line dot-notation
-const METAMASK_BUILD_TYPE = process.env.METAMASK_BUILD_TYPE || 'main';
+const METAMASK_BUILD_TYPE = process.env['METAMASK_BUILD_TYPE'] || 'main'; // eslint-disable-line dot-notation
 
 const ERROR_URL_ALLOWLIST = [
   'cryptocompare.com',
@@ -150,24 +150,54 @@ function sanitizeAddressesFromErrorMessages(report) {
   });
 }
 
+/**
+ * Derives the Sentry environment based on input parameters.
+ * This function is similar to the environment logic used in MetaMask extension.
+ * - https://github.com/MetaMask/metamask-extension/blob/34375a57e558853aab95fe35d5f278aa52b66636/app/scripts/lib/setupSentry.js#L91
+ *
+ * @param {boolean} isDev - Represents if the current environment is development (__DEV__ global variable).
+ * @param {string} [metamaskEnvironment='local'] - The environment MetaMask is running in
+ *                                                  (process.env.METAMASK_ENVIRONMENT).
+ *                                                  It defaults to 'local' if not provided.
+ * @param {string} [metamaskBuildType='main'] - The build type of MetaMask
+ *                                              (process.env.METAMASK_BUILD_TYPE).
+ *                                              It defaults to 'main' if not provided.
+ *
+ * @returns {string} - The Sentry environment. Possible values are 'development', 'local',
+ *                     'production', or a string in the format `${metamaskEnvironment}-${metamaskBuildType}`.
+ *                     'development' is returned if 'isDev' is true or 'metamaskEnvironment' is not provided.
+ *                     'metamaskEnvironment' is returned if 'metamaskBuildType' is 'main' or undefined.
+ *                     `${metamaskEnvironment}-${metamaskBuildType}` is returned for other cases,
+ *                     for example 'production-flask' or 'debug-flask'.
+ */
+export function deriveSentryEnvironment(
+  isDev,
+  metamaskEnvironment = 'local',
+  metamaskBuildType = 'main',
+) {
+  const environment =
+    isDev || !metamaskEnvironment
+      ? 'development'
+      : metamaskBuildType === 'main'
+      ? metamaskEnvironment
+      : `${metamaskEnvironment}-${metamaskBuildType}`;
+
+  return environment;
+}
+
 // Setup sentry remote error reporting
 export function setupSentry() {
   const init = async () => {
     const dsn = process.env.MM_SENTRY_DSN;
 
-    /* Similar to the environment logic we use on extension:
-     - https://github.com/MetaMask/metamask-extension/blob/34375a57e558853aab95fe35d5f278aa52b66636/app/scripts/lib/setupSentry.js#L91
-    */
-    const environment =
-      __DEV__ || !METAMASK_ENVIRONMENT
-        ? 'development'
-        : METAMASK_BUILD_TYPE === 'main'
-        ? METAMASK_ENVIRONMENT
-        : `${METAMASK_ENVIRONMENT}-${METAMASK_BUILD_TYPE}`;
-
     const metricsOptIn = await DefaultPreference.get(METRICS_OPT_IN);
 
     const integrations = [new Dedupe(), new ExtraErrorData()];
+    const environment = deriveSentryEnvironment(
+      __DEV__,
+      METAMASK_ENVIRONMENT,
+      METAMASK_BUILD_TYPE,
+    );
 
     Sentry.init({
       dsn,

app/util/sentry/sentryUtils.test.ts

@@ -0,0 +1,68 @@
+/* eslint-disable dot-notation */
+import { deriveSentryEnvironment } from './sentryUtils';
+
+describe('deriveSentryEnvironment', () => {
+  test('should return production-flask for environment if __DEV__ is false, METAMASK_ENVIRONMENT is production, and METAMASK_BUILD_TYPE is flask', async () => {
+    const METAMASK_ENVIRONMENT = 'production';
+    const METAMASK_BUILD_TYPE = 'flask';
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(
+      isDev,
+      METAMASK_ENVIRONMENT,
+      METAMASK_BUILD_TYPE,
+    );
+    expect(env).toBe('production-flask');
+  });
+
+  test('should return local-flask for environment if __DEV__ is false, METAMASK_ENVIRONMENT is undefined, and METAMASK_BUILD_TYPE is flask', async () => {
+    const METAMASK_BUILD_TYPE = 'flask';
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(isDev, undefined, METAMASK_BUILD_TYPE);
+    expect(env).toBe('local-flask');
+  });
+
+  test('should return debug-flask for environment if __DEV__ is false, METAMASK_ENVIRONMENT is debug, and METAMASK_BUILD_TYPE is flask', async () => {
+    const METAMASK_BUILD_TYPE = 'flask';
+    const METAMASK_ENVIRONMENT = 'debug';
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(
+      isDev,
+      METAMASK_ENVIRONMENT,
+      METAMASK_BUILD_TYPE,
+    );
+    expect(env).toBe('debug-flask');
+  });
+
+  test('should return local for environment if __DEV__ is false, METAMASK_ENVIRONMENT is local, and METAMASK_BUILD_TYPE is undefined', async () => {
+    const isDev = false;
+    const METAMASK_ENVIRONMENT = 'local';
+
+    const env = deriveSentryEnvironment(isDev, METAMASK_ENVIRONMENT);
+    expect(env).toBe('local');
+  });
+
+  test('should return local for environment if __DEV__ is false, and both METAMASK_ENVIRONMENT and METAMASK_BUILD_TYPE are undefined', async () => {
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(isDev);
+    expect(env).toBe('local');
+  });
+
+  test('should return production for environment if __DEV__ is false, METAMASK_ENVIRONMENT is production, and METAMASK_BUILD_TYPE is undefined', async () => {
+    const METAMASK_ENVIRONMENT = 'production';
+    const isDev = false;
+
+    const env = deriveSentryEnvironment(isDev, METAMASK_ENVIRONMENT, undefined);
+    expect(env).toBe('production');
+  });
+
+  test('should return development for environment if __DEV__ is true', async () => {
+    const isDev = true;
+
+    const env = deriveSentryEnvironment(isDev, '', '');
+    expect(env).toBe('development');
+  });
+});

index.js

@@ -10,7 +10,7 @@ import crypto from 'crypto'; // eslint-disable-line import/no-nodejs-modules, no
 require('react-native-browser-polyfill'); // eslint-disable-line import/no-commonjs
 
 import * as Sentry from '@sentry/react-native'; // eslint-disable-line import/no-namespace
-import { setupSentry } from './app/util/sentryUtils';
+import { setupSentry } from './app/util/sentry/sentryUtils';
 setupSentry();
 
 import { AppRegistry, LogBox } from 'react-native';