Merge branch 'main' into sentry_tunnel

dart/lib/src/sentry_client.dart

@@ -133,8 +133,9 @@ class SentryClient {
     final envelope = SentryEnvelope.fromEvent(
       preparedEvent,
       _options.sdk,
-      _options.dsn,
-      attachments: scope?.attachements,
+      dsn: _options.dsn,
+      traceContext: scope?.span?.traceContext(),
+      attachments: scope?.attachments,
     );
 
     final id = await captureEnvelope(envelope);

dart/lib/src/sentry_envelope.dart

@@ -23,12 +23,18 @@ class SentryEnvelope {
   /// Create an [SentryEnvelope] with containing one [SentryEnvelopeItem] which holds the [SentryEvent] data.
   factory SentryEnvelope.fromEvent(
     SentryEvent event,
-    SdkVersion sdkVersion,
-    String? dsn, {
+    SdkVersion sdkVersion, {
+    String? dsn,
+    SentryTraceContextHeader? traceContext,
     List<SentryAttachment>? attachments,
   }) {
     return SentryEnvelope(
-      SentryEnvelopeHeader(event.eventId, sdkVersion, dsn),
+      SentryEnvelopeHeader(
+        event.eventId,
+        sdkVersion,
+        dsn: dsn,
+        traceContext: traceContext,
+      ),
       [
         SentryEnvelopeItem.fromEvent(event),
         if (attachments != null)
@@ -42,7 +48,8 @@ class SentryEnvelope {
     SdkVersion sdkVersion,
   ) {
     return SentryEnvelope(
-      SentryEnvelopeHeader(feedback.eventId, sdkVersion, null),
+      // no need for [traceContext]
+      SentryEnvelopeHeader(feedback.eventId, sdkVersion),
       [SentryEnvelopeItem.fromUserFeedback(feedback)],
     );
   }
@@ -51,11 +58,17 @@ class SentryEnvelope {
   factory SentryEnvelope.fromTransaction(
     SentryTransaction transaction,
     SdkVersion sdkVersion, {
+    String? dsn,
     SentryTraceContextHeader? traceContext,
     List<SentryAttachment>? attachments,
   }) {
     return SentryEnvelope(
-      SentryEnvelopeHeader(transaction.eventId, sdkVersion, null),
+      SentryEnvelopeHeader(
+        transaction.eventId,
+        sdkVersion,
+        dsn: dsn,
+        traceContext: traceContext,
+      ),
       [
         SentryEnvelopeItem.fromTransaction(transaction),
         if (attachments != null)

dart/lib/src/sentry_envelope_header.dart

@@ -4,18 +4,26 @@ import 'sentry_trace_context_header.dart';
 
 /// Header containing `SentryId` and `SdkVersion`.
 class SentryEnvelopeHeader {
-  SentryEnvelopeHeader(this.eventId, this.sdkVersion, this.dsn);
+  SentryEnvelopeHeader(
+    this.eventId,
+    this.sdkVersion, {
+    this.dsn,
+    this.traceContext,
+  });
   SentryEnvelopeHeader.newEventId()
       : eventId = SentryId.newId(),
         sdkVersion = null,
-        dsn = null;
+        dsn = null,
+        traceContext = null;
 
   /// The identifier of encoded `SentryEvent`.
   final SentryId? eventId;
 
   /// The `SdkVersion` with which the envelope was send.
   final SdkVersion? sdkVersion;
 
+  final SentryTraceContextHeader? traceContext;
+
   /// The `DSN` of the Sentry project.
   final String? dsn;
 
@@ -32,6 +40,12 @@ class SentryEnvelopeHeader {
     if (tempSdkVersion != null) {
       json['sdk'] = tempSdkVersion.toJson();
     }
+
+    final tempTraceContext = traceContext;
+    if (tempTraceContext != null) {
+      json['trace'] = tempTraceContext.toJson();
+    }
+
     if (dsn != null) {
       json['dsn'] = dsn;
     }

dart/test/sentry_envelope_header_test.dart

@@ -16,7 +16,15 @@ void main() {
         name: 'fixture-sdkName',
         version: 'fixture-version',
       );
-      final sut = SentryEnvelopeHeader(eventId, sdkVersion, null);
+      final context = SentryTraceContextHeader.fromJson(<String, dynamic>{
+        'trace_id': '${SentryId.newId()}',
+        'public_key': '123',
+      });
+      final sut = SentryEnvelopeHeader(
+        eventId,
+        sdkVersion,
+        traceContext: context,
+      );
       final expextedSkd = sdkVersion.toJson();
       final expected = <String, dynamic>{
         'event_id': eventId.toString(),

dart/test/sentry_envelope_test.dart

@@ -27,7 +27,15 @@ void main() {
 
       final item = SentryEnvelopeItem(itemHeader, dataFactory);
 
-      final header = SentryEnvelopeHeader(eventId, null, null);
+      final context = SentryTraceContextHeader.fromJson(<String, dynamic>{
+        'trace_id': '${SentryId.newId()}',
+        'public_key': '123',
+      });
+      final header = SentryEnvelopeHeader(
+        eventId,
+        null,
+        traceContext: context,
+      );
       final sut = SentryEnvelope(header, [item, item]);
 
       final expectedHeaderJson = header.toJson();
@@ -52,9 +60,17 @@ void main() {
       final sentryEvent = SentryEvent(eventId: eventId);
       final sdkVersion =
           SdkVersion(name: 'fixture-name', version: 'fixture-version');
+      final context = SentryTraceContextHeader.fromJson(<String, dynamic>{
+        'trace_id': '${SentryId.newId()}',
+        'public_key': '123',
+      });
       final fakeDsn = 'https://[email protected]/1234567';
-      final sut =
-          SentryEnvelope.fromEvent(sentryEvent, sdkVersion, fakeDsn);
+      final sut = SentryEnvelope.fromEvent(
+        sentryEvent,
+        sdkVersion,
+        dsn: fakeDsn,
+        traceContext: context,
+      );
 
       final expectedEnvelopeItem = SentryEnvelopeItem.fromEvent(sentryEvent);