Sync JNI branch with 9.14.0

.github/workflows/changelog-preview.yml

@@ -0,0 +1,18 @@
+name: Changelog Preview
+on:
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+    - edited
+    - labeled
+    - unlabeled
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  changelog-preview:
+    uses: getsentry/craft/.github/workflows/changelog-preview.yml@v2
+    secrets: inherit

.github/workflows/min_version_test.yml

@@ -51,7 +51,7 @@ jobs:
         with:
           flutter-version: '3.24.0'
 
-      - uses: ruby/setup-ruby@90be1154f987f4dc0fe0dd0feedac9e473aa4ba8 # pin@v1.286.0
+      - uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # pin@v1.288.0
         with:
           ruby-version: '3.1.2' # https://github.com/flutter/flutter/issues/109385#issuecomment-1212614125
 

.github/workflows/release.yml

@@ -3,15 +3,19 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: Version to release
-        required: true
+        description: Version to release (or "auto")
+        required: false
       force:
         description: Force a release even when there are release-blockers (optional)
         required: false
       merge_target:
         description: Target branch to merge into. Uses the default branch as a fallback (optional)
         required: false
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   release:
     runs-on: ubuntu-latest
@@ -29,7 +33,7 @@ jobs:
           token: ${{ steps.token.outputs.token }}
           fetch-depth: 0
       - name: Prepare release
-        uses: getsentry/action-prepare-release@c8e1c2009ab08259029170132c384f03c1064c0e
+        uses: getsentry/craft@906009a1b771956757e521555b561379307eb667 # v2
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:

.github/workflows/testflight.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v6
       - uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e # pin@v2.21.0
       - run: xcodes select 26.2
-      - uses: ruby/setup-ruby@90be1154f987f4dc0fe0dd0feedac9e473aa4ba8 # pin@v1.286.0
+      - uses: ruby/setup-ruby@09a7688d3b55cf0e976497ff046b70949eeaccfd # pin@v1.288.0
         with:
           ruby-version: '2.7.5'
           bundler-cache: true

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## 9.14.0
+
+### Features
+
+- Add `enableTombstone` option for improved native crash reporting on Android 12+ ([#3526](https://github.com/getsentry/sentry-dart/pull/3526))
+  - When enabled, uses Android's `ApplicationExitInfo.REASON_CRASH_NATIVE` to capture native crashes with more detailed thread information
+  - Disabled by default
+
+### Fixes
+
+- Dont guard user attributes behind `sendDefaultPii` for logs and metrics ([#3524](https://github.com/getsentry/sentry-dart/pull/3524))
+
+### Dependencies
+
+- Bump Native SDK from v0.12.6 to v0.12.8 ([#3514](https://github.com/getsentry/sentry-dart/pull/3514), [#3520](https://github.com/getsentry/sentry-dart/pull/3520))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0128)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.12.6...0.12.8)
+- Bump Android SDK from v8.32.0 to v8.33.0 ([#3529](https://github.com/getsentry/sentry-dart/pull/3529))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#8330)
+  - [diff](https://github.com/getsentry/sentry-java/compare/8.32.0...8.33.0)
+
+<summary><b>Internal Changes</b></summary>
+
+- Add `sentry.javascript.browser.flutter` sdk name for native js errors ([#3525](https://github.com/getsentry/sentry-dart/pull/3525))
+
+</details>
+
 ## 9.13.0
 
 ### Features

docs/sdk-versions.md

@@ -6,6 +6,7 @@ This document shows which version of the various Sentry SDKs are used in which S
 
 | Sentry Flutter SDK | Sentry Android SDK | Sentry Cocoa SDK | Sentry JavaScript SDK | Sentry Native SDK |
 | ------------------ | ------------------ | ---------------- | --------------------- | ----------------- |
+| 9.14.0 | 8.33.0 | 8.56.2 | 10.38.0 | 0.12.8 |
 | 9.13.0 | 8.32.0 | 8.56.2 | 10.38.0 | 0.12.6 |
 | 9.12.0 | 8.31.0 | 8.56.2 | 10.6.0 | 0.12.5 |
 | 9.11.0 | 8.30.0 | 8.56.2 | 10.6.0 | 0.12.3 |

metrics/Gemfile.lock

@@ -46,7 +46,7 @@ GEM
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     excon (0.112.0)
-    faraday (1.10.4)
+    faraday (1.10.5)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -65,7 +65,7 @@ GEM
     faraday-em_synchrony (1.0.1)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.1.1)
+    faraday-multipart (1.2.0)
       multipart-post (~> 2.0)
     faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)

metrics/flutter.properties

@@ -1,2 +1,2 @@
-version = 3.38.7
+version = 3.41.1
 repo = https://github.com/flutter/flutter

packages/dart/lib/src/constants.dart

@@ -89,16 +89,19 @@ abstract class SemanticAttributesConstants {
   static const sentryInternalReplayIsBuffering =
       'sentry._internal.replay_is_buffering';
 
-  /// The user ID (gated by `sendDefaultPii`).
+  /// The user ID.
+  /// Users are always manually set and never automatically inferred,
+  /// therefore this is not gated by `sendDefaultPii`.
   static const userId = 'user.id';
 
-  /// The user email (gated by `sendDefaultPii`).
+  /// The user email.
+  /// Users are always manually set and never automatically inferred,
+  /// therefore this is not gated by `sendDefaultPii`.
   static const userEmail = 'user.email';
 
-  /// The user IP address (gated by `sendDefaultPii`).
-  static const userIpAddress = 'user.ip_address';
-
-  /// The user username (gated by `sendDefaultPii`).
+  /// The user username.
+  /// Users are always manually set and never automatically inferred,
+  /// therefore this is not gated by `sendDefaultPii`.
   static const userName = 'user.name';
 
   /// The operating system name.

packages/dart/lib/src/telemetry/default_attributes.dart

@@ -23,21 +23,21 @@ Map<String, SentryAttribute> defaultAttributes(SentryOptions options,
         SentryAttribute.string(options.release!);
   }
 
-  if (options.sendDefaultPii) {
-    final user = scope?.user;
-    if (user != null) {
-      if (user.id != null) {
-        attributes[SemanticAttributesConstants.userId] =
-            SentryAttribute.string(user.id!);
-      }
-      if (user.name != null) {
-        attributes[SemanticAttributesConstants.userName] =
-            SentryAttribute.string(user.name!);
-      }
-      if (user.email != null) {
-        attributes[SemanticAttributesConstants.userEmail] =
-            SentryAttribute.string(user.email!);
-      }
+  // Users are always manually set and never automatically inferred,
+  // therefore this is not gated by `sendDefaultPii`.
+  final user = scope?.user;
+  if (user != null) {
+    if (user.id != null) {
+      attributes[SemanticAttributesConstants.userId] =
+          SentryAttribute.string(user.id!);
+    }
+    if (user.name != null) {
+      attributes[SemanticAttributesConstants.userName] =
+          SentryAttribute.string(user.name!);
+    }
+    if (user.email != null) {
+      attributes[SemanticAttributesConstants.userEmail] =
+          SentryAttribute.string(user.email!);
     }
   }
 

packages/dart/lib/src/version.dart

@@ -9,7 +9,7 @@
 library;
 
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '9.13.0';
+const String sdkVersion = '9.14.0';
 
 String sdkName(bool isWeb) => isWeb ? _browserSdkName : _ioSdkName;
 

packages/dart/pubspec.yaml

@@ -1,5 +1,5 @@
 name: sentry
-version: 9.13.0
+version: 9.14.0
 description: >
   A crash reporting library for Dart that sends crash reports to Sentry.io.
   This library supports Dart VM and Web. For Flutter consider sentry_flutter instead.

packages/dart/test/telemetry/log/log_capture_pipeline_test.dart

@@ -129,21 +129,6 @@ void main() {
         expect(attributes[SemanticAttributesConstants.sentryEnvironment]?.value,
             'callback-env');
       });
-
-      test('does not add user attributes when sendDefaultPii is false',
-          () async {
-        fixture.options.sendDefaultPii = false;
-        await fixture.scope.setUser(SentryUser(id: 'user-id'));
-
-        final log = givenLog();
-
-        await fixture.pipeline.captureLog(log, scope: fixture.scope);
-
-        expect(
-          log.attributes.containsKey(SemanticAttributesConstants.userId),
-          isFalse,
-        );
-      });
     });
 
     group('when logs are disabled', () {
@@ -239,7 +224,6 @@ class Fixture {
   final options = defaultTestOptions()
     ..environment = 'test-env'
     ..release = 'test-release'
-    ..sendDefaultPii = true
     ..enableLogs = true;
 
   final processor = MockTelemetryProcessor();

packages/dart/test/telemetry/metric/metric_capture_pipeline_test.dart

@@ -118,21 +118,6 @@ void main() {
         expect(attributes[SemanticAttributesConstants.sentryEnvironment]?.value,
             'callback-env');
       });
-
-      test('does not add user attributes when sendDefaultPii is false',
-          () async {
-        fixture.options.sendDefaultPii = false;
-        await fixture.scope.setUser(SentryUser(id: 'user-id'));
-
-        final metric = fixture.createMetric();
-
-        await fixture.pipeline.captureMetric(metric, scope: fixture.scope);
-
-        expect(
-          metric.attributes.containsKey(SemanticAttributesConstants.userId),
-          isFalse,
-        );
-      });
     });
 
     group('when metrics are disabled', () {
@@ -196,7 +181,6 @@ class Fixture {
   final options = defaultTestOptions()
     ..environment = 'test-env'
     ..release = 'test-release'
-    ..sendDefaultPii = true
     ..enableMetrics = true;
 
   final processor = MockTelemetryProcessor();

packages/dio/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '9.13.0';
+const String sdkVersion = '9.14.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_dio';

packages/dio/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_dio
 description: An integration which adds support for performance tracing for the Dio package.
-version: 9.13.0
+version: 9.14.0
 homepage: https://docs.sentry.io/platforms/dart/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -19,7 +19,7 @@ platforms:
 
 dependencies:
   dio: ^5.2.0
-  sentry: 9.13.0
+  sentry: 9.14.0
 
 dev_dependencies:
   meta: ^1.3.0

packages/drift/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '9.13.0';
+const String sdkVersion = '9.14.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_drift';

packages/drift/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_drift
 description: An integration which adds support for performance tracing for the drift package.
-version: 9.13.0
+version: 9.14.0
 homepage: https://docs.sentry.io/platforms/flutter/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -17,7 +17,7 @@ platforms:
   web:
 
 dependencies:
-  sentry: 9.13.0
+  sentry: 9.14.0
   meta: ^1.3.0
   drift: ^2.24.0
 

packages/file/lib/src/version.dart

@@ -1,5 +1,5 @@
 /// The SDK version reported to Sentry.io in the submitted events.
-const String sdkVersion = '9.13.0';
+const String sdkVersion = '9.14.0';
 
 /// The package name reported to Sentry.io in the submitted events.
 const String packageName = 'pub:sentry_file';

packages/file/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_file
 description: An integration which adds support for performance tracing for dart.io.File.
-version: 9.13.0
+version: 9.14.0
 homepage: https://docs.sentry.io/platforms/dart/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -17,7 +17,7 @@ platforms:
   windows:
 
 dependencies:
-  sentry: 9.13.0
+  sentry: 9.14.0
   meta: ^1.3.0
 
 dev_dependencies:

packages/firebase_remote_config/pubspec.yaml

@@ -1,6 +1,6 @@
 name: sentry_firebase_remote_config
 description: "Sentry integration to use feature flags from Firebase Remote Config."
-version: 9.13.0
+version: 9.14.0
 homepage: https://docs.sentry.io/platforms/flutter/
 repository: https://github.com/getsentry/sentry-dart
 issue_tracker: https://github.com/getsentry/sentry-dart/issues
@@ -21,7 +21,7 @@ dependencies:
   flutter:
     sdk: flutter
   firebase_remote_config: '>=5.4.3 <7.0.0'
-  sentry: 9.13.0
+  sentry: 9.14.0
 
 dev_dependencies:
   flutter_test:

packages/flutter/android/build.gradle

@@ -62,8 +62,8 @@ android {
 }
 
 dependencies {
-    api 'io.sentry:sentry-android:8.32.0'
-    debugImplementation 'io.sentry:sentry-spotlight:8.32.0'
+    api 'io.sentry:sentry-android:8.33.0'
+    debugImplementation 'io.sentry:sentry-spotlight:8.33.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     // Required -- JUnit 4 framework

packages/flutter/example/integration_test/integration_test.dart

@@ -217,6 +217,7 @@ void main() {
         options.anrTimeoutInterval = const Duration(seconds: 2);
         options.connectionTimeout = const Duration(milliseconds: 1234);
         options.readTimeout = const Duration(milliseconds: 2345);
+        options.enableTombstone = true;
       });
     });
 
@@ -280,12 +281,15 @@ void main() {
       expect(findMatchingPackage, isNotNull);
     }
     expect(androidOptions.isEnableAutoTraceIdGeneration(), isFalse);
+    expect(androidOptions.isTombstoneEnabled(), isTrue);
+
     final androidProxy = androidOptions.getProxy();
     expect(androidProxy, isNotNull);
     expect(androidProxy!.getHost()?.toDartString(), 'proxy.local');
     expect(androidProxy.getPort()?.toDartString(), '8084');
     expect(androidProxy.getUser()?.toDartString(), 'u');
     expect(androidProxy.getPass()?.toDartString(), 'p');
+
     final r = androidOptions.getSessionReplay();
     expect(r.getQuality(), jni.SentryReplayOptions$SentryReplayQuality.HIGH);
     expect(r.getSessionSampleRate(), isNotNull);