Scope ActivityListener in test to not interfere with other tests (#40044)

github-actions[bot] · BrennanConroy · web-flow · commit 15c2e596beff · 2022-02-07T22:07:13.000Z
Might fix #34072 Co-authored-by: Brennan <brecon@microsoft.com>
diff --git a/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs b/src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs
@@ -498,11 +498,12 @@ public void ActivityOnImportHookIsCalled()
         [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40038")]
         public void ActivityListenersAreCalled()
         {
-            var hostingApplication = CreateApplication(out var features);
+            var testSource = new ActivitySource(Path.GetRandomFileName());
+            var hostingApplication = CreateApplication(out var features, activitySource: testSource);
             var parentSpanId = "";
             using var listener = new ActivityListener
             {
-                ShouldListenTo = activitySource => true,
+                ShouldListenTo = activitySource => ReferenceEquals(activitySource, testSource),
                 Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,
                 ActivityStarted = activity =>
                 {

Original file line number	Diff line number	Diff line change
`@@ -498,11 +498,12 @@ public void ActivityOnImportHookIsCalled()`
`498`	`498`	`[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/40038")]`
`499`	`499`	`public void ActivityListenersAreCalled()`
`500`	`500`	`{`
`501`		`- var hostingApplication = CreateApplication(out var features);`
	`501`	`+ var testSource = new ActivitySource(Path.GetRandomFileName());`
	`502`	`+ var hostingApplication = CreateApplication(out var features, activitySource: testSource);`
`502`	`503`	`var parentSpanId = "";`
`503`	`504`	`using var listener = new ActivityListener`
`504`	`505`	`{`
`505`		`- ShouldListenTo = activitySource => true,`
	`506`	`+ ShouldListenTo = activitySource => ReferenceEquals(activitySource, testSource),`
`506`	`507`	`Sample = (ref ActivityCreationOptions<ActivityContext> _) => ActivitySamplingResult.AllData,`
`507`	`508`	`ActivityStarted = activity =>`
`508`	`509`	`{`