Fixed flaky tests.

tests/Activities.UnitTests/Internal/ActivityListenerInitializerServiceTests.cs

@@ -52,7 +52,7 @@ public async Task ActivityListeners_ControlsActivityCreation()
 			// check that Activity from Diagnostic listener also captured
 			using (DiagnosticListener listener = new(nameof(ActivityListeners_ControlsActivityCreation)))
 			{
-				Activity activity = new("DiagnosticsListenerActivity");
+				using Activity activity = new("DiagnosticsListenerActivity");
 
 				listener.StartActivity(activity, null);
 				mockStartObserver.Verify(s => s.OnStart(activity, null), Times.Once);

tests/Activities.UnitTests/Internal/ActivityMetricsSenderTests.cs

@@ -179,15 +179,14 @@ public void SendActivityMetric_WithSendParentName_ProducesMetricPointWithParentN
 			Listener listener = new();
 
 			string? parentName = hasParentName ? nameof(parentName) : null;
-			if (hasParentActivity)
-			{
-				Activity parent = new(parentName!);
-				parent.Start();
-			}
+			using Activity? parent = hasParentActivity ? new(parentName!) : null;
+			parent?.Start();
 
-			Activity activity = new(nameof(activity));
+			using Activity activity = new(nameof(activity));
 			activity.Start().Stop();
 
+			parent?.Stop();
+
 			sender.SendActivityMetric(activity);
 
 			// 3. Assert

tests/Activities.UnitTests/Internal/ActivityObserverTests.cs

@@ -22,7 +22,7 @@ public class ActivityObserverTests
 		[TestMethod]
 		public void OnStop_CallsLogActivityStop()
 		{
-			Activity activity = new(nameof(OnStop_CallsLogActivityStop));
+			using Activity activity = new(nameof(OnStop_CallsLogActivityStop));
 			(ActivityObserver observer, _, Mock<IActivitiesEventSender> senderMock) = CreateObserver();
 
 			observer.OnStop(activity, null);
@@ -53,7 +53,7 @@ public void OnStart_LogsStart()
 		[DataRow(false, ActivityResult.ExpectedError)]
 		public void OnStop_LogsStop(bool isSuccesful, ActivityResult? result)
 		{
-			Activity activity = new Activity(nameof(OnStop_LogsStop))
+			using Activity activity = new Activity(nameof(OnStop_LogsStop))
 				.Start()
 				.SetBaggage("SomeValue", "BaggageValue")
 				.SetTag("SomeTag", "TagValue");

tests/Activities.UnitTests/ServiceCollectionTests.cs

@@ -1,16 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Diagnostics;
 using System;
-using Microsoft.Omex.Extensions.Abstractions.Activities.Processing;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Omex.Extensions.Abstractions.Activities.Processing;
 using Microsoft.Omex.Extensions.Testing.Helpers;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.Omex.Extensions.Activities.UnitTests
 {
@@ -45,7 +45,7 @@ public void AddOmexActivitySource_ActivityCreationEnabled()
 		{
 			Task task = CreateHost().RunAsync();
 
-			Activity? activity = new ActivitySource("Source")
+			using Activity? activity = new ActivitySource("Source")
 				.StartActivity(nameof(AddOmexActivitySource_HostedServicesRegistered));
 
 			NullableAssert.IsNotNull(activity, "Activity creation enabled after host started");

tests/Hosting.Services.Web.UnitTests/HostBuilderExtensionsTests.cs

@@ -34,8 +34,10 @@ public void BuildStatelessWebService_UseUniqueServiceUrl_Failing()
 		[TestMethod]
 		public async Task BuildStatelessWebService_RegisterListeners()
 		{
-			(string name, int port) httpListener1 = ("httpListener", 20080);
-			(string name, int port) httpListener2 = ("httpsListener", 20443);
+			// Use random ports from private range.
+			Random random = new Random();
+			(string name, int port) httpListener1 = ("httpListener", random.Next(49152, 65535));
+			(string name, int port) httpListener2 = ("httpsListener", random.Next(49152, 65535));
 
 			SfConfigurationProviderHelper.SetPublishAddress();
 			SfConfigurationProviderHelper.SetPortVariable(httpListener1.name, httpListener1.port);