update

Author: buenaflor

dart/lib/src/sentry_trace_context_header.dart

@@ -105,7 +105,7 @@ class SentryTraceContextHeader {
       baggage.setSampleRate(sampleRate!);
     }
     if (sampleRand != null) {
-      baggage.setSampleRate(sampleRand!);
+      baggage.setSampleRand(sampleRand!);
     }
     if (sampled != null) {
       baggage.setSampled(sampled!);
@@ -118,6 +118,7 @@ class SentryTraceContextHeader {
 
   factory SentryTraceContextHeader.fromBaggage(SentryBaggage baggage) {
     return SentryTraceContextHeader(
+      // TODO: implement and use proper get methods here
       SentryId.fromId(baggage.get('sentry-trace_id').toString()),
       baggage.get('sentry-public_key').toString(),
       release: baggage.get('sentry-release'),

dart/lib/src/sentry_tracer.dart

@@ -385,7 +385,7 @@ class SentryTracer extends ISentrySpan {
       transaction:
           _isHighQualityTransactionName(transactionNameSource) ? name : null,
       sampleRate: _sampleRateToString(_rootSpan.samplingDecision?.sampleRate),
-      sampleRand: _sampleRateToString(_rootSpan.samplingDecision?.sampleRand),
+      sampleRand: _sampleRandToString(_rootSpan.samplingDecision?.sampleRand),
       sampled: _rootSpan.samplingDecision?.sampled.toString(),
     );
 
@@ -399,6 +399,13 @@ class SentryTracer extends ISentrySpan {
     return sampleRate != null ? SampleRateFormat().format(sampleRate) : null;
   }
 
+  String? _sampleRandToString(double? sampleRand) {
+    if (!isValidSampleRand(sampleRand)) {
+      return null;
+    }
+    return sampleRand != null ? SampleRateFormat().format(sampleRand) : null;
+  }
+
   bool _isHighQualityTransactionName(SentryTransactionNameSource source) {
     return source != SentryTransactionNameSource.url;
   }

dart/lib/src/sentry_traces_sampler.dart

@@ -33,7 +33,7 @@ class SentryTracesSampler {
       try {
         final result = tracesSampler(samplingContext);
         if (result != null) {
-          return _sample2(result);
+          return _decideSampling(result);
         }
       } catch (exception, stackTrace) {
         _options.logger(
@@ -61,7 +61,7 @@ class SentryTracesSampler {
     double? optionsOrDefaultRate = optionsRate ?? defaultRate;
 
     if (optionsOrDefaultRate != null) {
-      return _sample2(optionsOrDefaultRate);
+      return _decideSampling(optionsOrDefaultRate);
     }
 
     return SentryTracesSamplingDecision(false);
@@ -75,7 +75,7 @@ class SentryTracesSampler {
     return _shouldSample(optionsRate);
   }
 
-  SentryTracesSamplingDecision _sample2(double sampleRate) {
+  SentryTracesSamplingDecision _decideSampling(double sampleRate) {
     final sampleRand = _random.nextDouble();
     return SentryTracesSamplingDecision(
         _shouldSample(sampleRate, sampleRand: sampleRand),

dart/lib/src/sentry_transaction_context.dart

@@ -8,20 +8,20 @@ import 'tracing.dart';
 @immutable
 class SentryTransactionContext extends SentrySpanContext {
   final String name;
-  final SentryTracesSamplingDecision? parentSamplingDecision;
   final SentryTransactionNameSource? transactionNameSource;
   final SentryTracesSamplingDecision? samplingDecision;
+  final SentryTracesSamplingDecision? parentSamplingDecision;
 
   SentryTransactionContext(
     this.name,
     String operation, {
     super.description,
-    this.parentSamplingDecision,
     super.traceId,
     super.spanId,
     super.parentSpanId,
     this.transactionNameSource,
     this.samplingDecision,
+    this.parentSamplingDecision,
     super.origin,
   }) : super(
           operation: operation,

dart/lib/src/utils/tracing_utils.dart

@@ -80,3 +80,10 @@ bool isValidSampleRate(double? sampleRate) {
   }
   return !sampleRate.isNaN && sampleRate >= 0.0 && sampleRate <= 1.0;
 }
+
+bool isValidSampleRand(double? sampleRand) {
+  if (sampleRand == null) {
+    return false;
+  }
+  return !sampleRand.isNaN && sampleRand >= 0.0 && sampleRand < 1.0;
+}

dart/test/protocol/sentry_baggage_header_test.dart

@@ -21,6 +21,7 @@ void main() {
       baggage.setUserSegment('userSegment');
       baggage.setTransaction('transaction');
       baggage.setSampleRate('1.0');
+      baggage.setSampleRand('0.4');
       baggage.setSampled('false');
       final replayId = SentryId.newId().toString();
       baggage.setReplayId(replayId);
@@ -37,6 +38,7 @@ void main() {
           'sentry-user_segment=userSegment,'
           'sentry-transaction=transaction,'
           'sentry-sample_rate=1.0,'
+          'sentry-sample_rand=0.4,'
           'sentry-sampled=false,'
           'sentry-replay_id=$replayId');
     });

dart/test/sentry_tracer_test.dart

@@ -487,6 +487,7 @@ void main() {
           SentryTracesSamplingDecision(
             true,
             sampleRate: 1.0,
+            sampleRand: 0.8,
           );
       final _context = SentryTransactionContext(
         'name',
@@ -512,6 +513,7 @@ void main() {
       expect(newBaggage.get('sentry-user_segment'), 'segment');
       expect(newBaggage.get('sentry-transaction'), 'name');
       expect(newBaggage.get('sentry-sample_rate'), '1');
+      expect(newBaggage.getSampleRand(), 0.8);
       expect(newBaggage.get('sentry-sampled'), 'true');
     });