Merge pull request #1493 from stripe/ob-runtime-information

Refactor Client class

Author: ob-stripe

src/Stripe.net/Infrastructure/Client.cs

@@ -1,6 +1,7 @@
 namespace Stripe.Infrastructure
 {
     using System;
+    using System.Collections.Generic;
     using System.Globalization;
     using System.IO;
     using System.Linq;
@@ -10,9 +11,16 @@ namespace Stripe.Infrastructure
     using System.Text;
     using System.Threading;
     using System.Threading.Tasks;
+    using Newtonsoft.Json;
 
     internal static class Requestor
     {
+        private static readonly string UserAgentString
+            = $"Stripe/v1 .NetBindings/{StripeConfiguration.StripeNetVersion}";
+
+        private static readonly string StripeClientUserAgentString
+            = BuildStripeClientUserAgentString();
+
         static Requestor()
         {
             HttpClient =
@@ -148,9 +156,8 @@ internal static HttpRequestMessage GetRequestMessage(string url, HttpMethod meth
                 request.Headers.Add("Stripe-Version", StripeConfiguration.ApiVersion);
             }
 
-            var client = new Client(request);
-            client.ApplyUserAgent();
-            client.ApplyClientData();
+            request.Headers.UserAgent.ParseAdd(UserAgentString);
+            request.Headers.Add("X-Stripe-Client-User-Agent", StripeClientUserAgentString);
 
             return request;
         }
@@ -247,5 +254,27 @@ private static StripeResponse BuildResponseData(HttpResponseMessage response, st
 
             return result;
         }
+
+        private static string BuildStripeClientUserAgentString()
+        {
+            var values = new Dictionary<string, string>
+            {
+                { "bindings_version", StripeConfiguration.StripeNetVersion },
+                { "lang", ".net" },
+                { "publisher", "stripe" },
+                { "lang_version", RuntimeInformation.GetLanguageVersion() },
+                { "os_version", RuntimeInformation.GetOSVersion() },
+            };
+
+#if NET45
+            string monoVersion = RuntimeInformation.GetMonoVersion();
+            if (!string.IsNullOrEmpty(monoVersion))
+            {
+                values.Add("mono_version", monoVersion);
+            }
+#endif
+
+            return JsonConvert.SerializeObject(values, Formatting.None);
+        }
     }
 }

src/Stripe.net/Infrastructure/Requestor.cs

@@ -0,0 +1,53 @@
+namespace Stripe.Infrastructure
+{
+#if NET45
+    using System;
+    using System.Reflection;
+    using Microsoft.Win32;
+#endif
+
+    internal static class RuntimeInformation
+    {
+        public static string GetLanguageVersion()
+        {
+#if NET45
+            return ".NET Framework 4.5+";
+#else
+            return System.Runtime.InteropServices.RuntimeInformation.FrameworkDescription;
+#endif
+        }
+
+        public static string GetOSVersion()
+        {
+#if NET45
+            return Environment.OSVersion.ToString();
+#else
+            return System.Runtime.InteropServices.RuntimeInformation.OSDescription;
+#endif
+        }
+
+#if NET45
+        public static string GetMonoVersion()
+        {
+            Type monoRuntimeType = typeof(object).Assembly.GetType("Mono.Runtime");
+
+            if (monoRuntimeType != null)
+            {
+                MethodInfo getDisplayNameMethod = monoRuntimeType.GetMethod(
+                    "GetDisplayName",
+                    BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.DeclaredOnly | BindingFlags.ExactBinding,
+                    null,
+                    Type.EmptyTypes,
+                    null);
+
+                if (getDisplayNameMethod != null)
+                {
+                    return (string)getDisplayNameMethod.Invoke(null, null);
+                }
+            }
+
+            return null;
+        }
+#endif
+    }
+}

src/Stripe.net/Infrastructure/RuntimeInformation.cs

@@ -24,6 +24,19 @@ public void SetsHeaders()
             Assert.Equal(options.IdempotencyKey, request.Headers.GetValues("Idempotency-Key").FirstOrDefault());
             Assert.Equal(options.StripeConnectAccountId, request.Headers.GetValues("Stripe-Account").FirstOrDefault());
             Assert.Equal(StripeConfiguration.ApiVersion, request.Headers.GetValues("Stripe-Version").FirstOrDefault());
+
+            Assert.Equal(
+                $"Stripe/v1 .NetBindings/{StripeConfiguration.StripeNetVersion}",
+                request.Headers.UserAgent.ToString());
+
+            var json = request.Headers.GetValues("X-Stripe-Client-User-Agent").FirstOrDefault();
+            Assert.NotNull(json);
+            var data = JObject.Parse(json);
+            Assert.Equal(StripeConfiguration.StripeNetVersion, data["bindings_version"]);
+            Assert.Equal(".net", data["lang"]);
+            Assert.Equal("stripe", data["publisher"]);
+            Assert.NotNull(data["lang_version"]);
+            Assert.NotNull(data["os_version"]);
         }
     }
 }