Merge pull request #85 from stackify/bug/RT-2393

RT-2393 StackifyLib overcalling AWS check

Author: mattjbrooksii

Src/StackifyLib/Internal/Logs/LogClient.cs

@@ -250,7 +250,7 @@ private Models.LogMsgGroup CreateDefaultMsgGroup()
                 }
             }
 
-            var env = EnvironmentDetail.Get(false);
+            var env = EnvironmentDetail.Get();
 
             //We use whatever the identity stuff says, otherwise we use the azure instance name and fall back to the machine name
             if (string.IsNullOrEmpty(group.ServerName))

Src/StackifyLib/Models/EnvironmentDetail.cs

@@ -19,16 +19,13 @@ public class EnvironmentDetail
     {
         private static EnvironmentDetail _CachedCopy = null;
 
-        public static EnvironmentDetail Get(bool refresh)
+        public static EnvironmentDetail Get()
         {
-            if (refresh || _CachedCopy == null)
-            {
-                _CachedCopy = new EnvironmentDetail(true);
-            }
-
-            return _CachedCopy;
+            return _CachedCopy ?? (_CachedCopy = new EnvironmentDetail());
         }
-
+#if NETSTANDARD
+        private static System.Net.Http.HttpClient Client => new System.Net.Http.HttpClient();
+#endif
         private static bool registryAccessFailure = false;
 
         /// <summary>
@@ -209,43 +206,17 @@ public static async Task<string> GetEC2InstanceId()
         {
             string r = null;
 
-            // SF-6804: Frequent Calls to GetEC2InstanceId
-            bool skipEc2InstanceIdUpdate = false;
-
-            if (Config.Ec2InstanceMetadataUpdateThresholdMinutes > 0)
-            {
-                var threshold = TimeSpan.FromMinutes(Config.Ec2InstanceMetadataUpdateThresholdMinutes);
-                lock (ec2InstanceLock)
-                {
-                    skipEc2InstanceIdUpdate = ec2InstanceIdLastUpdate != null && ec2InstanceIdLastUpdate < DateTimeOffset.UtcNow.Subtract(threshold);
-                    r = string.IsNullOrWhiteSpace(ec2InstanceId) ? null : ec2InstanceId;
-                }
-            }
-            else
-            {
-                skipEc2InstanceIdUpdate = true;
-            }
-
-            if (skipEc2InstanceIdUpdate)
-            {
-                return r;
-            }
-
             try
             {
+                Client.Timeout = TimeSpan.FromSeconds(5);
+                var content = await Client.GetAsync(EC2InstanceIdUrl);
 
-                using (var client = new System.Net.Http.HttpClient())
-                {
-                    client.Timeout = TimeSpan.FromSeconds(5);
-                    var content = await client.GetAsync(EC2InstanceIdUrl);
-
-                    int statusCode = (int)content.StatusCode;
+                int statusCode = (int)content.StatusCode;
 
-                    if (statusCode >= 200 && statusCode < 300)
-                    {
-                        string id = await content.Content.ReadAsStringAsync();
-                        r = string.IsNullOrWhiteSpace(id) ? null : id;
-                    }
+                if (statusCode >= 200 && statusCode < 300)
+                {
+                    string id = await content.Content.ReadAsStringAsync();
+                    r = string.IsNullOrWhiteSpace(id) ? null : id;
                 }
 
             }
@@ -317,10 +288,8 @@ private void IsWindowService()
 #endif
         }
 
-        public EnvironmentDetail(bool loadDetails)
+        public EnvironmentDetail()
         {
-            if (!loadDetails)
-                return;
 
             bool isWebRequest = false;
 #if NETFULL

Src/StackifyLib/StackifyError.cs

@@ -114,7 +114,7 @@ private void Init()
             TimeSpan ts = DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, 0));
             OccurredEpochMillis = (long)ts.TotalMilliseconds;
 
-            EnvironmentDetail = EnvironmentDetail.Get(false);
+            EnvironmentDetail = EnvironmentDetail.Get();
             ServerVariables = new Dictionary<string, string>();
 
 #if NETFULL

Src/StackifyLib/Utils/HttpClient.cs

@@ -301,7 +301,7 @@ public bool IdentifyApp()
                     return false;
                 }
                 StackifyAPILogger.Log("Calling to Identify App");
-                EnvironmentDetail env = EnvironmentDetail.Get(true);
+                EnvironmentDetail env = EnvironmentDetail.Get();
                 string jsonData = JsonConvert.SerializeObject(env, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore });
 
                 var response =