Skip to content

Commit 8e7aeec

Browse files
authored
Use ScopedTracer in tests (#7770)
## Summary of changes Use `ScopedTracer` in tests, so that everything gets disposed properly ## Reason for change If you don't use `ScopedTacer, or clean up manually, threads leak ## Implementation details Use the existing `ScopedTracer` (via `TracerHelper`) ## Test coverage Same
1 parent 17fa7c7 commit 8e7aeec

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

tracer/test/Datadog.Trace.ClrProfiler.Managed.Tests/AutoInstrumentation/Logging/ILogger/DatadogLoggingScopeTests.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
44
// </copyright>
55

6+
using System.Threading.Tasks;
67
using Datadog.Trace.Agent;
78
using Datadog.Trace.ClrProfiler.AutoInstrumentation.Logging.ILogger;
89
using Datadog.Trace.Configuration;
910
using Datadog.Trace.DogStatsd;
11+
using Datadog.Trace.TestHelpers.TestTracer;
1012
using FluentAssertions;
1113
using Moq;
1214
using Xunit;
@@ -16,7 +18,7 @@ namespace Datadog.Trace.ClrProfiler.Managed.Tests.AutoInstrumentation.Logging.IL
1618
public class DatadogLoggingScopeTests
1719
{
1820
[Fact]
19-
public void OutputsJsonFormattedStringWhenNoActiveTrace()
21+
public async Task OutputsJsonFormattedStringWhenNoActiveTrace()
2022
{
2123
var settings = TracerSettings.Create(new()
2224
{
@@ -25,7 +27,7 @@ public void OutputsJsonFormattedStringWhenNoActiveTrace()
2527
{ ConfigurationKeys.Environment, "test" },
2628
});
2729

28-
var tracer = new Tracer(settings, new Mock<IAgentWriter>().Object, null, null, new NoOpStatsd());
30+
await using var tracer = TracerHelper.Create(settings, new Mock<IAgentWriter>().Object);
2931

3032
var scope = new DatadogLoggingScope(tracer);
3133

@@ -35,7 +37,7 @@ public void OutputsJsonFormattedStringWhenNoActiveTrace()
3537
}
3638

3739
[Fact]
38-
public void OutputsJsonFormattedStringWhenActiveTrace()
40+
public async Task OutputsJsonFormattedStringWhenActiveTrace()
3941
{
4042
var settings = TracerSettings.Create(new()
4143
{
@@ -44,7 +46,7 @@ public void OutputsJsonFormattedStringWhenActiveTrace()
4446
{ ConfigurationKeys.Environment, "test" },
4547
});
4648

47-
var tracer = new Tracer(settings, new Mock<IAgentWriter>().Object, null, null, new NoOpStatsd());
49+
await using var tracer = TracerHelper.Create(settings, new Mock<IAgentWriter>().Object);
4850
using var spanScope = tracer.StartActive("test");
4951
var scope = new DatadogLoggingScope(tracer);
5052

0 commit comments

Comments
 (0)