From d496afc06560ba77d5b0b9c43df51e7bcf4a01a5 Mon Sep 17 00:00:00 2001
From: Igor Khramtsov <igor.khramtsov@aktiv.com>
Date: Tue, 23 Jan 2024 15:42:14 +0400
Subject: [PATCH 1/2] feat: tracing without performance for dio

---
 dio/lib/src/tracing_client_adapter.dart   | 31 +++++++++++++++----
 dio/test/tracing_client_adapter_test.dart | 37 ++++++++++++++++++-----
 2 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/dio/lib/src/tracing_client_adapter.dart b/dio/lib/src/tracing_client_adapter.dart
index 19a003b633..0c8def1442 100644
--- a/dio/lib/src/tracing_client_adapter.dart
+++ b/dio/lib/src/tracing_client_adapter.dart
@@ -51,12 +51,12 @@ class TracingClientAdapter implements HttpClientAdapter {
 
     ResponseBody? response;
     try {
-      if (span != null) {
-        if (containsTargetOrMatchesRegExp(
-          // ignore: invalid_use_of_internal_member
-          _hub.options.tracePropagationTargets,
-          options.uri.toString(),
-        )) {
+      if (containsTargetOrMatchesRegExp(
+        // ignore: invalid_use_of_internal_member
+        _hub.options.tracePropagationTargets,
+        options.uri.toString(),
+      )) {
+        if (span != null) {
           addSentryTraceHeaderFromSpan(span, options.headers);
           addBaggageHeaderFromSpan(
             span,
@@ -64,6 +64,25 @@ class TracingClientAdapter implements HttpClientAdapter {
             // ignore: invalid_use_of_internal_member
             logger: _hub.options.logger,
           );
+        } else {
+          // ignore: invalid_use_of_internal_member
+          final scope = _hub.scope;
+          // ignore: invalid_use_of_internal_member
+          final propagationContext = scope.propagationContext;
+
+          final traceHeader = propagationContext.toSentryTrace();
+          addSentryTraceHeader(traceHeader, options.headers);
+
+          final baggage = propagationContext.baggage;
+          if (baggage != null) {
+            final baggageHeader = SentryBaggageHeader.fromBaggage(baggage);
+            addBaggageHeader(
+              baggageHeader,
+              options.headers,
+              // ignore: invalid_use_of_internal_member
+              logger: _hub.options.logger,
+            );
+          }
         }
       }
 
diff --git a/dio/test/tracing_client_adapter_test.dart b/dio/test/tracing_client_adapter_test.dart
index b758c5a765..f67ec4c14d 100644
--- a/dio/test/tracing_client_adapter_test.dart
+++ b/dio/test/tracing_client_adapter_test.dart
@@ -127,25 +127,48 @@ void main() {
       );
     });
 
-    test('captured span do not add headers if NoOp', () async {
+    test('do not throw if no span bound to the scope', () async {
+      final sut = fixture.getSut(
+        client: fixture.getClient(statusCode: 200, reason: 'OK'),
+      );
+
+      await sut.get<dynamic>(requestOptions);
+    });
+
+    test('set headers from propagationContext when tracing is disabled',
+        () async {
+      fixture._options.enableTracing = false;
       final sut = fixture.getSut(
         client: fixture.getClient(statusCode: 200, reason: 'OK'),
       );
-      await fixture._hub
-          .configureScope((scope) => scope.span = NoOpSentrySpan());
+
+      final propagationContext = fixture._hub.scope.propagationContext;
+      propagationContext.baggage = SentryBaggage({'foo': 'bar'});
 
       final response = await sut.get<dynamic>(requestOptions);
 
-      expect(response.headers['baggage'], null);
-      expect(response.headers['sentry-trace'], null);
+      expect(
+        response.headers['sentry-trace'],
+        [propagationContext.toSentryTrace().value],
+      );
+      expect(response.headers['baggage'], ['foo=bar']);
     });
 
-    test('do not throw if no span bound to the scope', () async {
+    test('set headers from propagationContext when no transaction', () async {
       final sut = fixture.getSut(
         client: fixture.getClient(statusCode: 200, reason: 'OK'),
       );
 
-      await sut.get<dynamic>(requestOptions);
+      final propagationContext = fixture._hub.scope.propagationContext;
+      propagationContext.baggage = SentryBaggage({'foo': 'bar'});
+
+      final response = await sut.get<dynamic>(requestOptions);
+
+      expect(
+        response.headers['sentry-trace'],
+        [propagationContext.toSentryTrace().value],
+      );
+      expect(response.headers['baggage'], ['foo=bar']);
     });
   });
 }

From c6d296f69fa7f4fff52a905cdb666ee831d6c69b Mon Sep 17 00:00:00 2001
From: Igor Khramtsov <igor.khramtsov@aktiv.com>
Date: Tue, 23 Jan 2024 16:17:16 +0400
Subject: [PATCH 2/2] chore: update CHANGELOG.md

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e073b7b29f..90f7e8c19a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Tracing without performance for Dio integration ([#1837](https://github.com/getsentry/sentry-dart/pull/1837))
+
 ## 7.15.0
 
 ### Features