Merge branch 'main' into main

Author: marandaneto

CHANGELOG.md

@@ -20,6 +20,7 @@
 
 ### Fixes
 
+* Add request instead of response data to `SentryRequest` in `DioEventProcessor` [#933](https://github.com/getsentry/sentry-dart/pull/933)
 * Context Escape with ScopeCallback ([#925](https://github.com/getsentry/sentry-dart/pull/925))
 
 ## 6.6.2

dio/lib/src/dio_event_processor.dart

@@ -6,7 +6,7 @@ import 'package:sentry/sentry.dart';
 import 'package:sentry/src/sentry_exception_factory.dart';
 
 /// This is an [EventProcessor], which improves crash reports of [DioError]s.
-/// It adds information about [DioError.response] if present and also about
+/// It adds information about [DioError.requestOptions] if present and also about
 /// the inner exceptions.
 class DioEventProcessor implements EventProcessor {
   // Because of obfuscation, we need to dynamically get the name
@@ -120,12 +120,11 @@ class DioEventProcessor implements EventProcessor {
       cookies: _options.sendDefaultPii
           ? options.headers['Cookie']?.toString()
           : null,
-      data: _getRequestData(dioError.response?.data),
+      data: _getRequestData(dioError.requestOptions.data),
     );
   }
 
   /// Returns the request data, if possible according to the users settings.
-  /// Type checks are based on DIOs [ResponseType].
   Object? _getRequestData(dynamic data) {
     if (!_options.sendDefaultPii) {
       return null;

dio/test/dio_event_processor_test.dart

@@ -42,19 +42,22 @@ void main() {
   test('$DioEventProcessor adds request', () {
     final sut = fixture.getSut(sendDefaultPii: true);
 
+    final request = requestOptions.copyWith(
+      method: 'POST',
+      data: 'foobar',
+    );
     final event = SentryEvent(
       throwable: DioError(
-        requestOptions: requestOptions,
+        requestOptions: request,
         response: Response<dynamic>(
-          requestOptions: requestOptions,
-          data: 'foobar',
+          requestOptions: request,
         ),
       ),
     );
     final processedEvent = sut.apply(event) as SentryEvent;
 
     expect(processedEvent.throwable, event.throwable);
-    expect(processedEvent.request?.method, 'GET');
+    expect(processedEvent.request?.method, 'POST');
     expect(processedEvent.request?.queryString, 'foo=bar');
     expect(processedEvent.request?.headers, <String, String>{
       'foo': 'bar',