Merge branch 'kw-fix-local-synthetic-symbolication' into kw-fix-onunhandled-synthetic-stack

Author: krystofwoldrich

.eslintignore

@@ -2,7 +2,7 @@
 dist
 
 # Ignore standalone apps
-sample-new-architecture
+samples/react-native
 test/perf/TestApp*
 
 # Ignore dangerfile

.github/workflows/buildandtest.yml

@@ -51,15 +51,15 @@ jobs:
       - uses: actions/cache@v3
         id: cache
         with:
-          path: sample-new-architecture/node_modules
+          path: samples/react-native/node_modules
           key: ${{ runner.os }}-${{ github.sha }}
       - name: Install Dependencies
         if: steps.cache.outputs['cache-hit'] != 'true'
         run: yarn install
-        working-directory: sample-new-architecture
+        working-directory: samples/react-native
       - name: Lint Sample
         run: yarn lint
-        working-directory: sample-new-architecture
+        working-directory: samples/react-native
 
   job_check_integrity:
     name: Check package integrity
@@ -180,20 +180,20 @@ jobs:
         uses: actions/cache@v3
         id: cache-sample
         with:
-          path: sample-new-architecture/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('sample-new-architecture/yarn.lock') }}
+          path: samples/react-native/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('samples/react-native/yarn.lock') }}
       - name: Install Dependencies
         if: ${{ steps.cache.outputs['cache-hit'] != 'true' }}
         run: yarn install
       - name: Install Sample Dependencies
         if: ${{ steps.cache-sample.outputs['cache-hit'] != 'true' }}
         run: yarn install
-        working-directory: sample-new-architecture
+        working-directory: samples/react-native
       - name: Build
         run: yarn build
       - name: Make Sample Build Directory
         run: mkdir build
-        working-directory: sample-new-architecture
+        working-directory: samples/react-native
       - name: Bundle
         run: |
           yarn run react-native bundle \
@@ -203,4 +203,4 @@ jobs:
           --reset-cache \
           --bundle-output build/bundle.${{ matrix.platform }}.js \
           --sourcemap-output build/bundle.${{ matrix.platform }}.map
-        working-directory: sample-new-architecture
+        working-directory: samples/react-native

.github/workflows/codegen.yml

@@ -16,11 +16,11 @@ jobs:
         include:
           - platform: android
             command: |
-              cd sample-new-architecture/android
+              cd samples/react-native/android
               ./gradlew generateCodegenArtifactsFromSchema
           - platform: ios
             command: |
-              cd sample-new-architecture/ios
+              cd samples/react-native/ios
               node ../node_modules/react-native/scripts/generate-codegen-artifacts.js \
                 --path .. \
                 --outputPath codegen
@@ -32,12 +32,12 @@ jobs:
       - uses: actions/cache@v3
         id: cache
         with:
-          path: sample-new-architecture/node_modules
+          path: samples/react-native/node_modules
           key: ${{ runner.os }}-${{ github.sha }}
       - name: Install Dependencies
         if: steps.cache.outputs['cache-hit'] != 'true'
         run: |
-          cd sample-new-architecture
+          cd samples/react-native
           yarn install
       - name: Codegen
         run: ${{ matrix.command }}

.github/workflows/sample-application.yml

@@ -43,7 +43,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         if: ${{ matrix.platform == 'ios' }}
         with:
-          working-directory: sample-new-architecture
+          working-directory: samples/react-native
           ruby-version: '3.2.2' # based on what is used in the sample
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
@@ -61,8 +61,8 @@ jobs:
         with:
           path: |
             node_modules
-            sample-new-architecture/node_modules
-          key: ${{ github.workflow }}-${{ github.job }}-npm-${{ hashFiles('yarn.lock', 'sample-new-architecture/yarn.lock') }}
+            samples/react-native/node_modules
+          key: ${{ github.workflow }}-${{ github.job }}-npm-${{ hashFiles('yarn.lock', 'samples/react-native/yarn.lock') }}
 
       - name: Install SDK Dependencies
         if: ${{ steps.deps-cache.outputs['cache-hit'] != 'true' }}
@@ -73,12 +73,12 @@ jobs:
 
       - name: Install Sample Dependencies
         if: ${{ steps.deps-cache.outputs['cache-hit'] != 'true' }}
-        working-directory: sample-new-architecture
+        working-directory: samples/react-native
         run: yarn install
 
       - name: Install App Pods
         if: ${{ matrix.platform == 'ios' }}
-        working-directory: sample-new-architecture/ios
+        working-directory: samples/react-native/ios
         run: |
           [[ "${{ matrix.build-type }}" == "production" ]] && ENABLE_PROD=1 || ENABLE_PROD=0
           [[ "${{ matrix.rn-architecture }}" == "new" ]] && ENABLE_NEW_ARCH=1 || ENABLE_NEW_ARCH=0
@@ -89,7 +89,7 @@ jobs:
 
       - name: Build Android App
         if: ${{ matrix.platform == 'android' }}
-        working-directory: sample-new-architecture/android
+        working-directory: samples/react-native/android
         run: |
           if [[ ${{ matrix.rn-architecture }} == 'new' ]]; then
             perl -i -pe's/newArchEnabled=false/newArchEnabled=true/g' gradle.properties
@@ -101,7 +101,7 @@ jobs:
 
       - name: Build iOS App
         if: ${{ matrix.platform == 'ios' }}
-        working-directory: sample-new-architecture/ios
+        working-directory: samples/react-native/ios
         run: |
           [[ "${{ matrix.build-type }}" == "production" ]] && CONFIG='Release' || CONFIG='Debug'
           echo "Building $CONFIG"
@@ -123,4 +123,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: build-sample-${{ matrix.rn-architecture }}-${{ matrix.platform }}-${{ matrix.build-type }}-logs
-          path: sample-new-architecture/ios/*.log
+          path: samples/react-native/ios/*.log

.vscode/settings.json

@@ -23,6 +23,6 @@
     "editor.formatOnPaste": false,
     "editor.formatOnSave": false
   },
-  "react-native-tools.projectRoot": "./sample-new-architecture",
+  "react-native-tools.projectRoot": "./samples/sample-new-architecture",
   "dart.flutterAdbConnectOnChromeOs": false
 }

CHANGELOG.md

@@ -71,6 +71,7 @@
 import io.sentry.protocol.User;
 import io.sentry.protocol.ViewHierarchy;
 import io.sentry.util.JsonSerializationUtils;
+import io.sentry.vendor.Base64;
 
 public class RNSentryModuleImpl {
 
@@ -339,11 +340,8 @@ public void fetchNativeFrames(Promise promise) {
         }
     }
 
-    public void captureEnvelope(ReadableArray rawBytes, ReadableMap options, Promise promise) {
-        byte[] bytes = new byte[rawBytes.size()];
-        for (int i = 0; i < rawBytes.size(); i++) {
-            bytes[i] = (byte) rawBytes.getInt(i);
-        }
+    public void captureEnvelope(String rawBytes, ReadableMap options, Promise promise) {
+        byte[] bytes = Base64.decode(rawBytes, Base64.DEFAULT);
 
         try {
             InternalSentrySdk.captureEnvelope(bytes);

CONTRIBUTING.md

@@ -55,7 +55,7 @@ public void fetchNativeFrames(Promise promise) {
     }
 
     @Override
-    public void captureEnvelope(ReadableArray rawBytes, ReadableMap options, Promise promise) {
+    public void captureEnvelope(String rawBytes, ReadableMap options, Promise promise) {
         this.impl.captureEnvelope(rawBytes, options, promise);
     }
 

android/src/main/java/io/sentry/react/RNSentryModuleImpl.java

@@ -54,7 +54,7 @@ public void fetchNativeFrames(Promise promise) {
     }
 
     @ReactMethod
-    public void captureEnvelope(ReadableArray rawBytes, ReadableMap options, Promise promise) {
+    public void captureEnvelope(String rawBytes, ReadableMap options, Promise promise) {
         this.impl.captureEnvelope(rawBytes, options, promise);
     }
 

android/src/newarch/java/io/sentry/react/RNSentryModule.java

@@ -396,16 +396,12 @@ - (NSDictionary*) fetchNativeStackFramesBy: (NSArray<NSNumber*>*)instructionsAdd
               });
 }
 
-RCT_EXPORT_METHOD(captureEnvelope:(NSArray * _Nonnull)bytes
+RCT_EXPORT_METHOD(captureEnvelope:(NSString * _Nonnull)rawBytes
                   options: (NSDictionary * _Nonnull)options
                   resolve:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    NSMutableData *data = [[NSMutableData alloc] initWithCapacity: [bytes count]];
-    for(NSNumber *number in bytes) {
-        char byte = [number charValue];
-        [data appendBytes: &byte length: 1];
-    }
+    NSData *data = [[NSData alloc] initWithBase64EncodedString:rawBytes options:0];
 
     SentryEnvelope *envelope = [PrivateSentrySDKOnly envelopeWithData:data];
     if (envelope == nil) {

android/src/oldarch/java/io/sentry/react/RNSentryModule.java

@@ -34,8 +34,8 @@
     "lint:eslint": "eslint --config .eslintrc.js .",
     "lint:prettier": "prettier --check \"{src,test,scripts}/**/**.ts\"",
     "test:watch": "jest --watch",
-    "run-ios": "cd sample-new-architecture && yarn react-native run-ios",
-    "run-android": "cd sample-new-architecture && yarn react-native run-android",
+    "run-ios": "cd samples/react-native && yarn react-native run-ios",
+    "run-android": "cd samples/react-native && 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": [
@@ -70,7 +70,7 @@
   "devDependencies": {
     "@sentry-internal/eslint-config-sdk": "7.81.1",
     "@sentry-internal/eslint-plugin-sdk": "7.81.1",
-    "@sentry/typescript": "^5.20.1",
+    "@sentry-internal/typescript": "7.80.0",
     "@sentry/wizard": "3.16.3",
     "@types/jest": "^29.5.3",
     "@types/node": "^20.9.3",

ios/RNSentry.mm

@@ -3,17 +3,17 @@ apply plugin: "com.facebook.react"
 apply plugin: "io.sentry.android.gradle"
 
 project.ext.sentryCli = [
-    collectModulesScript: "../../../dist/js/tools/collectModules.js",
+    collectModulesScript: "../../../../dist/js/tools/collectModules.js",
     modulesPaths: [
       "node_modules",
-      "../..",
+      "../../..",
     ],
     skipCollectModules: false,
-    copyDebugIdScript: "../../../scripts/copy-debugid.js",
-    hasSourceMapDebugIdScript: "../../../scripts/has-sourcemap-debugid.js",
+    copyDebugIdScript: "../../../../scripts/copy-debugid.js",
+    hasSourceMapDebugIdScript: "../../../../scripts/has-sourcemap-debugid.js",
 ]
 
-apply from: "../../../sentry.gradle"
+apply from: "../../../../sentry.gradle"
 
 sentry {
     // Whether the plugin should attempt to auto-upload the mapping file to Sentry or not.

package.json

@@ -5,7 +5,7 @@ module.exports = {
       'module-resolver',
       {
         alias: {
-          '@sentry/react-native': '../dist/js',
+          '@sentry/react-native': '../../dist/js',
         },
       },
     ],

sample-new-architecture/.eslintrc.js renamed to samples/react-native/.eslintrc.js

@@ -12,7 +12,7 @@ export NODE_BINARY=$(command -v node)
 
 export EXTRA_COMPILER_ARGS="-w"
 
-export SENTRY_CLI_EXECUTABLE="../../node_modules/@sentry/cli/bin/sentry-cli"
+export SENTRY_CLI_EXECUTABLE="../../../node_modules/@sentry/cli/bin/sentry-cli"
 export SENTRY_CLI_EXTRA_ARGS="--force-foreground"
 export SENTRY_CLI_DEBUG_FILES_UPLOAD_EXTRA_ARGS=""
 export SENTRY_CLI_RN_XCODE_EXTRA_ARGS=""

sample-new-architecture/.gitignore renamed to samples/react-native/.gitignore

@@ -50,7 +50,7 @@ target 'sampleNewArchitecture' do
   end
 
   if !ENV['TEST']
-    pod 'RNSentry', :path => '../..'
+    pod 'RNSentry', :path => '../../..'
   end
 
   target 'sampleNewArchitectureTests' do

sample-new-architecture/.prettierrc.js renamed to samples/react-native/.prettierrc.js

@@ -271,7 +271,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "set -e\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\nBUNDLE_REACT_NATIVE=\"/bin/sh ../../scripts/sentry-xcode.sh $REACT_NATIVE_XCODE\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT \\\"$BUNDLE_REACT_NATIVE\\\"\"\n";
+			shellScript = "set -e\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\nBUNDLE_REACT_NATIVE=\"/bin/sh ../../../scripts/sentry-xcode.sh $REACT_NATIVE_XCODE\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT \\\"$BUNDLE_REACT_NATIVE\\\"\"\n";
 		};
 		00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -303,7 +303,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "/bin/sh ../../scripts/sentry-xcode-debug-files.sh\n";
+			shellScript = "/bin/sh ../../../scripts/sentry-xcode-debug-files.sh\n";
 		};
 		A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;

sample-new-architecture/.ruby-version renamed to samples/react-native/.ruby-version

@@ -4,8 +4,8 @@ const blacklist = require('metro-config/src/defaults/exclusionList');
 
 const {
   createSentryMetroSerializer,
-} = require('../dist/js/tools/sentryMetroSerializer');
-const parentDir = path.resolve(__dirname, '..');
+} = require('../../dist/js/tools/sentryMetroSerializer');
+const parentDir = path.resolve(__dirname, '../..');
 
 /**
  * Metro configuration

sample-new-architecture/.watchmanconfig renamed to samples/react-native/.watchmanconfig

@@ -1,5 +1,5 @@
 {
-  "name": "sample-new-architecture",
+  "name": "sentry-react-native-bare-sample",
   "version": "0.0.1",
   "private": true,
   "scripts": {

sample-new-architecture/Gemfile renamed to samples/react-native/Gemfile

@@ -6,7 +6,7 @@ const path = require('path');
 module.exports = {
   dependencies: {
     RNSentry: {
-      root: path.resolve(__dirname, '..'),
+      root: path.resolve(__dirname, '../../'),
     },
   },
 };

sample-new-architecture/Gemfile.lock renamed to samples/react-native/Gemfile.lock

@@ -8,7 +8,7 @@
     "skipLibCheck": true,                                 /* Skip type checking all .d.ts files. */
     "baseUrl": ".",
     "paths": {
-      "@sentry/react-native": ["../"]
+      "@sentry/react-native": ["../../"]
     },
   },
 }

sample-new-architecture/__tests__/App-test.tsx renamed to samples/react-native/__tests__/App-test.tsx

@@ -29,7 +29,7 @@ if [[ -n "$NODE_BINARY" ]]; then
 fi
 
 thisFilePath=$(dirname $0)
-collectModulesScript="$thisFilePath/../dist/js/tools/collectModules.js"
+collectModulesScript="$thisFilePath/../../dist/js/tools/collectModules.js"
 
 destination="$CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH"
 modulesOutput="$destination/modules.json"

sample-new-architecture/_bundle/config renamed to samples/react-native/_bundle/config

@@ -3,7 +3,7 @@ set -euo pipefail
 
 tagPrefix=''
 repo="https://github.com/getsentry/sentry-javascript.git"
-packages=('@sentry/browser' '@sentry/core' '@sentry/hub' '@sentry/integrations' '@sentry/react' '@sentry/types' '@sentry/utils')
+packages=('@sentry/browser' '@sentry/core' '@sentry/hub' '@sentry/integrations' '@sentry/react' '@sentry/types' '@sentry/utils' '@sentry-internal/typescript')
 packages+=('@sentry-internal/eslint-config-sdk' '@sentry-internal/eslint-plugin-sdk')
 
 . $(dirname "$0")/update-package-json.sh

sample-new-architecture/_node-version renamed to samples/react-native/_node-version

@@ -8,7 +8,7 @@ import type { UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
 export interface Spec extends TurboModule {
   addBreadcrumb(breadcrumb: UnsafeObject): void;
   captureEnvelope(
-    bytes: number[],
+    bytes: string,
     options: {
       store: boolean;
     },