chore(Analytics): Revised User-Agent format

Author: mediumTaj

src/IBM.WatsonDeveloperCloud/Constants.cs

@@ -26,7 +26,7 @@ public class Constants
         /// The version number for this SDK build. Added to the header in 
         /// each request as `User-Agent`.
         /// </summary>
-        public static readonly string SDK_VERSION = "watson-apis-dotnet-sdk/2.13.0";
+        public static readonly string SDK_VERSION = "watson-apis-dotnet-sdk-2.13.0";
         /// <summary>
         /// A constant used to access custom request headers in the dynamic
         /// customData object.

src/IBM.WatsonDeveloperCloud/Http/HttpFactory.cs

@@ -45,12 +45,17 @@ public static HttpRequestMessage GetRequestMessage(HttpMethod method, Uri resour
 
             // add default headers
             request.Headers.Add("accept", formatters.SelectMany(p => p.SupportedMediaTypes).Select(p => p.MediaType));
+            string osInfo = System.Runtime.InteropServices.RuntimeInformation.OSDescription;
+            int versionIndex = osInfo.IndexOfAny("0123456789".ToCharArray());
+            string os = osInfo.Substring(0, versionIndex).Replace(" ", "");
+            string osVersion = osInfo.Substring(versionIndex).Replace(" ", "");
             request.Headers.Add("User-Agent", 
                 string.Format(
-                    "{0} {1} {2}", 
+                    "{0} {1} {2} {3}", 
                     Constants.SDK_VERSION, 
-                    System.Runtime.InteropServices.RuntimeInformation.OSDescription, 
-                    System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription
+                    os,
+                    osVersion,
+                    System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription.Replace(" ", "-")
                 ));
 
             return request;