Skip to content

Commit b2719f3

Browse files
authored
Adding Telemetry for DisableAppDomain flag (microsoft#1767)
* Adding Telemetry for DisableAppDomain flag * Test fix
1 parent 3decca0 commit b2719f3

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ public static class TelemetryDataConstants
1919

2020
public static string TestSettingsUsed = "VS.TestRun.IsTestSettingsUsed";
2121

22+
public static string DisableAppDomain = "VS.TestRun.DisableAppDomain";
23+
2224
// All data related to legacy settings nodes will be prefixed with this.
2325
public static string LegacySettingPrefix = "VS.TestRun.LegacySettings";
2426

src/vstest.console/TestPlatformHelpers/TestRequestManager.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,10 @@ private void CollectMetrics(IRequestData requestData, RunConfiguration runConfig
639639

640640
// Collecting TargetOS
641641
requestData.MetricsCollection.Add(TelemetryDataConstants.TargetOS, new PlatformEnvironment().OperatingSystemVersion);
642+
643+
//Collecting DisableAppDomain
644+
requestData.MetricsCollection.Add(TelemetryDataConstants.DisableAppDomain, runConfiguration.DisableAppDomain);
645+
642646
}
643647

644648
/// <summary>

test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ public void DiscoverTestsShouldCollectMetrics()
268268
<MaxCpuCount>2</MaxCpuCount>
269269
<TargetPlatform>x86</TargetPlatform>
270270
<TargetFrameworkVersion>Framework35</TargetFrameworkVersion>
271+
<DisableAppDomain>True</DisableAppDomain>
271272
</RunConfiguration>
272273
<MSPhoneTest>
273274
<TargetDevice>169.254.193.190</TargetDevice>
@@ -296,15 +297,15 @@ public void DiscoverTestsShouldCollectMetrics()
296297
this.testRequestManager.DiscoverTests(payload, mockDiscoveryRegistrar.Object, mockProtocolConfig);
297298

298299
// Verify.
299-
object targetDevice;
300-
object maxcount;
301-
object targetPlatform;
300+
object targetDevice, maxcount, targetPlatform, disableAppDomain;
302301
Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out targetDevice));
303302
Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.MaxCPUcount, out maxcount));
304303
Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetPlatform, out targetPlatform));
304+
Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.DisableAppDomain, out disableAppDomain));
305305
Assert.AreEqual("Other", targetDevice);
306306
Assert.AreEqual(2, maxcount);
307307
Assert.AreEqual("X86", targetPlatform.ToString());
308+
Assert.AreEqual(true, disableAppDomain);
308309
}
309310

310311
[TestMethod]
@@ -1062,6 +1063,7 @@ public void RunTestsShouldCollectMetrics()
10621063
<MaxCpuCount>2</MaxCpuCount>
10631064
<TargetPlatform>x86</TargetPlatform>
10641065
<TargetFrameworkVersion>Framework35</TargetFrameworkVersion>
1066+
<DisableAppDomain>True</DisableAppDomain>
10651067
</RunConfiguration>
10661068
<MSPhoneTest>
10671069
<TargetDevice>169.254.193.190</TargetDevice>
@@ -1089,16 +1091,15 @@ public void RunTestsShouldCollectMetrics()
10891091
this.testRequestManager.RunTests(payload, new Mock<ITestHostLauncher>().Object, new Mock<ITestRunEventsRegistrar>().Object, mockProtocolConfig);
10901092

10911093
// Verify
1092-
// Verify.
1093-
object targetDevice;
1094-
object maxcount;
1095-
object targetPlatform;
1094+
object targetDevice, maxcount, targetPlatform, disableAppDomain;
10961095
Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetDevice, out targetDevice));
10971096
Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.MaxCPUcount, out maxcount));
10981097
Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.TargetPlatform, out targetPlatform));
1098+
Assert.IsTrue(actualRequestData.MetricsCollection.Metrics.TryGetValue(TelemetryDataConstants.DisableAppDomain, out disableAppDomain));
10991099
Assert.AreEqual("Other", targetDevice);
11001100
Assert.AreEqual(2, maxcount);
11011101
Assert.AreEqual("X86", targetPlatform.ToString());
1102+
Assert.AreEqual(true, disableAppDomain);
11021103
}
11031104

11041105
[TestMethod]

0 commit comments

Comments
 (0)