Consolidate ProductInfo helper methods into the ProductInfo class

iothub/device/src/ProductInfo.cs

@@ -2,19 +2,22 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using Microsoft.Azure.Devices.Client.Extensions;
+using Microsoft.Azure.Devices.Shared;
+using Microsoft.Win32;
 
 namespace Microsoft.Azure.Devices.Client
 {
     internal class ProductInfo
     {
         public string Extra { get; set; } = "";
 
-        private readonly Lazy<int> _productType = new Lazy<int>(() => NativeMethods.GetWindowsProductType());
-        private readonly Lazy<string> _sqmId = new Lazy<string>(() => TelemetryMethods.GetSqmMachineId());
+        private readonly Lazy<int> _productType = new Lazy<int>(() => GetWindowsProductType());
+        private readonly Lazy<string> _sqmId = new Lazy<string>(() => GetSqmMachineId());
 
         public override string ToString()
         {
@@ -95,6 +98,60 @@ private string ToString(string format)
 
             return userAgent;
         }
+
+        internal static string GetSqmMachineId()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                try
+                {
+                    RegistryKey key = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\SQMClient");
+                    if (key != null)
+                    {
+                        return key.GetValue("MachineId") as string;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Debug.Assert(false, ex.Message);
+
+                    if (Logging.IsEnabled)
+                        Logging.Error(null, ex, nameof(ProductInfo));
+                }
+            }
+
+            return null;
+        }
+
+        internal static int GetWindowsProductType()
+        {
+            try
+            {
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                    && GetProductInfo(Environment.OSVersion.Version.Major, Environment.OSVersion.Version.Minor, 0, 0, out int productType))
+                {
+                    return productType;
+                }
+            }
+            catch (DllNotFoundException ex)
+            {
+                // Catch any DLL not found exceptions
+                Debug.Assert(false, ex.Message);
+
+                if (Logging.IsEnabled)
+                    Logging.Error(null, ex, nameof(ProductInfo));
+            }
+
+            return 0;
+        }
+
+        [DllImport("kernel32.dll", SetLastError = false)]
+        private static extern bool GetProductInfo(
+           int dwOSMajorVersion,
+           int dwOSMinorVersion,
+           int dwSpMajorVersion,
+           int dwSpMinorVersion,
+           out int pdwReturnedProductType);
     }
 
     internal enum UserAgentFormats

iothub/device/tests/ProductInfoTests.cs

@@ -6,6 +6,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.Win32;
 
 namespace Microsoft.Azure.Devices.Client.Test
 {
@@ -103,9 +104,9 @@ private string ExpectedUserAgentString()
             string operatingSystem = RuntimeInformation.OSDescription.Trim();
             string processorArchitecture = RuntimeInformation.ProcessArchitecture.ToString().Trim();
 
-            int productType = NativeMethods.GetWindowsProductType();
+            int productType = ProductInfo.GetWindowsProductType();
             string productTypeString = (productType != 0) ? $" WindowsProduct:0x{productType:X8}" : string.Empty;
-            string deviceId = TelemetryMethods.GetSqmMachineId() ?? string.Empty;
+            string deviceId = ProductInfo.GetSqmMachineId() ?? string.Empty;
 
             string[] agentInfoParts =
             {
@@ -125,12 +126,37 @@ private string ExpectedHttpUserAgentString()
             string operatingSystem = RuntimeInformation.OSDescription.Trim();
             string processorArchitecture = RuntimeInformation.ProcessArchitecture.ToString().Trim();
 
-            int productType = NativeMethods.GetWindowsProductType();
+            int productType = ProductInfo.GetWindowsProductType();
             string productTypeString = (productType != 0) ? $" WindowsProduct:0x{productType:X8}" : string.Empty;
 
             return $".NET/{version} ({runtime}; {operatingSystem + productTypeString}; {processorArchitecture})";
         }
 
 #endif
+
+        [TestMethod]
+        public void GetSqmMachineId_ReturnsExpectedValue()
+        {
+            string actualValue = ProductInfo.GetSqmMachineId();
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                string expectedValue = null;
+
+                // Get SQM ID from Registry if exists
+                RegistryKey key = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\SQMClient");
+                if (key != null)
+                {
+                    expectedValue = key.GetValue("MachineId") as string;
+                }
+
+                Assert.AreEqual(expectedValue, actualValue);
+            }
+            else
+            {
+                // GetSqmMachineId() should always return null for all other platforms
+                Assert.IsNull(actualValue);
+            }
+        }
     }
 }