More test fixes

Author: andrewlock

tracer/test/Datadog.Trace.Tests/Agent/MessagePack/TraceChunkModelTests.cs

@@ -7,6 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Datadog.Trace.Agent.MessagePack;
+using Datadog.Trace.Tests.Util;
 using FluentAssertions;
 using Moq;
 using Xunit;
@@ -492,7 +493,7 @@ private static TraceChunkModel CreateTraceChunk(IEnumerable<Span> spans, Span ro
     private Span CreateSpan(ulong traceId, ulong spanId, ulong parentId)
     {
         var parentContent = new SpanContext(traceId, parentId);
-        var traceContext = new TraceContext(Mock.Of<IDatadogTracer>());
+        var traceContext = new TraceContext(new StubDatadogTracer());
         var spanContext = new SpanContext(parentContent, traceContext, serviceName: null, spanId: spanId);
         return new Span(spanContext, DateTimeOffset.UtcNow);
     }

tracer/test/Datadog.Trace.Tests/Agent/StatsAggregatorTests.cs

@@ -13,6 +13,7 @@
 using Datadog.Trace.Agent.DiscoveryService;
 using Datadog.Trace.Configuration;
 using Datadog.Trace.ExtensionMethods;
+using Datadog.Trace.Tests.Util;
 using FluentAssertions;
 using Moq;
 using Xunit;
@@ -201,15 +202,15 @@ public async Task CollectsMeasuredSpans_TS004()
                 parentSpan.SetDuration(TimeSpan.FromMilliseconds(100));
 
                 // childSpan shouldn't be recorded, because it's not top-level and doesn't have the Measured tag
-                var childSpan = new Span(new SpanContext(parentSpan.Context, new TraceContext(Mock.Of<IDatadogTracer>()), "service"), start);
+                var childSpan = new Span(new SpanContext(parentSpan.Context, new TraceContext(new StubDatadogTracer()), "service"), start);
                 childSpan.SetDuration(TimeSpan.FromMilliseconds(100));
 
-                var measuredChildSpan1 = new Span(new SpanContext(parentSpan.Context, new TraceContext(Mock.Of<IDatadogTracer>()), "service"), start);
+                var measuredChildSpan1 = new Span(new SpanContext(parentSpan.Context, new TraceContext(new StubDatadogTracer()), "service"), start);
                 measuredChildSpan1.OperationName = "child.op1";
                 measuredChildSpan1.SetTag(Tags.Measured, "1");
                 measuredChildSpan1.SetDuration(TimeSpan.FromMilliseconds(100));
 
-                var measuredChildSpan2 = new Span(new SpanContext(parentSpan.Context, new TraceContext(Mock.Of<IDatadogTracer>()), "service"), start);
+                var measuredChildSpan2 = new Span(new SpanContext(parentSpan.Context, new TraceContext(new StubDatadogTracer()), "service"), start);
                 measuredChildSpan2.OperationName = "child.op2";
                 measuredChildSpan2.SetTag(Tags.Measured, "1");
                 measuredChildSpan2.SetDuration(TimeSpan.FromMilliseconds(100));
@@ -271,7 +272,7 @@ public async Task CollectsTopLevelSpans_TS005()
                 snapshotSpan.SetDuration(TimeSpan.FromMilliseconds(300));
 
                 // Create a new child span that is a service entry span, which means it will have stats computed for it
-                var httpClientServiceSpan = new Span(new SpanContext(parentSpan.Context, new TraceContext(Mock.Of<IDatadogTracer>()), "service-http-client"), start);
+                var httpClientServiceSpan = new Span(new SpanContext(parentSpan.Context, new TraceContext(new StubDatadogTracer()), "service-http-client"), start);
                 httpClientServiceSpan.SetDuration(TimeSpan.FromMilliseconds(400));
 
                 aggregator.Add(simpleSpan, parentSpan, snapshotSpan, httpClientServiceSpan);

tracer/test/Datadog.Trace.Tests/SpanContextTests.cs

@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Datadog.Trace.Tagging;
+using Datadog.Trace.Tests.Util;
 using FluentAssertions;
 using Moq;
 using Xunit;
@@ -147,7 +148,7 @@ private static IReadOnlyDictionary<string, string> CreateSpanContext()
             propagatedTags.SetTag("_dd.p.key1", "value1");
             propagatedTags.SetTag("_dd.p.key2", "value2");
 
-            var traceContext = new TraceContext(Mock.Of<IDatadogTracer>(), propagatedTags);
+            var traceContext = new TraceContext(new StubDatadogTracer(), propagatedTags);
             traceContext.SetSamplingPriority(samplingPriority);
             traceContext.Origin = origin;
             traceContext.AdditionalW3CTraceState = additionalW3CTraceState;