Merge branch 'main' into v8

# Conflicts:
#	packages/core/package.json
#	yarn.lock

Author: antonis

CHANGELOG.md

@@ -6,7 +6,7 @@
 > make sure you follow our [migration guide](https://docs.sentry.io/platforms/react-native/migration/) first.
 <!-- prettier-ignore-end -->
 
-## Unreleased
+### Unreleased
 
 ### Upgrading from 7.x to 8.0
 
@@ -31,8 +31,20 @@ See our [migration docs](https://docs.sentry.io/platforms/react-native/migration
 - **Sentry Self-Hosted**: ([#5523](https://github.com/getsentry/sentry-react-native/pull/5523))
   - Sentry CLI v3 requires self-hosted **25.11.1+** (previously 25.2.0)
 
+### Dependencies
+
+- Bump Cocoa SDK from v8.58.0 to v9.1.0 ([#5356](https://github.com/getsentry/sentry-react-native/pull/5356))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#910)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.58.0...9.1.0)
+- Bump CLI from v2.58.4 to v3.1.0 ([#5523](https://github.com/getsentry/sentry-react-native/pull/5523), [#5471](https://github.com/getsentry/sentry-react-native/pull/5471), [#5514](https://github.com/getsentry/sentry-react-native/pull/5514), [#5502](https://github.com/getsentry/sentry-react-native/pull/5502))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#310)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/2.58.4...3.1.0)
+
+## 7.11.0
+
 ### Features
 
+- Add support for applying scope attributes to JS logs ([#5579](https://github.com/getsentry/sentry-react-native/pull/5579))
 - Add experimental `sentry-span-attributes` prop to attach custom attributes to user interaction spans ([#5569](https://github.com/getsentry/sentry-react-native/pull/5569))
   ```tsx
   <Pressable
@@ -48,15 +60,12 @@ See our [migration docs](https://docs.sentry.io/platforms/react-native/migration
 
 ### Dependencies
 
-- Bump Cocoa SDK from v8.58.0 to v9.1.0 ([#5356](https://github.com/getsentry/sentry-react-native/pull/5356))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#910)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.58.0...9.1.0)
-- Bump CLI from v2.58.4 to v3.1.0 ([#5523](https://github.com/getsentry/sentry-react-native/pull/5523), [#5471](https://github.com/getsentry/sentry-react-native/pull/5471), [#5514](https://github.com/getsentry/sentry-react-native/pull/5514), [#5502](https://github.com/getsentry/sentry-react-native/pull/5502))
-  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#310)
-  - [diff](https://github.com/getsentry/sentry-cli/compare/2.58.4...3.1.0)
 - Bump Bundler Plugins from v4.7.0 to v4.8.0 ([#5581](https://github.com/getsentry/sentry-react-native/pull/5581))
   - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#480)
   - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.7.0...4.8.0)
+- Bump JavaScript SDK from v10.36.0 to v10.37.0 ([#5589](https://github.com/getsentry/sentry-react-native/pull/5589))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10370)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/10.36.0...10.37.0)
 
 ## 7.10.0
 

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-e2e-tests",
-  "version": "7.10.0",
+  "version": "7.11.0",
   "private": true,
   "description": "Sentry React Native End to End Tests Library",
   "main": "dist/index.js",
@@ -13,8 +13,8 @@
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@sentry/core": "10.36.0",
-    "@sentry/react-native": "7.10.0",
+    "@sentry/core": "10.37.0",
+    "@sentry/react-native": "7.11.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
     "appium": "2.4.1",

dev-packages/type-check/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sentry-react-native-type-check",
   "private": true,
-  "version": "7.10.0",
+  "version": "7.11.0",
   "scripts": {
     "type-check": "./run-type-check.sh"
   }

dev-packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentry-react-native-samples-utils",
-  "version": "7.10.0",
+  "version": "7.11.0",
   "description": "Internal Samples Utils",
   "main": "index.js",
   "license": "MIT",

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "7.10.0",
+  "version": "7.11.0",
   "packages": [
     "packages/*",
     "dev-packages/*",

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

@@ -933,6 +933,26 @@ public void setTag(String key, String value) {
         });
   }
 
+  public void setAttribute(String key, String value) {
+    // TODO(alwx): This is not implemented in sentry-android yet
+    /*
+     * Sentry.configureScope(
+     * scope -> {
+     * scope.setAttribute(key, value);
+     * });
+     */
+  }
+
+  public void setAttributes(ReadableMap attributes) {
+    // TODO(alwx): This is not implemented in sentry-android yet
+    /*
+     * Sentry.configureScope(
+     * scope -> {
+     * scope.setAttributes(attributes);
+     * });
+     */
+  }
+
   public void closeNativeSdk(Promise promise) {
     Sentry.close();
 

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 = "7.10.0";
+  static final String REACT_NATIVE_SDK_PACKAGE_VERSION = "7.11.0";
   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";

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

@@ -112,6 +112,16 @@ public void setTag(String key, String value) {
     this.impl.setTag(key, value);
   }
 
+  @Override
+  public void setAttribute(String key, String value) {
+    this.impl.setAttribute(key, value);
+  }
+
+  @Override
+  public void setAttributes(ReadableMap attributes) {
+    this.impl.setAttributes(attributes);
+  }
+
   @Override
   public void closeNativeSdk(Promise promise) {
     this.impl.closeNativeSdk(promise);

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

@@ -112,6 +112,16 @@ public void setTag(String key, String value) {
     this.impl.setTag(key, value);
   }
 
+  @ReactMethod
+  public void setAttribute(String key, String value) {
+    this.impl.setAttribute(key, value);
+  }
+
+  @ReactMethod
+  public void setAttributes(ReadableMap attributes) {
+    this.impl.setAttributes(attributes);
+  }
+
   @ReactMethod
   public void closeNativeSdk(Promise promise) {
     this.impl.closeNativeSdk(promise);
@@ -132,6 +142,11 @@ public void fetchNativeDeviceContexts(Promise promise) {
     this.impl.fetchNativeDeviceContexts(promise);
   }
 
+  @ReactMethod
+  public void fetchNativeLogAttributes(Promise promise) {
+    this.impl.fetchNativeLogAttributes(promise);
+  }
+
   @ReactMethod
   public void fetchNativeSdkInfo(Promise promise) {
     this.impl.fetchNativeSdkInfo(promise);

packages/core/ios/RNSentry.mm

@@ -717,6 +717,22 @@ + (SentryUser *_Nullable)userFrom:(NSDictionary *)userKeys
         configureScope:^(SentryScope *_Nonnull scope) { [scope setTagValue:value forKey:key]; }];
 }
 
+RCT_EXPORT_METHOD(setAttribute : (NSString *)key value : (NSString *)value)
+{
+    // TODO(alwx): This is not implemented in sentry-cocoa yet
+    /*[SentrySDKWrapper
+        configureScope:^(SentryScope *_Nonnull scope) { [scope setAttribute:value forKey:key]; }];*/
+}
+
+RCT_EXPORT_METHOD(setAttributes : (NSDictionary *)attributes)
+{
+    // TODO(alwx): This is not implemented in sentry-cocoa yet
+    /*[SentrySDKWrapper configureScope:^(SentryScope *_Nonnull scope) {
+        [attributes enumerateKeysAndObjectsUsingBlock:^(
+            NSString *key, NSString *value, BOOL *stop) { [scope setAttribute:value forKey:key]; }];
+    }];*/
+}
+
 RCT_EXPORT_METHOD(crash) { [SentrySDKWrapper crash]; }
 
 RCT_EXPORT_METHOD(