feat: Add support to send OTEL traces via OTLP #4899
+640
−106
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| using Sentry.Extensibility; | ||
| using Sentry.Internal.OpenTelemetry; | ||
|
|
||
| namespace Sentry.OpenTelemetry; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| using Sentry.Extensibility; | ||
| using Sentry.Internal; | ||
|
|
||
| namespace Sentry.OpenTelemetry; | ||
|
|
||
| internal class OtelPropagationContext : IPropagationContext | ||
| { | ||
| public DynamicSamplingContext? DynamicSamplingContext { get; private set; } | ||
|
|
||
| public SentryId TraceId => Activity.Current?.TraceId.AsSentryId() ?? default; | ||
| public SpanId SpanId => Activity.Current?.SpanId.AsSentrySpanId() ?? default; | ||
| public SpanId? ParentSpanId => Activity.Current?.ParentSpanId.AsSentrySpanId(); | ||
|
|
||
| /// <summary> | ||
| /// Warning: this method may throw an exception if Activity.Current is null. | ||
| /// This method should not be used when instrumenting with OTEL. | ||
| /// </summary> | ||
| public DynamicSamplingContext GetOrCreateDynamicSamplingContext(SentryOptions options, IReplaySession replaySession) | ||
| { | ||
| if (DynamicSamplingContext is null) | ||
| { | ||
| options.LogDebug("Creating the Dynamic Sampling Context from the Propagation Context."); | ||
| DynamicSamplingContext = this.CreateDynamicSamplingContext(options, replaySession); | ||
| } | ||
|
|
||
| return DynamicSamplingContext; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |
| using OpenTelemetry; | ||
| using OpenTelemetry.Context.Propagation; | ||
| using Sentry.Extensibility; | ||
| using Sentry.Internal.OpenTelemetry; | ||
|
|
||
| namespace Sentry.OpenTelemetry; | ||
|
|
||
|
|
@@ -49,12 +50,12 @@ private static class OTelKeys | |
| } | ||
|
|
||
| /// <inheritdoc /> | ||
|
Collaborator
Author
There was a problem hiding this comment. @Flash0ver turns out I had to bring the bump to 1.10.0 forward in order to address this... and it looks like the bump introduces a breaking change - they changed the nullability on some of the methods in a base class that we're overriding. Unfortunately this is on a class that is also marked as Still... bit of a pain. |
||
| public override PropagationContext Extract<T>(PropagationContext context, T carrier, Func<T, string, IEnumerable<string>?> getter) | ||
| { | ||
| Options?.LogDebug("SentryPropagator.Extract"); | ||
|
|
||
| var result = base.Extract(context, carrier, getter); | ||
| var baggage = result.Baggage; // The Otel .NET SDK takes care of baggage headers already | ||
|
|
||
| Options?.LogDebug("Baggage"); | ||
| foreach (var entry in baggage) | ||
|
|
@@ -121,13 +122,17 @@ public override void Inject<T>(PropagationContext context, T carrier, Action<T, | |
| base.Inject(context, carrier, setter); | ||
| } | ||
|
|
||
| private static SentryTraceHeader? TryGetSentryTraceHeader<T>(T carrier, Func<T, string, IEnumerable<string>?> getter) | ||
| { | ||
| var headerValue = getter(carrier, SentryTraceHeader.HttpHeaderName); | ||
| if (headerValue is null) | ||
| { | ||
| return null; | ||
| } | ||
| try | ||
| { | ||
| var value = new StringValues(headerValue.ToArray()); | ||
| return SentryTraceHeader.Parse(value!); | ||
| } | ||
| catch (Exception) | ||
| { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Root activity ParentSpanId returns zero instead of null
Medium Severity
OtelPropagationContext.ParentSpanIdreturns a non-null zeroSpanId("0000000000000000") for root activities instead ofnull. WhenActivity.Currentis a root activity (no parent),Activity.ParentSpanIdreturnsdefault(ActivitySpanId), whichAsSentrySpanId()converts to a validSpanId. The?.operator only producesnullwhenActivity.Currentitself is null. This causes events captured during root OTEL activities to include a bogusparent_span_idin their trace context, inconsistent withSentryPropagationContextwhich correctly usesnullfor root spans.