Skip to content

[api] Fix Tracer.StartRootSpan so that it always creates a root span #4890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CodeBlanch merged 5 commits into from
Sep 29, 2023
Merged

[api] Fix Tracer.StartRootSpan so that it always creates a root span #4890

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9eae6eb
Fix Tracer.StartRootSpan so that it always creates a root span.
CodeBlanch Sep 26, 2023
f2164ad
CHANGELOG patch.
CodeBlanch Sep 26, 2023
114a42a
Merge branch 'main' into api-tracer-startrootspan-fix
CodeBlanch Sep 29, 2023
11ff3d1
Code review.
CodeBlanch Sep 29, 2023
b447a51
Merge branch 'main' into api-tracer-startrootspan-fix
CodeBlanch Sep 29, 2023
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
Code review.
  • Loading branch information
@CodeBlanch
CodeBlanch committed Sep 29, 2023
commit 11ff3d17d6908d890b18c8717d81f7f97fde2e78
16 changes: 8 additions & 8 deletions src/OpenTelemetry.Api/Trace/Tracer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ internal Tracer(ActivitySource activitySource)
[Flags]
private enum StartSpanBehaviors
{
Active = 0b1,
Inactive = 0b10,
Root = 0b100,
ActivateNewSpan = 0b1,
DeactivateNewSpan = 0b10,
NewSpanAsRoot = 0b100,
}

/// <summary>
Expand Down Expand Up @@ -94,7 +94,7 @@ public TelemetrySpan StartRootSpan(
IEnumerable<Link>? links = null,
DateTimeOffset startTime = default)
{
return this.StartSpanHelper(StartSpanBehaviors.Root | StartSpanBehaviors.Inactive, name, kind, default, initialAttributes, links, startTime);
return this.StartSpanHelper(StartSpanBehaviors.NewSpanAsRoot | StartSpanBehaviors.DeactivateNewSpan, name, kind, default, initialAttributes, links, startTime);
}

/// <summary>
Expand Down Expand Up @@ -140,7 +140,7 @@ public TelemetrySpan StartSpan(
IEnumerable<Link>? links = null,
DateTimeOffset startTime = default)
{
return this.StartSpanHelper(StartSpanBehaviors.Inactive, name, kind, in parentContext, initialAttributes, links, startTime);
return this.StartSpanHelper(StartSpanBehaviors.DeactivateNewSpan, name, kind, in parentContext, initialAttributes, links, startTime);
}

/// <summary>
Expand Down Expand Up @@ -186,7 +186,7 @@ public TelemetrySpan StartActiveSpan(
IEnumerable<Link>? links = null,
DateTimeOffset startTime = default)
{
return this.StartSpanHelper(StartSpanBehaviors.Active, name, kind, in parentContext, initialAttributes, links, startTime);
return this.StartSpanHelper(StartSpanBehaviors.ActivateNewSpan, name, kind, in parentContext, initialAttributes, links, startTime);
}

[MethodImpl(MethodImplOptions.AggressiveInlining)]
Expand Down Expand Up @@ -222,7 +222,7 @@ private TelemetrySpan StartSpanHelper(
var activityLinks = links?.Select(l => l.ActivityLink);
var previousActivity = Activity.Current;

if (startSpanBehavior.HasFlag(StartSpanBehaviors.Root)
if (startSpanBehavior.HasFlag(StartSpanBehaviors.NewSpanAsRoot)
&& previousActivity != null)
{
Activity.Current = null;
Expand All @@ -237,7 +237,7 @@ private TelemetrySpan StartSpanHelper(
}
finally
{
if (startSpanBehavior.HasFlag(StartSpanBehaviors.Inactive)
if (startSpanBehavior.HasFlag(StartSpanBehaviors.DeactivateNewSpan)
&& Activity.Current != previousActivity)
{
Activity.Current = previousActivity;
Expand Down