Merge branch 'main' into release/8.6.0

buenaflor · buenaflor · commit 6bd7139974cb · 2024-08-01T10:14:09.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,9 +38,9 @@ SentryFlutter.init((options) =>
 
 ### Dependencies
 
-- Bump Android SDK from v7.12.0 to v7.12.1 ([#2198](https://github.com/getsentry/sentry-dart/pull/2198))
-  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7121)
-  - [diff](https://github.com/getsentry/sentry-java/compare/7.12.0...7.12.1)
+- Bump Android SDK from v7.12.0 to v7.13.0 ([#2198](https://github.com/getsentry/sentry-dart/pull/2198), [#2206](https://github.com/getsentry/sentry-dart/pull/2206))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#7130)
+  - [diff](https://github.com/getsentry/sentry-java/compare/7.12.0...7.13.0)
 
 ## 8.5.0
 
diff --git a/dart/lib/src/client_reports/discard_reason.dart b/dart/lib/src/client_reports/discard_reason.dart
@@ -11,4 +11,5 @@ enum DiscardReason {
   queueOverflow,
   cacheOverflow,
   rateLimitBackoff,
+  ignored,
 }
diff --git a/dart/lib/src/client_reports/discarded_event.dart b/dart/lib/src/client_reports/discarded_event.dart
@@ -37,6 +37,8 @@ extension _OutcomeExtension on DiscardReason {
         return 'cache_overflow';
       case DiscardReason.rateLimitBackoff:
         return 'ratelimit_backoff';
+      case DiscardReason.ignored:
+        return 'ignored';
     }
   }
 }
diff --git a/flutter/android/build.gradle b/flutter/android/build.gradle
@@ -60,7 +60,7 @@ android {
 }
 
 dependencies {
-    api 'io.sentry:sentry-android:7.12.1'
+    api 'io.sentry:sentry-android:7.13.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     // Required -- JUnit 4 framework

Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,5 @@ enum DiscardReason {`
`11`	`11`	`queueOverflow,`
`12`	`12`	`cacheOverflow,`
`13`	`13`	`rateLimitBackoff,`
	`14`	`+ ignored,`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ extension _OutcomeExtension on DiscardReason {`
`37`	`37`	`return 'cache_overflow';`
`38`	`38`	`case DiscardReason.rateLimitBackoff:`
`39`	`39`	`return 'ratelimit_backoff';`
	`40`	`+ case DiscardReason.ignored:`
	`41`	`+ return 'ignored';`
`40`	`42`	`}`
`41`	`43`	`}`
`42`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ android {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`dependencies {`
`63`		`- api 'io.sentry:sentry-android:7.12.1'`
	`63`	`+ api 'io.sentry:sentry-android:7.13.0'`
`64`	`64`	`implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"`
`65`	`65`
`66`	`66`	`// Required -- JUnit 4 framework`