Merge branch 'develop'

Author: Matt Brooks

Src/StackifyLib/Internal/Logs/LogQueue.cs

@@ -3,7 +3,10 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 
 #if NETFULL
@@ -99,6 +102,7 @@ public void QueueLogMessage(Models.LogMsg msg)
                     // ignore
                 }
 
+       
 #if NETFULL
                 try
                 {
@@ -177,6 +181,34 @@ public void QueueLogMessage(Models.LogMsg msg)
                         }
                     }
                 }
+#else
+                // else if .Net Core
+                // get RequestID
+                if (string.IsNullOrEmpty(msg.TransID))
+                {
+                    var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+
+                    var agentAssemblyQry = assemblies.Where(assembly => assembly.FullName.Contains("Stackify.Agent"));
+                    if(agentAssemblyQry.Count() > 0)
+                    {
+                        var middleware = agentAssemblyQry.First();
+                        var callContextType = middleware.GetType("Stackify.Agent.Threading.StackifyCallContext");
+                        if (callContextType != null)
+                        {
+                            var traceCtxType = middleware.GetType("Stackify.Agent.Tracing.ITraceContext");
+                            if(traceCtxType != null)
+                            {
+                                var traceContextProp = callContextType.GetProperty("TraceContext")?.GetValue(null);
+                                if (traceContextProp != null)
+                                {
+                                    var reqIdProp = traceCtxType.GetProperty("RequestId")?.GetValue(traceContextProp)?.ToString();
+                                    if(!string.IsNullOrEmpty(reqIdProp))
+                                        msg.TransID = reqIdProp;
+                                }
+                            }
+                        }
+                    }
+                }
 #endif
 
                 _MessageBuffer.Enqueue(msg);

Src/StackifyLib/Models/EnvironmentDetail.cs

@@ -129,7 +129,7 @@ public static string GetDeviceName()
                 }
             }
 
-            return deviceName;
+            return deviceName.Substring(0, deviceName.Length > 60 ? 60 : deviceName.Length);
         }
 
         public static string GetEC2InstanceId()
@@ -215,7 +215,7 @@ public static string GetDeviceName()
                 }
             }
 
-            return deviceName;
+            return deviceName.Substring(0, deviceName.Length > 60 ? 60 : deviceName.Length);
         }
 
         public static async Task<string> GetEC2InstanceId()
@@ -233,6 +233,11 @@ public static async Task<string> GetEC2InstanceId()
                 {
                     string id = await content.Content.ReadAsStringAsync();
                     r = string.IsNullOrWhiteSpace(id) ? null : id;
+
+                    if (r.Contains("html"))
+                    {
+                        r = Environment.MachineName;
+                    }
                 }
 
             }