POPS-261: Fix custom metric issue when Apps is deployed to Kubernestes

Author: Rogelio Carrillo

Src/StackifyLib/Models/EnvironmentDetail.cs

@@ -110,21 +110,29 @@ private void GetAzureInfo()
         public static string GetDeviceName()
         {
             var deviceName = Environment.MachineName;
+            var deviceNodeName = Environment.GetEnvironmentVariable("STACKIFY_DEVICE_NAME");
 
-            if (AzureConfig.InAzure && ((AzureConfig.IsWebsite) || (AzureConfig.InAzure && Environment.MachineName.StartsWith("RD"))))
+            if (!String.IsNullOrEmpty(deviceNodeName))
             {
-                deviceName = AzureConfig.AzureInstanceName;
+                deviceName = deviceNodeName;
             }
             else
             {
-                var isDefaultDeviceNameEc2 = IsEc2MachineName(deviceName);
-
-                if (Config.IsEc2 == null || Config.IsEc2 == true || isDefaultDeviceNameEc2)
+                if (AzureConfig.InAzure && ((AzureConfig.IsWebsite) || (AzureConfig.InAzure && Environment.MachineName.StartsWith("RD"))))
+                {
+                    deviceName = AzureConfig.AzureInstanceName;
+                }
+                else
                 {
-                    var ec2InstanceId = GetEC2InstanceId();
-                    if (string.IsNullOrWhiteSpace(ec2InstanceId) == false)
+                    var isDefaultDeviceNameEc2 = IsEc2MachineName(deviceName);
+
+                    if (Config.IsEc2 == null || Config.IsEc2 == true || isDefaultDeviceNameEc2)
                     {
-                        deviceName = ec2InstanceId;
+                        var ec2InstanceId = GetEC2InstanceId();
+                        if (string.IsNullOrWhiteSpace(ec2InstanceId) == false)
+                        {
+                            deviceName = ec2InstanceId;
+                        }
                     }
                 }
             }
@@ -195,26 +203,33 @@ public static string GetEC2InstanceId()
         public static string GetDeviceName()
         {
             var deviceName = Environment.MachineName;
+            var deviceNodeName = Environment.GetEnvironmentVariable("STACKIFY_DEVICE_NAME");
 
-            if (AzureConfig.InAzure && ((AzureConfig.IsWebsite) || (AzureConfig.InAzure && Environment.MachineName.StartsWith("RD"))))
+            if (!String.IsNullOrEmpty(deviceNodeName))
             {
-                deviceName = AzureConfig.AzureInstanceName;
+                deviceName = deviceNodeName;
             }
             else
             {
-                var isDefaultDeviceNameEc2 = IsEc2MachineName(deviceName);
-
-                if (Config.IsEc2 == null || Config.IsEc2 == true || isDefaultDeviceNameEc2)
+                if (AzureConfig.InAzure && ((AzureConfig.IsWebsite) || (AzureConfig.InAzure && Environment.MachineName.StartsWith("RD"))))
                 {
-                    var instanceID_task = GetEC2InstanceId();
-                    instanceID_task.Wait();
-                    if (string.IsNullOrWhiteSpace(instanceID_task.Result) == false)
+                    deviceName = AzureConfig.AzureInstanceName;
+                }
+                else
+                {
+                    var isDefaultDeviceNameEc2 = IsEc2MachineName(deviceName);
+
+                    if (Config.IsEc2 == null || Config.IsEc2 == true || isDefaultDeviceNameEc2)
                     {
-                        deviceName = instanceID_task.Result;
+                        var instanceID_task = GetEC2InstanceId();
+                        instanceID_task.Wait();
+                        if (string.IsNullOrWhiteSpace(instanceID_task.Result) == false)
+                        {
+                            deviceName = instanceID_task.Result;
+                        }
                     }
                 }
             }
-
             return deviceName.Substring(0, deviceName.Length > 60 ? 60 : deviceName.Length);
         }