Merge branch 'main' into fix/discard-empty-stack-frames

Author: denrase

.github/workflows/flutter_test.yml

@@ -59,19 +59,20 @@ jobs:
           path: |
             ~/.android/avd/*
             ~/.android/adb*
-          key: avd-21
+          key: avd-31
 
       - name: create AVD and generate snapshot for caching
         if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #[email protected]
         with:
           working-directory: ./flutter/example
-          api-level: 21
-          force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          disable-animations: false
-          arch: x86_64
+          api-level: 31
           profile: Nexus 6
+          arch: x86_64
+          force-avd-creation: false
+          avd-name: macOS-avd-x86_64-31
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
           script: echo 'Generated AVD snapshot for caching.'
 
       - name: build apk
@@ -82,24 +83,26 @@ jobs:
         uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #[email protected]
         with:
           working-directory: ./flutter/example/android
-          api-level: 21
+          api-level: 31
+          profile: Nexus 6
+          arch: x86_64
           force-avd-creation: false
+          avd-name: macOS-avd-x86_64-31
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          arch: x86_64
-          profile: Nexus 6
           script: ./gradlew testDebugUnitTest
 
       - name: launch android emulator & run android integration test
         uses: reactivecircus/android-emulator-runner@d94c3fbe4fe6a29e4a5ba47c12fb47677c73656b #[email protected]
         with:
           working-directory: ./flutter/example
-          api-level: 21
+          api-level: 31
+          profile: Nexus 6
+          arch: x86_64
           force-avd-creation: false
+          avd-name: macOS-avd-x86_64-31
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
-          arch: x86_64
-          profile: Nexus 6
           script: flutter test integration_test/integration_test.dart --verbose
 
   test-ios:
@@ -134,7 +137,7 @@ jobs:
       - name: launch ios simulator
         id: sim
         run: |
-          simulator_id=$(xcrun simctl create sentryPhone com.apple.CoreSimulator.SimDeviceType.iPhone-14 com.apple.CoreSimulator.SimRuntime.iOS-16-2)
+          simulator_id=$(xcrun simctl create sentryPhone com.apple.CoreSimulator.SimDeviceType.iPhone-14 com.apple.CoreSimulator.SimRuntime.iOS-16-4)
           echo "SIMULATOR_ID=${simulator_id}" >> "$GITHUB_OUTPUT"
           xcrun simctl boot ${simulator_id}
 # Disable flutter integration tests because of flaky execution

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+### Enhancements
+
+- Add http.request.method attribute to http spans data ([#1633](https://github.com/getsentry/sentry-dart/pull/1633))
+- Add db.system and db.name attributes to db spans data ([#1629](https://github.com/getsentry/sentry-dart/pull/1629))
+
+### Features
+
+- Tracing without performance ([#1621](https://github.com/getsentry/sentry-dart/pull/1621))
+
 ### Fixes
 
 - Normalize data properties of `SentryUser` and `Breadcrumb` before sending over method channel ([#1591](https://github.com/getsentry/sentry-dart/pull/1591))
@@ -13,9 +22,9 @@
 - Bump Android SDK from v6.25.2 to v6.28.0 ([#1586](https://github.com/getsentry/sentry-dart/pull/1586))
   - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6280)
   - [diff](https://github.com/getsentry/sentry-java/compare/6.25.2...6.28.0)
-- Bump Cocoa SDK from v8.9.1 to v8.10.0 ([#1584](https://github.com/getsentry/sentry-dart/pull/1584), [#1606](https://github.com/getsentry/sentry-dart/pull/1606))
-  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8100)
-  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.9.1...8.10.0)
+- Bump Cocoa SDK from v8.9.1 to v8.11.0 ([#1584](https://github.com/getsentry/sentry-dart/pull/1584), [#1606](https://github.com/getsentry/sentry-dart/pull/1606), [#1626](https://github.com/getsentry/sentry-dart/pull/1626))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8110)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.9.1...8.11.0)
 
 ## 7.9.0
 

dart/lib/src/http_client/tracing_client.dart

@@ -41,20 +41,33 @@ class TracingClient extends BaseClient {
       span = null;
     }
 
-    span?.setData('http.method', request.method);
+    span?.setData('http.request.method', request.method);
     urlDetails?.applyToSpan(span);
 
     StreamedResponse? response;
     try {
-      if (span != null) {
-        if (containsTargetOrMatchesRegExp(
-            _hub.options.tracePropagationTargets, request.url.toString())) {
-          addSentryTraceHeader(span, request.headers);
-          addBaggageHeader(
+      if (containsTargetOrMatchesRegExp(
+          _hub.options.tracePropagationTargets, request.url.toString())) {
+        if (span != null) {
+          addSentryTraceHeaderFromSpan(span, request.headers);
+          addBaggageHeaderFromSpan(
             span,
             request.headers,
             logger: _hub.options.logger,
           );
+        } else {
+          final scope = _hub.scope;
+          final propagationContext = scope.propagationContext;
+
+          final traceHeader = propagationContext.toSentryTrace();
+          addSentryTraceHeader(traceHeader, request.headers);
+
+          final baggage = propagationContext.baggage;
+          if (baggage != null) {
+            final baggageHeader = SentryBaggageHeader.fromBaggage(baggage);
+            addBaggageHeader(baggageHeader, request.headers,
+                logger: _hub.options.logger);
+          }
         }
       }
 

dart/lib/src/hub.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:collection';
 
 import 'package:meta/meta.dart';
+import 'propagation_context.dart';
 import 'transport/data_category.dart';
 
 import '../sentry.dart';
@@ -65,6 +66,9 @@ class Hub {
   /// Last event id recorded by the Hub
   SentryId get lastEventId => _lastEventId;
 
+  @internal
+  Scope get scope => _peek().scope;
+
   /// Captures the event.
   Future<SentryId> captureEvent(
     SentryEvent event, {
@@ -426,10 +430,8 @@ class Hub {
         "Instance is disabled and this 'startTransaction' call is a no-op.",
       );
     } else if (!_options.isTracingEnabled()) {
-      _options.logger(
-        SentryLevel.info,
-        "Tracing is disabled and this 'startTransaction' returns a no-op.",
-      );
+      final item = _peek();
+      item.scope.propagationContext = PropagationContext();
     } else {
       final item = _peek();
 

dart/lib/src/hub_adapter.dart

@@ -5,6 +5,7 @@ import 'hint.dart';
 
 import 'hub.dart';
 import 'protocol.dart';
+import 'scope.dart';
 import 'sentry.dart';
 import 'sentry_client.dart';
 import 'sentry_user_feedback.dart';
@@ -166,4 +167,7 @@ class HubAdapter implements Hub {
     String transaction,
   ) =>
       Sentry.currentHub.setSpanContext(throwable, span, transaction);
+
+  @override
+  Scope get scope => Sentry.currentHub.scope;
 }

dart/lib/src/noop_hub.dart

@@ -5,6 +5,7 @@ import 'package:meta/meta.dart';
 import 'hint.dart';
 import 'hub.dart';
 import 'protocol.dart';
+import 'scope.dart';
 import 'sentry_client.dart';
 import 'sentry_options.dart';
 import 'sentry_user_feedback.dart';
@@ -118,4 +119,7 @@ class NoOpHub implements Hub {
 
   @override
   void setSpanContext(throwable, ISentrySpan span, String transaction) {}
+
+  @override
+  Scope get scope => Scope(_options);
 }

dart/lib/src/propagation_context.dart

@@ -0,0 +1,12 @@
+import 'package:meta/meta.dart';
+import 'protocol.dart';
+import 'sentry_baggage.dart';
+
+@internal
+class PropagationContext {
+  late SentryId traceId = SentryId.newId();
+  late SpanId spanId = SpanId.newId();
+  SentryBaggage? baggage;
+
+  SentryTraceHeader toSentryTrace() => SentryTraceHeader(traceId, spanId);
+}

dart/lib/src/protocol/sentry_trace_context.dart

@@ -1,5 +1,7 @@
 import 'package:meta/meta.dart';
 
+import '../../sentry.dart';
+import '../propagation_context.dart';
 import '../protocol.dart';
 
 @immutable
@@ -87,4 +89,14 @@ class SentryTraceContext {
     this.origin,
   })  : traceId = traceId ?? SentryId.newId(),
         spanId = spanId ?? SpanId.newId();
+
+  @internal
+  factory SentryTraceContext.fromPropagationContext(
+      PropagationContext propagationContext) {
+    return SentryTraceContext(
+      traceId: propagationContext.traceId,
+      spanId: propagationContext.spanId,
+      operation: 'default',
+    );
+  }
 }

dart/lib/src/scope.dart

@@ -1,8 +1,11 @@
 import 'dart:async';
 import 'dart:collection';
 
+import 'package:meta/meta.dart';
+
 import 'event_processor.dart';
 import 'hint.dart';
+import 'propagation_context.dart';
 import 'protocol.dart';
 import 'scope_observer.dart';
 import 'sentry_attachment/sentry_attachment.dart';
@@ -39,6 +42,9 @@ class Scope {
   /// Returns active transaction or null if there is no active transaction.
   ISentrySpan? span;
 
+  @internal
+  PropagationContext propagationContext = PropagationContext();
+
   SentryUser? _user;
 
   /// Get the current user.
@@ -311,10 +317,15 @@ class Scope {
     });
 
     final newSpan = span;
-    if (event.contexts.trace == null && newSpan != null) {
-      event.contexts.trace = newSpan.context.toTraceContext(
-        sampled: newSpan.samplingDecision?.sampled,
-      );
+    if (event.contexts.trace == null) {
+      if (newSpan != null) {
+        event.contexts.trace = newSpan.context.toTraceContext(
+          sampled: newSpan.samplingDecision?.sampled,
+        );
+      } else {
+        event.contexts.trace =
+            SentryTraceContext.fromPropagationContext(propagationContext);
+      }
     }
 
     SentryEvent? processedEvent = event;

dart/lib/src/sentry_baggage.dart

@@ -1,4 +1,7 @@
-import 'protocol/sentry_level.dart';
+import 'package:meta/meta.dart';
+import 'scope.dart';
+import 'protocol.dart';
+
 import 'sentry_options.dart';
 
 class SentryBaggage {
@@ -87,6 +90,27 @@ class SentryBaggage {
     return SentryBaggage(keyValues, logger: logger);
   }
 
+  @internal
+  setValuesFromScope(Scope scope, SentryOptions options) {
+    final propagationContext = scope.propagationContext;
+    setTraceId(propagationContext.traceId.toString());
+    if (options.dsn != null) {
+      setPublicKey(Dsn.parse(options.dsn!).publicKey);
+    }
+    if (options.release != null) {
+      setRelease(options.release!);
+    }
+    if (options.environment != null) {
+      setEnvironment(options.environment!);
+    }
+    if (scope.user?.id != null) {
+      setUserId(scope.user!.id!);
+    }
+    if (scope.user?.segment != null) {
+      setUserSegment(scope.user!.segment!);
+    }
+  }
+
   static Map<String, String> _extractKeyValuesFromBaggageString(
     String headerValue, {
     SentryLogger? logger,

dart/lib/src/sentry_client.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
 import 'dart:math';
 import 'package:meta/meta.dart';
+import 'sentry_baggage.dart';
 import 'sentry_attachment/sentry_attachment.dart';
 
 import 'event_processor.dart';
@@ -122,11 +123,24 @@ class SentryClient {
       attachments.add(viewHierarchy);
     }
 
+    var traceContext = scope?.span?.traceContext();
+    if (traceContext == null) {
+      if (scope?.propagationContext.baggage == null) {
+        scope?.propagationContext.baggage =
+            SentryBaggage({}, logger: _options.logger);
+        scope?.propagationContext.baggage?.setValuesFromScope(scope, _options);
+      }
+      if (scope != null) {
+        traceContext = SentryTraceContextHeader.fromBaggage(
+            scope.propagationContext.baggage!);
+      }
+    }
+
     final envelope = SentryEnvelope.fromEvent(
       preparedEvent,
       _options.sdk,
       dsn: _options.dsn,
-      traceContext: scope?.span?.traceContext(),
+      traceContext: traceContext,
       attachments: attachments.isNotEmpty ? attachments : null,
     );
 

dart/lib/src/sentry_trace_context_header.dart

@@ -79,4 +79,13 @@ class SentryTraceContextHeader {
 
     return baggage;
   }
+
+  factory SentryTraceContextHeader.fromBaggage(SentryBaggage baggage) {
+    return SentryTraceContextHeader(
+      SentryId.fromId(baggage.get('sentry-trace_id').toString()),
+      baggage.get('sentry-public_key').toString(),
+      release: baggage.get('sentry-release'),
+      environment: baggage.get('sentry-environment'),
+    );
+  }
 }