Add fragment to HTTP Client errors and fix user sync (#1102)

Author: marandaneto

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+### Fixes
+
+- Add missing `fragment` for HTTP Client Errors ([#1102](https://github.com/getsentry/sentry-dart/pull/1102))
+- Sync user name and geo for Android ([#1102](https://github.com/getsentry/sentry-dart/pull/1102))
+
 ### Dependencies
 
 - Bump Android SDK from v6.6.0 to v6.7.0 ([#1105](https://github.com/getsentry/sentry-dart/pull/1105))

dart/lib/src/http_client/failed_request_client.dart

@@ -157,9 +157,14 @@ class FailedRequestClient extends BaseClient {
   }) async {
     // As far as I can tell there's no way to get the uri without the query part
     // so we replace it with an empty string.
-    final urlWithoutQuery = request.url.replace(query: '').toString();
+    final urlWithoutQuery = request.url
+        .replace(query: '', fragment: '')
+        .toString()
+        .replaceAll('?', '')
+        .replaceAll('#', '');
 
     final query = request.url.query.isEmpty ? null : request.url.query;
+    final fragment = request.url.fragment.isEmpty ? null : request.url.fragment;
 
     final sentryRequest = SentryRequest(
       method: request.method,
@@ -172,6 +177,7 @@ class FailedRequestClient extends BaseClient {
         'content_length': request.contentLength.toString(),
         'duration': requestDuration.toString(),
       },
+      fragment: fragment,
     );
 
     final mechanism = Mechanism(

dart/test/http_client/failed_request_client_test.dart

@@ -9,7 +9,7 @@ import '../mocks.dart';
 import '../mocks/mock_hub.dart';
 import '../mocks/mock_transport.dart';
 
-final requestUri = Uri.parse('https://example.com?foo=bar');
+final requestUri = Uri.parse('https://example.com?foo=bar#myFragment');
 
 void main() {
   group(FailedRequestClient, () {
@@ -53,8 +53,9 @@ void main() {
       final request = eventCall.request;
       expect(request, isNotNull);
       expect(request?.method, 'GET');
-      expect(request?.url, 'https://example.com?');
+      expect(request?.url, 'https://example.com');
       expect(request?.queryString, 'foo=bar');
+      expect(request?.fragment, 'myFragment');
       expect(request?.cookies, 'foo=bar');
       expect(request?.headers, {'Cookie': 'foo=bar'});
       // ignore: deprecated_member_use_from_same_package
@@ -112,8 +113,9 @@ void main() {
       final request = eventCall.request;
       expect(request, isNotNull);
       expect(request?.method, 'GET');
-      expect(request?.url, 'https://example.com?');
+      expect(request?.url, 'https://example.com');
       expect(request?.queryString, 'foo=bar');
+      expect(request?.fragment, 'myFragment');
       expect(request?.cookies, 'foo=bar');
       expect(request?.headers, {'Cookie': 'foo=bar'});
       // ignore: deprecated_member_use_from_same_package

dio/lib/src/dio_event_processor.dart

@@ -119,10 +119,18 @@ class DioEventProcessor implements EventProcessor {
     final options = dioError.requestOptions;
     // As far as I can tell there's no way to get the uri without the query part
     // so we replace it with an empty string.
-    final urlWithoutQuery = options.uri.replace(query: '').toString();
+    final urlWithoutQuery = options.uri
+        .replace(query: '', fragment: '')
+        .toString()
+        .replaceAll('?', '')
+        .replaceAll('#', '');
 
     final query = options.uri.query.isEmpty ? null : options.uri.query;
 
+    // future proof, Dio does not support it yet and even if passing in the path,
+    // the parsing of the uri returns empty.
+    final fragment = options.uri.fragment.isEmpty ? null : options.uri.fragment;
+
     final headers = options.headers
         .map((key, dynamic value) => MapEntry(key, value?.toString() ?? ''));
 
@@ -132,6 +140,7 @@ class DioEventProcessor implements EventProcessor {
       url: urlWithoutQuery,
       queryString: query,
       data: _getRequestData(dioError.requestOptions.data),
+      fragment: fragment,
     );
   }
 

flutter/android/src/main/kotlin/io/sentry/flutter/SentryFlutterPlugin.kt

@@ -262,6 +262,7 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
     }
   }
 
+  @Suppress("ComplexMethod")
   private fun setUser(user: Map<String, Any?>?, result: Result) {
     if (user == null) {
       Sentry.setUser(null)
@@ -270,30 +271,44 @@ class SentryFlutterPlugin : FlutterPlugin, MethodCallHandler, ActivityAware {
     }
 
     val userInstance = User()
+    val userData = mutableMapOf<String, String>()
+    val unknown = mutableMapOf<String, Any>()
 
     (user["email"] as? String)?.let { userInstance.email = it }
     (user["id"] as? String)?.let { userInstance.id = it }
     (user["username"] as? String)?.let { userInstance.username = it }
     (user["ip_address"] as? String)?.let { userInstance.ipAddress = it }
     (user["segment"] as? String)?.let { userInstance.segment = it }
+
+    // Not mapped on Android yet, added to the unknown databag that gets serialized correctly anyway
+    // Should be solved by https://github.com/getsentry/team-mobile/issues/59
+    // or https://github.com/getsentry/team-mobile/issues/56
+    (user["name"] as? String)?.let { unknown["name"] = it }
+    (user["geo"] as? Map<String, Any?>)?.let { unknown["geo"] = it }
+
     (user["extras"] as? Map<String, Any?>)?.let { extras ->
-      val others = mutableMapOf<String, String>()
       for ((key, value) in extras.entries) {
         if (value != null) {
-          others[key] = value.toString()
+          userData[key] = value.toString()
         }
       }
-      userInstance.others = others
     }
     (user["data"] as? Map<String, Any?>)?.let { data ->
-      val others = mutableMapOf<String, String>()
       for ((key, value) in data.entries) {
         if (value != null) {
-          others[key] = value.toString()
+          // data has precedence over extras
+          userData[key] = value.toString()
         }
       }
     }
 
+    if (userData.isNotEmpty()) {
+      userInstance.data = userData
+    }
+    if (unknown.isNotEmpty()) {
+      userInstance.unknown = unknown
+    }
+
     Sentry.setUser(userInstance)
 
     result.success("")

flutter/ios/Classes/SentryFlutterPluginApple.swift

@@ -527,6 +527,10 @@ public class SentryFlutterPluginApple: NSObject, FlutterPlugin {
           }
         }
 
+        // missing name and geo
+        // Should be solved by https://github.com/getsentry/team-mobile/issues/59
+        // or https://github.com/getsentry/team-mobile/issues/56
+
         SentrySDK.setUser(userInstance)
       } else {
         SentrySDK.setUser(nil)