Make hint non-nullable in BeforeSendCallback and BeforeBreadcrumbCall…

…back

dart/lib/src/hint.dart

@@ -11,8 +11,8 @@ import 'sentry_attachment/sentry_attachment.dart';
 /// Example:
 ///
 /// ```dart
-/// options.beforeSend = (event, {hint}) {
-///     final syntheticException = hint?.get(TypeCheckHint.syntheticException);
+/// options.beforeSend = (event, hint) {
+///     final syntheticException = hint.get(TypeCheckHint.syntheticException);
 ///     if (syntheticException is FlutterErrorDetails) {
 ///       // Do something with hint data
 ///     }
@@ -28,14 +28,14 @@ import 'sentry_attachment/sentry_attachment.dart';
 /// ```dart
 /// import 'dart:convert';
 ///
-/// options.beforeSend = (event, {hint}) {
+/// options.beforeSend = (event, hint) {
 ///   final text = 'This event should not be sent happen in prod. Investigate.';
 ///   final textAttachment = SentryAttachment.fromIntList(
 ///     utf8.encode(text),
 ///     'event_info.txt',
 ///     contentType: 'text/plain',
 ///   );
-///   hint?.attachments.add(textAttachment);
+///   hint.attachments.add(textAttachment);
 ///   return event;
 /// };
 /// ```

dart/lib/src/scope.dart

@@ -143,7 +143,7 @@ class Scope {
 
   Scope(this._options);
 
-  Breadcrumb? _addBreadCrumbSync(Breadcrumb breadcrumb, {Hint? hint}) {
+  Breadcrumb? _addBreadCrumbSync(Breadcrumb breadcrumb, Hint hint) {
     // bail out if maxBreadcrumbs is zero
     if (_options.maxBreadcrumbs == 0) {
       return null;
@@ -155,7 +155,7 @@ class Scope {
       try {
         processedBreadcrumb = _options.beforeBreadcrumb!(
           processedBreadcrumb,
-          hint: hint,
+          hint,
         );
         if (processedBreadcrumb == null) {
           _options.logger(
@@ -189,7 +189,7 @@ class Scope {
 
   /// Adds a breadcrumb to the breadcrumbs queue
   Future<void> addBreadcrumb(Breadcrumb breadcrumb, {Hint? hint}) async {
-    final addedBreadcrumb = _addBreadCrumbSync(breadcrumb, hint: hint);
+    final addedBreadcrumb = _addBreadCrumbSync(breadcrumb, hint ?? Hint());
     if (addedBreadcrumb != null) {
       await _callScopeObservers((scopeObserver) async =>
           await scopeObserver.addBreadcrumb(addedBreadcrumb));
@@ -429,7 +429,7 @@ class Scope {
     }
 
     for (final breadcrumb in List.from(_breadcrumbs)) {
-      clone._addBreadCrumbSync(breadcrumb);
+      clone._addBreadCrumbSync(breadcrumb, Hint());
     }
 
     for (final eventProcessor in List.from(_eventProcessors)) {

dart/lib/src/sentry_client.dart

@@ -100,7 +100,7 @@ class SentryClient {
 
     preparedEvent = await _runBeforeSend(
       preparedEvent,
-      hint: hint,
+      hint,
     );
 
     // dropped by beforeSend
@@ -312,7 +312,7 @@ class SentryClient {
     }
 
     preparedTransaction =
-        await _runBeforeSend(preparedTransaction) as SentryTransaction?;
+        await _runBeforeSend(preparedTransaction, Hint()) as SentryTransaction?;
 
     // dropped by beforeSendTransaction
     if (preparedTransaction == null) {
@@ -354,9 +354,9 @@ class SentryClient {
   void close() => _options.httpClient.close();
 
   Future<SentryEvent?> _runBeforeSend(
-    SentryEvent event, {
-    Hint? hint,
-  }) async {
+    SentryEvent event,
+    Hint hint,
+  ) async {
     SentryEvent? eventOrTransaction = event;
 
     final beforeSend = _options.beforeSend;
@@ -373,7 +373,7 @@ class SentryClient {
           eventOrTransaction = e;
         }
       } else if (beforeSend != null) {
-        final e = beforeSend(event, hint: hint);
+        final e = beforeSend(event, hint);
         if (e is Future<SentryEvent?>) {
           eventOrTransaction = await e;
         } else {

dart/lib/src/sentry_options.dart

@@ -445,9 +445,9 @@ class SentryOptions {
 /// This function is called with an SDK specific event object and can return a modified event
 /// object or nothing to skip reporting the event
 typedef BeforeSendCallback = FutureOr<SentryEvent?> Function(
-  SentryEvent event, {
-  Hint? hint,
-});
+  SentryEvent event,
+  Hint hint,
+);
 
 /// This function is called with an SDK specific transaction object and can return a modified transaction
 /// object or nothing to skip reporting the transaction
@@ -458,9 +458,9 @@ typedef BeforeSendTransactionCallback = FutureOr<SentryTransaction?> Function(
 /// This function is called with an SDK specific breadcrumb object before the breadcrumb is added
 /// to the scope. When nothing is returned from the function, the breadcrumb is dropped
 typedef BeforeBreadcrumbCallback = Breadcrumb? Function(
-  Breadcrumb? breadcrumb, {
-  Hint? hint,
-});
+  Breadcrumb? breadcrumb,
+  Hint hint,
+);
 
 /// Used to provide timestamp for logging.
 typedef ClockProvider = DateTime Function();

dart/test/scope_test.dart

@@ -617,9 +617,9 @@ void main() {
     final sut = fixture.getSut(
       scopeObserver: fixture.mockScopeObserver,
       beforeBreadcrumbCallback: (
-        Breadcrumb? breadcrumb, {
+        Breadcrumb? breadcrumb,
         Hint? hint,
-      }) {
+      ) {
         return breadcrumb?.copyWith(message: "modified");
       },
     );
@@ -690,9 +690,9 @@ void main() {
 
       final sut = fixture.getSut(
           beforeBreadcrumbCallback: (
-            Breadcrumb? breadcrumb, {
-            Hint? hint,
-          }) {
+            Breadcrumb? breadcrumb,
+            Hint hint,
+          ) {
             throw exception;
           },
           debug: true);
@@ -714,9 +714,9 @@ void main() {
 
       final sut = fixture.getSut(
           beforeBreadcrumbCallback: (
-            Breadcrumb? breadcrumb, {
-            Hint? hint,
-          }) {
+            Breadcrumb? breadcrumb,
+            Hint hint,
+          ) {
             if (numberOfBeforeBreadcrumbCalls > 0) {
               throw exception;
             }
@@ -777,11 +777,11 @@ class Fixture {
 
   EventProcessor get processor => DropAllEventProcessor();
 
-  Breadcrumb? beforeBreadcrumbCallback(Breadcrumb? breadcrumb, {Hint? hint}) =>
+  Breadcrumb? beforeBreadcrumbCallback(Breadcrumb? breadcrumb, Hint hint) =>
       null;
 
-  Breadcrumb? beforeBreadcrumbMutateCallback(Breadcrumb? breadcrumb,
-          {Hint? hint}) =>
+  Breadcrumb? beforeBreadcrumbMutateCallback(
+          Breadcrumb? breadcrumb, Hint hint) =>
       breadcrumb?.copyWith(message: 'new message');
 
   void mockLogger(

dart/test/sentry_client_test.dart

@@ -1038,7 +1038,7 @@ void main() {
 
     test('thrown error is handled', () async {
       final exception = Exception("before send exception");
-      final beforeSendCallback = (SentryEvent event, {Hint? hint}) {
+      final beforeSendCallback = (SentryEvent event, Hint hint) {
         throw exception;
       };
 
@@ -1598,9 +1598,9 @@ Future<Map<String, dynamic>> transactionFromEnvelope(
 }
 
 SentryEvent? beforeSendCallbackDropEvent(
-  SentryEvent event, {
-  Hint? hint,
-}) =>
+  SentryEvent event,
+  Hint hint,
+) =>
     null;
 
 SentryTransaction? beforeSendTransactionCallbackDropEvent(
@@ -1609,9 +1609,9 @@ SentryTransaction? beforeSendTransactionCallbackDropEvent(
     null;
 
 Future<SentryEvent?> asyncBeforeSendCallbackDropEvent(
-  SentryEvent event, {
+  SentryEvent event,
   Hint? hint,
-}) async {
+) async {
   await Future.delayed(Duration(milliseconds: 200));
   return null;
 }
@@ -1622,7 +1622,7 @@ Future<SentryTransaction?> asyncBeforeSendTransactionCallbackDropEvent(
   return null;
 }
 
-SentryEvent? beforeSendCallback(SentryEvent event, {Hint? hint}) {
+SentryEvent? beforeSendCallback(SentryEvent event, Hint hint) {
   return event
     ..tags!.addAll({'theme': 'material'})
     // ignore: deprecated_member_use_from_same_package
@@ -1698,8 +1698,7 @@ class Fixture {
     return client;
   }
 
-  Future<SentryEvent?> droppingBeforeSend(SentryEvent event,
-      {Hint? hint}) async {
+  Future<SentryEvent?> droppingBeforeSend(SentryEvent event, Hint hint) async {
     return null;
   }
 

flutter/example/integration_test/integration_test.dart

@@ -196,7 +196,7 @@ void main() {
 class Fixture {
   SentryEvent? sentEvent;
 
-  FutureOr<SentryEvent?> beforeSend(SentryEvent event, {Hint? hint}) async {
+  FutureOr<SentryEvent?> beforeSend(SentryEvent event, Hint hint) async {
     sentEvent = event;
     return event;
   }

flutter/example/lib/main.dart

@@ -2,7 +2,6 @@
 
 import 'dart:async';
 import 'dart:convert';
-import 'dart:io' show Platform;
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';