Add OS and Process Architecture

dotnet · Sep 29, 2021 · 43a0b4d · 43a0b4d
1 parent d0b9b27
commit 43a0b4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs b/src/Cli/dotnet/Telemetry/TelemetryCommonProperties.cs
@@ -34,6 +34,8 @@ public TelemetryCommonProperties(
         private IUserLevelCacheWriter _userLevelCacheWriter;
         private const string OSVersion = "OS Version";
         private const string OSPlatform = "OS Platform";
+        private const string OSArchitecture = "OS Architecture";
+        private const string ProcessArchitecture = "Process Architecture";
         private const string OutputRedirected = "Output Redirected";
         private const string RuntimeId = "Runtime Id";
         private const string ProductVersion = "Product Version";
@@ -60,6 +62,8 @@ public Dictionary<string, string> GetTelemetryCommonProperties()
             {
                 {OSVersion, RuntimeEnvironment.OperatingSystemVersion},
                 {OSPlatform, RuntimeEnvironment.OperatingSystemPlatform.ToString()},
+                {OSArchitecture, RuntimeInformation.OSArchitecture.ToString()},
+                {ProcessArchitecture, RuntimeInformation.ProcessArchitecture.ToString()},
                 {OutputRedirected, Console.IsOutputRedirected.ToString()},
                 {RuntimeId, RuntimeInformation.RuntimeIdentifier},
                 {ProductVersion, Product.Version},

diff --git a/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs b/src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs
@@ -78,6 +78,14 @@ public void TelemetryCommonPropertiesShouldContainKernelVersion()
             unitUnderTest.GetTelemetryCommonProperties()["Kernel Version"].Should().Be(RuntimeInformation.OSDescription);
         }
 
+        [Fact]
+        public void TelemetryCommonPropertiesShouldContainArchitectureInformation()
+        {
+            var unitUnderTest = new TelemetryCommonProperties(getMACAddress: () => null, userLevelCacheWriter: new NothingCache());
+            unitUnderTest.GetTelemetryCommonProperties()["OS Architecture"].Should().Be(RuntimeInformation.OSArchitecture.ToString());
+            unitUnderTest.GetTelemetryCommonProperties()["Process Architecture"].Should().Be(RuntimeInformation.ProcessArchitecture.ToString());
+        }
+
         [WindowsOnlyFact]
         public void TelemetryCommonPropertiesShouldContainWindowsInstallType()
         {