Skip to content

Commit 25cf4fa

Browse files
zacharycmontoyazacharycmontoya
authored
Modify tests to use Tracer.StartActive(string, SpanCreationSettings) (DataDog#2191)
1 parent 9639127 commit 25cf4fa

File tree

4 files changed

+32
-17
lines changed

4 files changed

+32
-17
lines changed

‎tracer/test/Datadog.Trace.Tests/DistributedTraceTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ public void ManuallyDistributedTrace_CarriesExpectedValues()
3434

3535
var distributedTraceContext = new SpanContext(traceId, parentSpanId);
3636
var secondTracer = TracerHelper.Create();
37+
var spanCreationSettings = new SpanCreationSettings() { Parent = distributedTraceContext };
3738

38-
using (var scope = secondTracer.StartActive("manual.trace", parent: distributedTraceContext))
39+
using (var scope = secondTracer.StartActive("manual.trace", spanCreationSettings))
3940
{
4041
scope.Span.SetTag(Tags.SamplingPriority, samplingPriorityText);
4142
Assert.True(scope.Span.TraceId == traceId, "Trace ID must match the parent trace.");

‎tracer/test/Datadog.Trace.Tests/Logging/LoggingProviderTestHelpers.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ internal static Tracer InitializeTracer(bool enableLogsInjection)
3333

3434
internal static void LogInSpanWithServiceName(Tracer tracer, ILog logger, Func<string, object, bool, IDisposable> openMappedContext, string service, out IScope scope)
3535
{
36-
using (scope = tracer.StartActive("span", serviceName: service))
36+
using (scope = tracer.StartActive("span"))
3737
{
38+
scope.Span.ServiceName = service;
3839
using (var mappedContext = openMappedContext(CustomPropertyName, CustomPropertyValue, false))
3940
{
4041
logger.Log(LogLevel.Info, () => $"{LogPrefix}Entered single scope with a different service name.");

‎tracer/test/Datadog.Trace.Tests/SpanTests.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ public void SpanIds_RemoteParentOfScopeIsNotLocalRoot()
203203
{
204204
const ulong remoteParentSpanId = 1234567890123456789;
205205
SpanContext remoteParentSpanCtx = new SpanContext(traceId: null, spanId: remoteParentSpanId);
206-
Scope scope = (Scope)_tracer.StartActive(operationName: "Operation Galactic Storm", parent: remoteParentSpanCtx);
206+
var spanCreationSettings = new SpanCreationSettings() { Parent = remoteParentSpanCtx };
207+
Scope scope = (Scope)_tracer.StartActive(operationName: "Operation Galactic Storm", spanCreationSettings);
207208
var span = scope.Span;
208209
using (scope)
209210
{
@@ -263,8 +264,9 @@ public void SpanIds_RootOfScopeSpanMixedHierarchy()
263264
{
264265
const ulong remoteParentSpanId = 1234567890123456789;
265266
SpanContext remoteParentSpanCtx = new SpanContext(traceId: null, spanId: remoteParentSpanId);
267+
var spanCreationSettings = new SpanCreationSettings() { Parent = remoteParentSpanCtx };
266268

267-
using (Scope scope1 = (Scope)_tracer.StartActive(operationName: "Operation Root", parent: remoteParentSpanCtx))
269+
using (Scope scope1 = (Scope)_tracer.StartActive(operationName: "Operation Root", spanCreationSettings))
268270
using (Span span2 = _tracer.StartSpan(operationName: "Operation Middle 1"))
269271
using (Scope scope3 = (Scope)_tracer.StartActive(operationName: "Operation Middle 2"))
270272
using (Span span4 = _tracer.StartSpan(operationName: "Operation Leaf"))

‎tracer/test/Datadog.Trace.Tests/TracerTests.cs

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ public TracerTests()
3737
[Fact]
3838
public void StartActive_SetOperationName_OperationNameIsSet()
3939
{
40-
var scope = _tracer.StartActive("Operation", null);
40+
var scope = _tracer.StartActive("Operation");
4141

4242
Assert.Equal("Operation", scope.Span.OperationName);
4343
}
4444

4545
[Fact]
4646
public void StartActive_SetOperationName_ActiveScopeIsSet()
4747
{
48-
var scope = _tracer.StartActive("Operation", null);
48+
var scope = _tracer.StartActive("Operation");
4949

5050
var activeScope = _tracer.ActiveScope;
5151
Assert.Equal(scope, activeScope);
@@ -54,7 +54,7 @@ public void StartActive_SetOperationName_ActiveScopeIsSet()
5454
[Fact]
5555
public void StartActive_NoActiveScope_RootSpan()
5656
{
57-
var scope = (Scope)_tracer.StartActive("Operation", null);
57+
var scope = (Scope)_tracer.StartActive("Operation");
5858
var span = scope.Span;
5959

6060
Assert.True(span.IsRootSpan);
@@ -113,7 +113,8 @@ public void StartActive_FinishOnClose_SpanIsFinishedWhenScopeIsDisposed()
113113
[Fact]
114114
public void StartActive_NoFinishOnClose_SpanIsNotFinishedWhenScopeIsClosed()
115115
{
116-
var scope = (Scope)_tracer.StartActive("Operation", finishOnClose: false);
116+
var spanCreationSettings = new SpanCreationSettings() { FinishOnClose = false };
117+
var scope = (Scope)_tracer.StartActive("Operation", spanCreationSettings);
117118
var span = scope.Span;
118119
Assert.False(span.IsFinished);
119120

@@ -127,7 +128,9 @@ public void StartActive_NoFinishOnClose_SpanIsNotFinishedWhenScopeIsClosed()
127128
public void StartActive_SetParentManually_ParentIsSet()
128129
{
129130
var parent = _tracer.StartSpan("Parent");
130-
var childScope = (Scope)_tracer.StartActive("Child", parent.Context);
131+
132+
var spanCreationSettings = new SpanCreationSettings() { Parent = parent.Context };
133+
var childScope = (Scope)_tracer.StartActive("Child", spanCreationSettings);
131134
var childSpan = childScope.Span;
132135

133136
Assert.Equal(parent.Context, childSpan.Context.Parent);
@@ -141,7 +144,8 @@ public void StartActive_SetParentManuallyFromExternalContext_ParentIsSet()
141144
const SamplingPriority samplingPriority = SamplingPriority.UserKeep;
142145

143146
var parent = new SpanContext(traceId, parentId, samplingPriority);
144-
var child = (Scope)_tracer.StartActive("Child", parent);
147+
var spanCreationSettings = new SpanCreationSettings() { Parent = parent };
148+
var child = (Scope)_tracer.StartActive("Child", spanCreationSettings);
145149
var childSpan = child.Span;
146150

147151
Assert.True(childSpan.IsRootSpan);
@@ -165,15 +169,17 @@ public void StartActive_NoServiceName_DefaultServiceName()
165169
[Fact]
166170
public void StartActive_SetServiceName_ServiceNameIsSet()
167171
{
168-
var scope = _tracer.StartActive("Operation", serviceName: "MyAwesomeService");
172+
var scope = _tracer.StartActive("Operation");
173+
scope.Span.ServiceName = "MyAwesomeService";
169174

170175
Assert.Equal("MyAwesomeService", scope.Span.ServiceName);
171176
}
172177

173178
[Fact]
174179
public void StartActive_SetParentServiceName_ChildServiceNameIsDefaultServiceName()
175180
{
176-
var parent = _tracer.StartActive("Parent", serviceName: "MyAwesomeService");
181+
var parent = _tracer.StartActive("Parent");
182+
parent.Span.ServiceName = "MyAwesomeService";
177183
var child = _tracer.StartActive("Child");
178184

179185
Assert.NotEqual("MyAwesomeService", child.Span.ServiceName);
@@ -184,7 +190,8 @@ public void StartActive_SetParentServiceName_ChildServiceNameIsDefaultServiceNam
184190
public void StartActive_SetStartTime_StartTimeIsProperlySet()
185191
{
186192
var startTime = new DateTimeOffset(2017, 01, 01, 0, 0, 0, TimeSpan.Zero);
187-
var scope = _tracer.StartActive("Operation", startTime: startTime);
193+
var spanCreationSettings = new SpanCreationSettings() { StartTime = startTime };
194+
var scope = _tracer.StartActive("Operation", spanCreationSettings);
188195
var span = (Span)scope.Span;
189196

190197
Assert.Equal(startTime, span.StartTime);
@@ -360,14 +367,16 @@ public void OriginHeader_RootSpanTag()
360367
var propagatedContext = new SpanContext(traceId, spanId, samplingPriority, null, origin);
361368
Assert.Equal(origin, propagatedContext.Origin);
362369

363-
using var firstScope = (Scope)_tracer.StartActive("First Span", propagatedContext);
370+
var spanCreationSettings = new SpanCreationSettings() { Parent = propagatedContext };
371+
using var firstScope = (Scope)_tracer.StartActive("First Span", spanCreationSettings);
364372
var firstSpan = (Span)firstScope.Span;
365373

366374
Assert.True(firstSpan.IsRootSpan);
367375
Assert.Equal(origin, firstSpan.Context.Origin);
368376
Assert.Equal(origin, firstSpan.GetTag(Tags.Origin));
369377

370-
using var secondScope = (Scope)_tracer.StartActive("Child", firstSpan.Context);
378+
var spanCreationSettings2 = new SpanCreationSettings() { Parent = firstSpan.Context };
379+
using var secondScope = (Scope)_tracer.StartActive("Child", spanCreationSettings2);
371380
var secondSpan = (Span)secondScope.Span;
372381

373382
Assert.False(secondSpan.IsRootSpan);
@@ -385,10 +394,12 @@ public void OriginHeader_InjectFromChildSpan()
385394

386395
var propagatedContext = new SpanContext(traceId, spanId, samplingPriority, null, origin);
387396

388-
using var firstScope = (Scope)_tracer.StartActive("First Span", propagatedContext);
397+
var spanCreationSettings = new SpanCreationSettings() { Parent = propagatedContext };
398+
using var firstScope = (Scope)_tracer.StartActive("First Span", spanCreationSettings);
389399
var firstSpan = firstScope.Span;
390400

391-
using var secondScope = (Scope)_tracer.StartActive("Child", firstSpan.Context);
401+
var spanCreationSettings2 = new SpanCreationSettings() { Parent = firstSpan.Context };
402+
using var secondScope = (Scope)_tracer.StartActive("Child", spanCreationSettings2);
392403
var secondSpan = secondScope.Span;
393404

394405
IHeadersCollection headers = WebRequest.CreateHttp("http://localhost").Headers.Wrap();

0 commit comments

Comments
 (0)