Send dropped event as well for rate limit and network error

dart/lib/src/sentry_envelope_item.dart

@@ -1,6 +1,8 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:meta/meta.dart';
+
 import 'client_reports/client_report.dart';
 import 'metrics/metric.dart';
 import 'protocol.dart';
@@ -12,7 +14,10 @@ import 'sentry_user_feedback.dart';
 
 /// Item holding header information and JSON encoded data.
 class SentryEnvelopeItem {
-  SentryEnvelopeItem(this.header, this.dataFactory);
+  /// The original, non-encoded object, used when direct access to the source data is needed.
+  Object? originalObject;
+
+  SentryEnvelopeItem(this.header, this.dataFactory, {this.originalObject});
 
   /// Creates a [SentryEnvelopeItem] which sends [SentryTransaction].
   factory SentryEnvelopeItem.fromTransaction(SentryTransaction transaction) {
@@ -24,7 +29,8 @@ class SentryEnvelopeItem {
       cachedItem.getDataLength,
       contentType: 'application/json',
     );
-    return SentryEnvelopeItem(header, cachedItem.getData);
+    return SentryEnvelopeItem(header, cachedItem.getData,
+        originalObject: transaction);
   }
 
   factory SentryEnvelopeItem.fromAttachment(SentryAttachment attachment) {
@@ -37,7 +43,8 @@ class SentryEnvelopeItem {
       fileName: attachment.filename,
       attachmentType: attachment.attachmentType,
     );
-    return SentryEnvelopeItem(header, cachedItem.getData);
+    return SentryEnvelopeItem(header, cachedItem.getData,
+        originalObject: attachment);
   }
 
   /// Create a [SentryEnvelopeItem] which sends [SentryUserFeedback].
@@ -50,7 +57,8 @@ class SentryEnvelopeItem {
       cachedItem.getDataLength,
       contentType: 'application/json',
     );
-    return SentryEnvelopeItem(header, cachedItem.getData);
+    return SentryEnvelopeItem(header, cachedItem.getData,
+        originalObject: feedback);
   }
 
   /// Create a [SentryEnvelopeItem] which holds the [SentryEvent] data.
@@ -59,13 +67,13 @@ class SentryEnvelopeItem {
         _CachedItem(() async => utf8JsonEncoder.convert(event.toJson()));
 
     return SentryEnvelopeItem(
-      SentryEnvelopeItemHeader(
-        SentryItemType.event,
-        cachedItem.getDataLength,
-        contentType: 'application/json',
-      ),
-      cachedItem.getData,
-    );
+        SentryEnvelopeItemHeader(
+          SentryItemType.event,
+          cachedItem.getDataLength,
+          contentType: 'application/json',
+        ),
+        cachedItem.getData,
+        originalObject: event);
   }
 
   /// Create a [SentryEnvelopeItem] which holds the [ClientReport] data.
@@ -80,6 +88,7 @@ class SentryEnvelopeItem {
         contentType: 'application/json',
       ),
       cachedItem.getData,
+      originalObject: clientReport,
     );
   }
 
@@ -102,7 +111,8 @@ class SentryEnvelopeItem {
       cachedItem.getDataLength,
       contentType: 'application/octet-stream',
     );
-    return SentryEnvelopeItem(header, cachedItem.getData);
+    return SentryEnvelopeItem(header, cachedItem.getData,
+        originalObject: buckets);
   }
 
   /// Header with info about type and length of data in bytes.

dart/lib/src/transport/data_category.dart

@@ -9,5 +9,24 @@ enum DataCategory {
   attachment,
   security,
   metricBucket,
-  unknown
+  unknown;
+
+  static DataCategory fromItemType(String itemType) {
+    switch (itemType) {
+      case 'event':
+        return DataCategory.error;
+      case 'session':
+        return DataCategory.session;
+      case 'attachment':
+        return DataCategory.attachment;
+      case 'transaction':
+        return DataCategory.transaction;
+      // The envelope item type used for metrics is statsd,
+      // whereas the client report category is metric_bucket
+      case 'statsd':
+        return DataCategory.metricBucket;
+      default:
+        return DataCategory.unknown;
+    }
+  }
 }

dart/lib/src/transport/rate_limiter.dart

@@ -1,3 +1,6 @@
+import 'dart:convert';
+
+import '../../sentry.dart';
 import '../transport/rate_limit_parser.dart';
 import '../sentry_options.dart';
 import '../sentry_envelope.dart';
@@ -25,8 +28,17 @@ class RateLimiter {
 
         _options.recorder.recordLostEvent(
           DiscardReason.rateLimitBackoff,
-          _categoryFromItemType(item.header.type),
+          DataCategory.fromItemType(item.header.type),
         );
+
+        final originalObject = item.originalObject;
+        if (originalObject is SentryTransaction) {
+          _options.recorder.recordLostEvent(
+            DiscardReason.rateLimitBackoff,
+            DataCategory.span,
+            count: originalObject.spans.length + 1,
+          );
+        }
       }
     }
 
@@ -80,7 +92,7 @@ class RateLimiter {
   // Private
 
   bool _isRetryAfter(String itemType) {
-    final dataCategory = _categoryFromItemType(itemType);
+    final dataCategory = DataCategory.fromItemType(itemType);
     final currentDate = DateTime.fromMillisecondsSinceEpoch(
         _options.clock().millisecondsSinceEpoch);
 
@@ -106,25 +118,6 @@ class RateLimiter {
     return false;
   }
 
-  DataCategory _categoryFromItemType(String itemType) {
-    switch (itemType) {
-      case 'event':
-        return DataCategory.error;
-      case 'session':
-        return DataCategory.session;
-      case 'attachment':
-        return DataCategory.attachment;
-      case 'transaction':
-        return DataCategory.transaction;
-      // The envelope item type used for metrics is statsd,
-      // whereas the client report category is metric_bucket
-      case 'statsd':
-        return DataCategory.metricBucket;
-      default:
-        return DataCategory.unknown;
-    }
-  }
-
   void _applyRetryAfterOnlyIfLonger(DataCategory dataCategory, DateTime date) {
     final oldDate = _rateLimitedUntil[dataCategory];
 

dart/lib/src/utils/transport_utils.dart

@@ -19,6 +19,21 @@ class TransportUtils {
       }
 
       if (response.statusCode >= 400 && response.statusCode != 429) {
+        for (final item in envelope.items) {
+          options.recorder.recordLostEvent(
+            DiscardReason.networkError,
+            DataCategory.fromItemType(item.header.type),
+          );
+
+          final originalObject = item.originalObject;
+          if (originalObject is SentryTransaction) {
+            options.recorder.recordLostEvent(
+              DiscardReason.networkError,
+              DataCategory.span,
+              count: originalObject.spans.length + 1,
+            );
+          }
+        }
         options.recorder
             .recordLostEvent(DiscardReason.networkError, DataCategory.error);
       }