Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
propagate trace for http requests
  • Loading branch information
buenaflor committed Sep 4, 2023
commit 83670a5c385c39a850ac5e2423231d1cce1da3be
23 changes: 18 additions & 5 deletions dart/lib/src/http_client/tracing_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,28 @@ class TracingClient extends BaseClient {

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 = SentryTraceHeader(
propagationContext.traceId, propagationContext.spanId);
addSentryTraceheader(traceHeader, request.headers);

final baggage = propagationContext.baggage;
if (baggage != null) {
final baggageHeader = SentryBaggageHeader.fromBaggage(baggage);
addBaggageHeader(baggageHeader, request.headers, logger: _hub.options.logger);
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions dart/lib/src/hub.dart
Original file line number Diff line number Diff line change
Expand Up @@ -66,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, {
Expand Down
23 changes: 18 additions & 5 deletions dart/lib/src/utils/tracing_utils.dart
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
import '../../sentry.dart';

void addSentryTraceHeader(ISentrySpan span, Map<String, dynamic> headers) {
void addSentryTraceHeaderFromSpan(ISentrySpan span, Map<String, dynamic> headers) {
final traceHeader = span.toSentryTrace();
headers[traceHeader.name] = traceHeader.value;
}

void addSentryTraceheader(SentryTraceHeader traceHeader, Map<String, dynamic> headers) {
headers[traceHeader.name] = traceHeader.value;
}

void addBaggageHeaderFromSpan(
ISentrySpan span,
Map<String, dynamic> headers, {
SentryLogger? logger,
}) {
final baggage = span.toBaggageHeader();
if (baggage != null) {
addBaggageHeader(baggage, headers, logger: logger);
}
}


void addBaggageHeader(
ISentrySpan span,
SentryBaggageHeader baggage,
Map<String, dynamic> headers, {
SentryLogger? logger,
}) {
final baggage = span.toBaggageHeader();
if (baggage != null) {
final currentValue = headers[baggage.name] as String? ?? '';

final currentBaggage = SentryBaggage.fromHeader(
Expand All @@ -36,7 +50,6 @@ void addBaggageHeader(
final newBaggage = SentryBaggage(mergedBaggage, logger: logger);

headers[baggage.name] = newBaggage.toHeaderString();
}
}

bool containsTargetOrMatchesRegExp(
Expand Down