Merge branch 'main' into feedback-ui

# Conflicts:
#	CHANGELOG.md

Author: antonis

.github/workflows/update-deps.yml

@@ -56,6 +56,15 @@ jobs:
     secrets:
       api-token: ${{ secrets.CI_DEPLOY_KEY }}
 
+  bundler-plugins:
+    uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
+    with:
+      path: scripts/update-bundler-plugins.sh
+      name: Bundler Plugins
+      pr-strategy: update
+    secrets:
+      api-token: ${{ secrets.CI_DEPLOY_KEY }}
+
   sample-rn:
     uses: getsentry/github-workflows/.github/workflows/updater.yml@v2
     with:

CHANGELOG.md

@@ -20,11 +20,33 @@
   <FeedbackForm/>
   ```
 
+- Add `ignoredComponents` option to `annotateReactComponents` to exclude specific components from React component annotations ([#4517](https://github.com/getsentry/sentry-react-native/pull/4517))
+
+  ```js
+  // metro.config.js
+  // for React Native
+  const config = withSentryConfig(mergedConfig, {
+    annotateReactComponents: {
+      ignoredComponents: ['MyCustomComponent']
+    }
+  });
+
+  // for Expo
+  const config = getSentryExpoConfig(__dirname, {
+    annotateReactComponents: {
+      ignoredComponents: ['MyCustomComponent'],
+    },
+  });
+  ```
+
 ### Dependencies
 
 - Bump JavaScript SDK from v8.53.0 to v8.54.0 ([#4503](https://github.com/getsentry/sentry-react-native/pull/4503))
   - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#8540)
   - [diff](https://github.com/getsentry/sentry-javascript/compare/8.53.0...8.54.0)
+- Bump `@sentry/babel-plugin-component-annotate` from v2.20.1 to v3.1.2 ([#4516](https://github.com/getsentry/sentry-react-native/pull/4516))
+  - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#312)
+  - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/2.20.1...3.1.2)
 
 ## 6.6.0
 

packages/core/package.json

@@ -65,7 +65,7 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/babel-plugin-component-annotate": "2.20.1",
+    "@sentry/babel-plugin-component-annotate": "3.1.2",
     "@sentry/browser": "8.54.0",
     "@sentry/cli": "2.41.1",
     "@sentry/core": "8.54.0",

packages/core/src/js/tools/metroconfig.ts

@@ -5,7 +5,10 @@ import * as process from 'process';
 import { env } from 'process';
 
 import { enableLogger } from './enableLogger';
-import { setSentryDefaultBabelTransformerPathEnv } from './sentryBabelTransformerUtils';
+import {
+  setSentryBabelTransformerOptions,
+  setSentryDefaultBabelTransformerPathEnv,
+} from './sentryBabelTransformerUtils';
 import { createSentryMetroSerializer, unstable_beforeAssetSerializationPlugin } from './sentryMetroSerializer';
 import type { DefaultConfigOptions } from './vendor/expo/expoconfig';
 export * from './sentryMetroSerializer';
@@ -18,7 +21,11 @@ export interface SentryMetroConfigOptions {
    * Annotates React components with Sentry data.
    * @default false
    */
-  annotateReactComponents?: boolean;
+  annotateReactComponents?:
+    | boolean
+    | {
+        ignoredComponents?: string[];
+      };
   /**
    * Adds the Sentry replay package for web.
    * @default true
@@ -60,7 +67,7 @@ export function withSentryConfig(
   newConfig = withSentryDebugId(newConfig);
   newConfig = withSentryFramesCollapsed(newConfig);
   if (annotateReactComponents) {
-    newConfig = withSentryBabelTransformer(newConfig);
+    newConfig = withSentryBabelTransformer(newConfig, annotateReactComponents);
   }
   if (includeWebReplay === false) {
     newConfig = withSentryResolver(newConfig, includeWebReplay);
@@ -92,7 +99,7 @@ export function getSentryExpoConfig(
 
   let newConfig = withSentryFramesCollapsed(config);
   if (options.annotateReactComponents) {
-    newConfig = withSentryBabelTransformer(newConfig);
+    newConfig = withSentryBabelTransformer(newConfig, options.annotateReactComponents);
   }
 
   if (options.includeWebReplay === false) {
@@ -129,7 +136,10 @@ function loadExpoMetroConfigModule(): {
 /**
  * Adds Sentry Babel transformer to the Metro config.
  */
-export function withSentryBabelTransformer(config: MetroConfig): MetroConfig {
+export function withSentryBabelTransformer(
+  config: MetroConfig,
+  annotateReactComponents: true | { ignoredComponents?: string[] },
+): MetroConfig {
   const defaultBabelTransformerPath = config.transformer && config.transformer.babelTransformerPath;
   logger.debug('Default Babel transformer path from `config.transformer`:', defaultBabelTransformerPath);
 
@@ -146,6 +156,12 @@ export function withSentryBabelTransformer(config: MetroConfig): MetroConfig {
     setSentryDefaultBabelTransformerPathEnv(defaultBabelTransformerPath);
   }
 
+  if (typeof annotateReactComponents === 'object') {
+    setSentryBabelTransformerOptions({
+      annotateReactComponents,
+    });
+  }
+
   return {
     ...config,
     transformer: {

packages/core/src/js/tools/sentryBabelTransformer.ts

@@ -1,42 +1,8 @@
-import componentAnnotatePlugin from '@sentry/babel-plugin-component-annotate';
-
 import { enableLogger } from './enableLogger';
-import { loadDefaultBabelTransformer } from './sentryBabelTransformerUtils';
-import type { BabelTransformer, BabelTransformerArgs } from './vendor/metro/metroBabelTransformer';
+import { createSentryBabelTransformer } from './sentryBabelTransformerUtils';
 
 enableLogger();
 
-/**
- * Creates a Babel transformer with Sentry component annotation plugin.
- */
-function createSentryBabelTransformer(): BabelTransformer {
-  const defaultTransformer = loadDefaultBabelTransformer();
-
-  // Using spread operator to avoid any conflicts with the default transformer
-  const transform: BabelTransformer['transform'] = (...args) => {
-    const transformerArgs = args[0];
-
-    addSentryComponentAnnotatePlugin(transformerArgs);
-
-    return defaultTransformer.transform(...args);
-  };
-
-  return {
-    ...defaultTransformer,
-    transform,
-  };
-}
-
-function addSentryComponentAnnotatePlugin(args: BabelTransformerArgs | undefined): void {
-  if (!args || typeof args.filename !== 'string' || !Array.isArray(args.plugins)) {
-    return undefined;
-  }
-
-  if (!args.filename.includes('node_modules')) {
-    args.plugins.push(componentAnnotatePlugin);
-  }
-}
-
 const sentryBabelTransformer = createSentryBabelTransformer();
 // With TS set to `commonjs` this will be translated to `module.exports = sentryBabelTransformer;`
 // which will be correctly picked up by Metro

packages/core/src/js/tools/sentryBabelTransformerUtils.ts

@@ -1,9 +1,13 @@
+import componentAnnotatePlugin from '@sentry/babel-plugin-component-annotate';
 import { logger } from '@sentry/core';
 import * as process from 'process';
 
-import type { BabelTransformer } from './vendor/metro/metroBabelTransformer';
+import type { BabelTransformer, BabelTransformerArgs } from './vendor/metro/metroBabelTransformer';
+
+export type SentryBabelTransformerOptions = { annotateReactComponents?: { ignoredComponents?: string[] } };
 
 export const SENTRY_DEFAULT_BABEL_TRANSFORMER_PATH = 'SENTRY_DEFAULT_BABEL_TRANSFORMER_PATH';
+export const SENTRY_BABEL_TRANSFORMER_OPTIONS = 'SENTRY_BABEL_TRANSFORMER_OPTIONS';
 
 /**
  * Sets default Babel transformer path to the environment variables.
@@ -35,3 +39,85 @@ export function loadDefaultBabelTransformer(): BabelTransformer {
   // eslint-disable-next-line @typescript-eslint/no-var-requires
   return require(defaultBabelTransformerPath);
 }
+
+/**
+ *
+ */
+export function setSentryBabelTransformerOptions(options: SentryBabelTransformerOptions): void {
+  let optionsString: string | null = null;
+  try {
+    logger.debug(`Stringifying Sentry Babel transformer options`, options);
+    optionsString = JSON.stringify(options);
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.error('Failed to stringify Sentry Babel transformer options', e);
+  }
+
+  if (!optionsString) {
+    return;
+  }
+
+  logger.debug(`Sentry Babel transformer options set to ${SENTRY_BABEL_TRANSFORMER_OPTIONS}`, optionsString);
+  process.env[SENTRY_BABEL_TRANSFORMER_OPTIONS] = optionsString;
+}
+
+/**
+ *
+ */
+export function getSentryBabelTransformerOptions(): SentryBabelTransformerOptions | undefined {
+  const optionsString = process.env[SENTRY_BABEL_TRANSFORMER_OPTIONS];
+  if (!optionsString) {
+    logger.debug(
+      `Sentry Babel transformer options environment variable ${SENTRY_BABEL_TRANSFORMER_OPTIONS} is not set`,
+    );
+    return undefined;
+  }
+
+  try {
+    logger.debug(`Parsing Sentry Babel transformer options from ${optionsString}`);
+    return JSON.parse(optionsString);
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.error('Failed to parse Sentry Babel transformer options', e);
+    return undefined;
+  }
+}
+
+/**
+ * Creates a Babel transformer with Sentry component annotation plugin.
+ */
+export function createSentryBabelTransformer(): BabelTransformer {
+  const defaultTransformer = loadDefaultBabelTransformer();
+  const options = getSentryBabelTransformerOptions();
+
+  // Using spread operator to avoid any conflicts with the default transformer
+  const transform: BabelTransformer['transform'] = (...args) => {
+    const transformerArgs = args[0];
+
+    addSentryComponentAnnotatePlugin(transformerArgs, options?.annotateReactComponents);
+
+    return defaultTransformer.transform(...args);
+  };
+
+  return {
+    ...defaultTransformer,
+    transform,
+  };
+}
+
+function addSentryComponentAnnotatePlugin(
+  args: BabelTransformerArgs | undefined,
+  options: SentryBabelTransformerOptions['annotateReactComponents'] | undefined,
+): void {
+  if (!args || typeof args.filename !== 'string' || !Array.isArray(args.plugins)) {
+    return undefined;
+  }
+
+  if (!args.filename.includes('node_modules')) {
+    if (options) {
+      args.plugins.push([componentAnnotatePlugin, options]);
+    } else {
+      args.plugins.push(componentAnnotatePlugin);
+    }
+  }
+}

packages/core/test/tools/metroconfig.test.ts

@@ -8,13 +8,21 @@ import {
   withSentryFramesCollapsed,
   withSentryResolver,
 } from '../../src/js/tools/metroconfig';
-import { SENTRY_DEFAULT_BABEL_TRANSFORMER_PATH } from '../../src/js/tools/sentryBabelTransformerUtils';
+import {
+  SENTRY_BABEL_TRANSFORMER_OPTIONS,
+  SENTRY_DEFAULT_BABEL_TRANSFORMER_PATH,
+} from '../../src/js/tools/sentryBabelTransformerUtils';
 
 type MetroFrame = Parameters<Required<Required<MetroConfig>['symbolicator']>['customizeFrame']>[0];
 
 describe('metroconfig', () => {
   beforeEach(() => {
     jest.clearAllMocks();
+
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete process.env[SENTRY_BABEL_TRANSFORMER_OPTIONS];
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete process.env[SENTRY_DEFAULT_BABEL_TRANSFORMER_PATH];
   });
 
   test('getSentryExpoConfig keeps compatible interface with Expos getDefaultConfig', () => {
@@ -55,35 +63,78 @@ describe('metroconfig', () => {
     test.each([[{}], [{ transformer: {} }], [{ transformer: { hermesParser: true } }]])(
       "does not add babel transformer none is set in the config object '%o'",
       input => {
-        expect(withSentryBabelTransformer(JSON.parse(JSON.stringify(input)))).toEqual(input);
+        expect(withSentryBabelTransformer(JSON.parse(JSON.stringify(input)), {})).toEqual(input);
       },
     );
 
     test('save default babel transformer path to environment variable', () => {
       const defaultBabelTransformerPath = '/default/babel/transformer';
 
-      withSentryBabelTransformer({
-        transformer: {
-          babelTransformerPath: defaultBabelTransformerPath,
+      withSentryBabelTransformer(
+        {
+          transformer: {
+            babelTransformerPath: defaultBabelTransformerPath,
+          },
         },
-      });
+        {},
+      );
 
       expect(process.env[SENTRY_DEFAULT_BABEL_TRANSFORMER_PATH]).toBe(defaultBabelTransformerPath);
     });
 
     test('return config with sentry babel transformer path', () => {
       const defaultBabelTransformerPath = 'defaultBabelTransformerPath';
 
-      const config = withSentryBabelTransformer({
-        transformer: {
-          babelTransformerPath: defaultBabelTransformerPath,
+      const config = withSentryBabelTransformer(
+        {
+          transformer: {
+            babelTransformerPath: defaultBabelTransformerPath,
+          },
         },
-      });
+        {},
+      );
 
       expect(config.transformer?.babelTransformerPath).toBe(
         require.resolve('../../src/js/tools/sentryBabelTransformer'),
       );
     });
+
+    test('save babel transformer options to environment variable', () => {
+      withSentryBabelTransformer(
+        {
+          transformer: {
+            babelTransformerPath: 'path/to/babel/transformer',
+          },
+        },
+        {
+          ignoredComponents: ['MyCustomComponent'],
+        },
+      );
+
+      expect(process.env[SENTRY_BABEL_TRANSFORMER_OPTIONS]).toBe(
+        JSON.stringify({
+          annotateReactComponents: {
+            ignoredComponents: ['MyCustomComponent'],
+          },
+        }),
+      );
+    });
+
+    test('gracefully handle none serializable babel transformer options', () => {
+      withSentryBabelTransformer(
+        {
+          transformer: {
+            babelTransformerPath: 'path/to/babel/transformer',
+          },
+        },
+        {
+          ignoredComponents: ['MyCustomComponent'],
+          nonSerializable: BigInt(1),
+        } as any,
+      );
+
+      expect(process.env[SENTRY_BABEL_TRANSFORMER_OPTIONS]).toBeUndefined();
+    });
   });
 
   describe('withSentryResolver', () => {