Merge branch 'main' into alwx/refactor/migrate-private-sentry-sdk-only

alwx · web-flow · commit 5dbbe5a35d8e · 2026-07-06T13:52:04.000+02:00
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -34,6 +34,28 @@ jobs:
       - name: Test
         run: yarn test
 
+  job_native_link_check:
+    name: Android Native Link Check
+    runs-on: ubuntu-latest
+    needs: [diff_check]
+    if: ${{ needs.diff_check.outputs.skip_ci != 'true' }}
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - run: corepack enable
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6
+        with:
+          package-manager-cache: false
+          node-version: 18
+          cache: 'yarn'
+          cache-dependency-path: yarn.lock
+      - name: Install Dependencies
+        run: yarn install
+      # Guards against regressing the #6398 fix: verifies libsentry-tm-perf-logger.so
+      # still links for armeabi-v7a under --no-undefined when the reactnative prefab
+      # reference is unresolved. Uses the runner's preinstalled NDK (ANDROID_NDK_LATEST_HOME).
+      - name: Check libsentry-tm-perf-logger.so links (armeabi-v7a)
+        run: ./scripts/check-tm-perf-logger-link.sh
+
   job_lint:
     name: Lint
     runs-on: ubuntu-latest
diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml
@@ -187,7 +187,11 @@ jobs:
         run: |
           [[ "${{ matrix.build-type }}" == "production" ]] && CONFIG='Release' || CONFIG='Debug'
           echo "Building $CONFIG"
-          ./gradlew ":app:assemble$CONFIG" -PreactNativeArchitectures=x86
+          # Build all ABIs (not just x86): the Sentry perf-logger native library is
+          # compiled from source per ABI, and #6398 (armeabi-v7a link failure) was
+          # reported on an Expo build. Keeps ABI coverage consistent with the bare
+          # RN sample.
+          ./gradlew ":app:assemble$CONFIG" -PreactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 
       - name: Export Expo
         working-directory: samples/expo
diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml
@@ -185,7 +185,12 @@ jobs:
           [[ "${{ matrix.build-type }}" == "production" ]] && export CONFIG='release' || export CONFIG='debug'
 
           ./scripts/set-dsn-aos.mjs
-          ./scripts/build-android.sh -PreactNativeArchitectures=x86
+          # Build all ABIs (not just x86) so armeabi-v7a and the 64-bit ABIs are
+          # exercised too. The Sentry perf-logger native library is compiled from
+          # source per ABI, and ABI-specific breakage has shipped before (#6394
+          # 16 KB alignment, #6398 armeabi-v7a link) precisely because CI only
+          # built x86. The 16 KB alignment check below then runs across every ABI.
+          ./scripts/build-android.sh -PreactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 
       - name: Check 16 KB native library alignment
         # Only Sentry-owned libraries are checked: third-party/React Native
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,22 +6,26 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
-## Unreleased
+## 8.17.2
 
 ### Fixes
 
+- Fix Android New Architecture build failing to link `libsentry-tm-perf-logger.so` with an undefined `TurboModulePerfLogger::enableLogging` symbol on some setups (e.g. armeabi-v7a) ([#6406](https://github.com/getsentry/sentry-react-native/pull/6406))
 - Fix Android New Architecture build failing at CMake configure on React Native 0.75 by gating the `libsentry-tm-perf-logger.so` native build to RN 0.76+ ([#6407](https://github.com/getsentry/sentry-react-native/pull/6407))
 
 ## 8.17.1
 
+> [!WARNING]
+> ⚠️ **Known Issue (Android):** New Architecture builds on `sentry-react-native` **8.17.1** can fail to build `libsentry-tm-perf-logger.so` (subset-ABI builds such as `armeabi-v7a`/Expo, and React Native 0.75) ([#6398](https://github.com/getsentry/sentry-react-native/issues/6398)). **Please use [8.17.2](https://github.com/getsentry/sentry-react-native/releases/tag/8.17.2)**.
+
 ### Fixes
 
 - Force 16 KB ELF alignment for `libsentry-tm-perf-logger.so` so it does not break 16 KB page size compatibility on Android 15+ ([#6396](https://github.com/getsentry/sentry-react-native/pull/6396))
 
 ## 8.17.0
 
 > [!WARNING]
-> ⚠️ **Known Issue (Android):** Apps built with the New Architecture on `sentry-react-native` **8.17.0** bundle a native library (`libsentry-tm-perf-logger.so`) that is not 16 KB page aligned, which breaks [16 KB page size](https://developer.android.com/guide/practices/page-sizes) compatibility on Android 15+ (and fails Google Play's 16 KB requirement). See [#6394](https://github.com/getsentry/sentry-react-native/issues/6394). **Please use [8.17.1](https://github.com/getsentry/sentry-react-native/releases/tag/8.17.1)**.
+> ⚠️ **Known Issue (Android):** Apps built with the New Architecture on `sentry-react-native` **8.17.0** bundle a native library (`libsentry-tm-perf-logger.so`) that is not 16 KB page aligned, which breaks [16 KB page size](https://developer.android.com/guide/practices/page-sizes) compatibility on Android 15+ (and fails Google Play's 16 KB requirement). See [#6394](https://github.com/getsentry/sentry-react-native/issues/6394). **Please use [8.17.2](https://github.com/getsentry/sentry-react-native/releases/tag/8.17.2)**.
 
 ### Internal
 
diff --git a/SDK-VERSIONS.md b/SDK-VERSIONS.md
@@ -12,6 +12,7 @@ To manually update the table with the current version, run `./scripts/update-sdk
 
 | React Native SDK | Android SDK | Cocoa SDK | JavaScript SDK |
 | ---------------- | ----------- | --------- | -------------- |
+| [8.17.2](https://github.com/getsentry/sentry-react-native/releases/tag/8.17.2) | [8.47.0](https://github.com/getsentry/sentry-java/releases/tag/8.47.0) | [9.19.1](https://github.com/getsentry/sentry-cocoa/releases/tag/9.19.1) | [10.63.0](https://github.com/getsentry/sentry-javascript/releases/tag/10.63.0) |
 | [8.17.1](https://github.com/getsentry/sentry-react-native/releases/tag/8.17.1) | [8.47.0](https://github.com/getsentry/sentry-java/releases/tag/8.47.0) | [9.19.1](https://github.com/getsentry/sentry-cocoa/releases/tag/9.19.1) | [10.63.0](https://github.com/getsentry/sentry-javascript/releases/tag/10.63.0) |
 | [8.17.0](https://github.com/getsentry/sentry-react-native/releases/tag/8.17.0) | [8.47.0](https://github.com/getsentry/sentry-java/releases/tag/8.47.0) | [9.19.1](https://github.com/getsentry/sentry-cocoa/releases/tag/9.19.1) | [10.63.0](https://github.com/getsentry/sentry-javascript/releases/tag/10.63.0) |
 | [8.16.0](https://github.com/getsentry/sentry-react-native/releases/tag/8.16.0) | [8.45.0](https://github.com/getsentry/sentry-java/releases/tag/8.45.0) | [9.19.0](https://github.com/getsentry/sentry-cocoa/releases/tag/9.19.0) | [10.61.0](https://github.com/getsentry/sentry-javascript/releases/tag/10.61.0) |
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "private": true,
   "description": "Sentry React Native End to End Tests Library",
   "main": "dist/index.js",
@@ -14,7 +14,7 @@
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
     "@sentry/core": "10.63.0",
-    "@sentry/react-native": "8.17.1",
+    "@sentry/react-native": "8.17.2",
     "@types/node": "^20.9.3",
     "@types/react": "^19.1.4",
     "appium": "3.2.2",
diff --git a/dev-packages/type-check/package.json b/dev-packages/type-check/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "8.17.1",
+  "version": "8.17.2",
   "scripts": {
     "type-check": "./run-type-check.sh"
   }
diff --git a/dev-packages/utils/package.json b/dev-packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-samples-utils",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "description": "Internal Samples Utils",
   "main": "index.js",
   "license": "MIT",
diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "packages": [
     "packages/*",
     "dev-packages/*",
diff --git a/packages/core/android/build.gradle b/packages/core/android/build.gradle
@@ -6,6 +6,18 @@ def isNewArchitectureEnabled() {
     return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
 }
 
+// The ABIs the host app is building, from its `reactNativeArchitectures`
+// property (the same knob React Native, react-native-screens and reanimated
+// read). Falls back to all four when unset. We must honour this: when the app
+// builds a subset (e.g. `-PreactNativeArchitectures=arm64-v8a`), React Native
+// only provides its `reactnative` prefab for that subset, so building any other
+// ABI fails to resolve `TurboModulePerfLogger::enableLogging` at link time
+// (#6398). Hardcoding all four ABIs is what caused that failure.
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
 // `libsentry-tm-perf-logger.so` links against React Native's `reactnative`
 // prefab target. The merged `libreactnative.so` (exposed as the
 // `ReactAndroid::reactnative` prefab) only ships from RN 0.76 onward; on RN
@@ -135,7 +147,7 @@ android {
         versionCode 1
         versionName "1.0"
         ndk {
-            abiFilters "x86", "armeabi-v7a", "x86_64", "arm64-v8a"
+            abiFilters(*reactNativeArchitectures())
         }
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
diff --git a/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java b/packages/core/android/src/main/java/io/sentry/react/RNSentryVersion.java
@@ -2,7 +2,7 @@
 
 class RNSentryVersion {
   static final String REACT_NATIVE_SDK_PACKAGE_NAME = "npm:@sentry/react-native";
-  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "8.17.1";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "8.17.2";
   static final String NATIVE_SDK_NAME = "sentry.native.android.react-native";
   static final String ANDROID_SDK_NAME = "sentry.java.android.react-native";
   static final String REACT_NATIVE_SDK_NAME = "sentry.javascript.react-native";
diff --git a/packages/core/android/src/main/jni/CMakeLists.txt b/packages/core/android/src/main/jni/CMakeLists.txt
@@ -78,6 +78,32 @@ target_link_options(
         "-Wl,-z,max-page-size=16384"
 )
 
+# Do not fail the link when `facebook::react::TurboModulePerfLogger::enableLogging`
+# (and friends) cannot be resolved at link time. Those symbols live in React
+# Native's `reactnative` prefab, which we link above, and they are present in
+# every ABI's `libreactnative.so`. However, some New Architecture build setups
+# (e.g. Expo builds on certain ABIs such as armeabi-v7a) do not end up
+# satisfying the reference at link time, and the NDK/AGP toolchain links with
+# `-Wl,-z,defs` (a.k.a. `--no-undefined`), which turns that into a fatal
+# `undefined symbol` error and breaks the whole Android build — even for hosts
+# that never opt in to `enableTurboModuleTracking`, since the library is
+# compiled whenever the New Architecture is enabled.
+#
+# `-Wl,-z,undefs` (appended after the toolchain's flags, so it wins) makes
+# undefined symbols non-fatal, leaving them to be resolved at load time against
+# the already-loaded `libreactnative.so`. This is safe: the library is loaded
+# lazily and only when tracking is opted in (see RNSentryTurboModulePerfTracker),
+# and a genuinely unresolvable symbol surfaces as an `UnsatisfiedLinkError` from
+# `System.loadLibrary` that the Java side already swallows, degrading the
+# experimental feature to a no-op rather than crashing. When the prefab does
+# satisfy the reference at link time (the common case) this flag changes nothing.
+# https://github.com/getsentry/sentry-react-native/issues/6398
+target_link_options(
+    sentry-tm-perf-logger
+    PRIVATE
+        "-Wl,-z,undefs"
+)
+
 # Note: we deliberately do NOT pass `-Wl,--strip-all` (or similar) here.
 # Android Gradle Plugin's `StripDebugSymbolsTask` already strips the .so for
 # the packaged APK while preserving the unstripped artefact under
diff --git a/packages/core/ios/RNSentryVersion.m b/packages/core/ios/RNSentryVersion.m
@@ -3,4 +3,4 @@
 NSString *const NATIVE_SDK_NAME = @"sentry.cocoa.react-native";
 NSString *const REACT_NATIVE_SDK_NAME = @"sentry.javascript.react-native";
 NSString *const REACT_NATIVE_SDK_PACKAGE_NAME = @"npm:@sentry/react-native";
-NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"8.17.1";
+NSString *const REACT_NATIVE_SDK_PACKAGE_VERSION = @"8.17.2";
diff --git a/packages/core/package.json b/packages/core/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": "8.17.1",
+  "version": "8.17.2",
   "description": "Official Sentry SDK for react-native",
   "typings": "dist/js/index.d.ts",
   "types": "dist/js/index.d.ts",
diff --git a/packages/core/src/js/version.ts b/packages/core/src/js/version.ts
@@ -1,3 +1,3 @@
 export const SDK_PACKAGE_NAME = 'npm:@sentry/react-native';
 export const SDK_NAME = 'sentry.javascript.react-native';
-export const SDK_VERSION: string = '8.17.1';
+export const SDK_VERSION: string = '8.17.2';
diff --git a/packages/expo-upload-sourcemaps/package.json b/packages/expo-upload-sourcemaps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sentry/expo-upload-sourcemaps",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "description": "CLI to upload bundles and source maps from Expo builds to Sentry.",
   "homepage": "https://github.com/getsentry/sentry-react-native/tree/main/packages/expo-upload-sourcemaps",
   "repository": {
diff --git a/performance-tests/TestAppPlain/package.json b/performance-tests/TestAppPlain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppPlain",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/performance-tests/TestAppSentry/package.json b/performance-tests/TestAppSentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "TestAppSentry",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@react-native/new-app-screen": "0.86.0",
-    "@sentry/react-native": "8.17.1",
+    "@sentry/react-native": "8.17.2",
     "react": "19.2.3",
     "react-native": "0.86.0"
   },
diff --git a/samples/expo/app.json b/samples/expo/app.json
@@ -4,7 +4,7 @@
     "slug": "sentry-react-native-expo-sample",
     "jsEngine": "hermes",
     "scheme": "sentry-expo-sample",
-    "version": "8.17.1",
+    "version": "8.17.2",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -19,15 +19,15 @@
     "ios": {
       "supportsTablet": true,
       "bundleIdentifier": "io.sentry.expo.sample",
-      "buildNumber": "94"
+      "buildNumber": "95"
     },
     "android": {
       "adaptiveIcon": {
         "foregroundImage": "./assets/adaptive-icon.png",
         "backgroundColor": "#ffffff"
       },
       "package": "io.sentry.expo.sample",
-      "versionCode": 94
+      "versionCode": 95
     },
     "web": {
       "bundler": "metro",
diff --git a/samples/expo/package.json b/samples/expo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-expo-sample",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "main": "expo-router/entry",
   "scripts": {
     "start": "expo start",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@sentry/core": "10.63.0",
-    "@sentry/react-native": "8.17.1",
+    "@sentry/react-native": "8.17.2",
     "@types/react": "~19.2.10",
     "expo": "^57.0.0",
     "expo-constants": "~57.0.2",
diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-macos-sample",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "private": true,
   "scripts": {
     "start": "react-native start --experimental-debugger",
@@ -18,7 +18,7 @@
     "@react-navigation/stack": "^6.3.20",
     "@sentry/core": "10.63.0",
     "@sentry/react": "10.63.0",
-    "@sentry/react-native": "8.17.1",
+    "@sentry/react-native": "8.17.2",
     "delay": "^6.0.0",
     "react": "19.1.4",
     "react-native": "0.81.6",
diff --git a/samples/react-native/android/app/build.gradle b/samples/react-native/android/app/build.gradle
@@ -130,8 +130,8 @@ android {
         applicationId "io.sentry.reactnative.sample"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 96
-        versionName "8.17.1"
+        versionCode 97
+        versionName "8.17.2"
         buildConfigField "boolean", "SENTRY_DISABLE_NATIVE_START", System.getenv('SENTRY_DISABLE_NATIVE_START') ?: String.valueOf(sentryDisableNativeStart)
 
         testBuildType System.getProperty('testBuildType', 'debug')
diff --git a/samples/react-native/ios/sentryreactnativesample/Info.plist b/samples/react-native/ios/sentryreactnativesample/Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>8.17.1</string>
+	<string>8.17.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>101</string>
+	<string>102</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>
diff --git a/samples/react-native/ios/sentryreactnativesampleTests/Info.plist b/samples/react-native/ios/sentryreactnativesampleTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>8.17.1</string>
+	<string>8.17.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>101</string>
+	<string>102</string>
 </dict>
 </plist>
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-sample",
-  "version": "8.17.1",
+  "version": "8.17.2",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -49,7 +49,7 @@
     "@reduxjs/toolkit": "^2.8.2",
     "@sentry/core": "10.63.0",
     "@sentry/react": "10.63.0",
-    "@sentry/react-native": "8.17.1",
+    "@sentry/react-native": "8.17.2",
     "@shopify/flash-list": "^2.0.2",
     "delay": "^6.0.0",
     "react": "19.2.3",
diff --git a/scripts/check-tm-perf-logger-link.sh b/scripts/check-tm-perf-logger-link.sh
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sentry-react-native-type-check",`
`3`	`3`	`"private": true,`
`4`		`- "version": "8.17.1",`
	`4`	`+ "version": "8.17.2",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"type-check": "./run-type-check.sh"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sentry-react-native-samples-utils",`
`3`		`- "version": "8.17.1",`
	`3`	`+ "version": "8.17.2",`
`4`	`4`	`"description": "Internal Samples Utils",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`3`		`- "version": "8.17.1",`
	`3`	`+ "version": "8.17.2",`
`4`	`4`	`"packages": [`
`5`	`5`	`"packages/*",`
`6`	`6`	`"dev-packages/*",`