Misc bug fixes, ProfilerTracer updates for windows services and new Tracked Functions

mwatson · mwatson · commit 4e3b12e45065 · 2016-08-29T15:09:10.000-05:00
diff --git a/Src/NLog.Targets.Stackify/project.json b/Src/NLog.Targets.Stackify/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.23.1",
+  "version": "1.23.3",
 
   "title": "NLog.Targets.Stackify",
 
@@ -12,24 +12,26 @@
   },
 
   "dependencies": {
-    "StackifyLib": "1.23.1-beta2"
   },
 
   "frameworks": {
     "netstandard1.3": {
       "dependencies": {
-        "NLog": "4.4.0-*"
+        "NLog": "4.4.0-*",
+        "StackifyLib": "1.23.3"
       }
     },
     "net40": {
       "dependencies": {
-        "NLog": "4.2.3"
+        "NLog": "4.2.3",
+        "StackifyLib": "1.23.3"
       }
 
     },
     "net45": {
       "dependencies": {
-        "NLog": "4.2.3"
+        "NLog": "4.2.3",
+        "StackifyLib": "1.23.3"
       }
 
     }
diff --git a/Src/StackifyLib/Internal/Metrics/MetricClient.cs b/Src/StackifyLib/Internal/Metrics/MetricClient.cs
@@ -369,7 +369,7 @@ public static bool UploadMetrics(DateTime currentMinute)
                 if (!_httpClient.MatchedClientDeviceApp())
                 {
                    // purgeOlderThan = DateTime.UtcNow;
-                    StackifyAPILogger.Log("Upload metrics skipped due to being disabled");
+                    StackifyAPILogger.Log("Upload metrics skipped because we were unable to match the app to an app in Stackify");
                 }
                 else if (!_httpClient.IsAuthorized())
                 {
diff --git a/Src/StackifyLib/Logger.cs b/Src/StackifyLib/Logger.cs
@@ -305,45 +305,9 @@ public static List<TraceFrame> GetCurrentStackTrace(string declaringClassName, i
             return frames;
         }
 
-        private static bool? _PrefixEnabled = null;
-
         public static bool PrefixEnabled()
         {
-            if (_PrefixEnabled != null)
-                return _PrefixEnabled.Value;
-
-            var variable = Environment.GetEnvironmentVariable("StackSquatchUpdated");
-
-
-            if (!string.IsNullOrEmpty(variable))
-            {
-
-                DateTime updated;
-
-                if (DateTime.TryParse(variable, out updated))
-                {
-                    if (updated > DateTime.UtcNow.AddHours(-24))
-                    {
-                        StackifyLib.Utils.StackifyAPILogger.Log("Prefix enabled", true);
-                        _PrefixEnabled = true;
-                    }
-                    else
-                    {
-                        _PrefixEnabled = false;
-                    }
-                }
-                else
-                {
-                    _PrefixEnabled = false;
-                }
-
-            }
-            else
-            {
-                _PrefixEnabled = false;
-            }
-
-            return _PrefixEnabled.Value;
+            return PrefixOrAPM.GetProfilerType() == PrefixOrAPM.ProfilerType.Prefix;
         }
     }
 }
diff --git a/Src/StackifyLib/ProfileTracer.cs b/Src/StackifyLib/ProfileTracer.cs
@@ -24,7 +24,7 @@ public class ProfileTracer
         private string _RequestID = null;
         internal bool IsOperation { get; set; }
 #if NET45 || NETSTANDARD1_3
-        //private static EtwEventListener _etwEventListener = null;
+        private static EtwEventListener _etwEventListener = null;
 #endif
         internal ProfileTracer(string methodDisplayText, string requestLevelReportingCategory, string appLevelReportingCategory)
         {
@@ -114,6 +114,18 @@ public static ProfileTracer CreateAsCodeBlock(string methodDisplayText)
             return tracer;
         }
 
+        /// <summary>
+        /// Used by non web apps to define transactions in code that are turned in to operations to be tracked in Stackify APM or Prefix
+        /// </summary>
+        /// <param name="operationName"></param>
+        /// <param name="uniqueOperationID"></param>
+        /// <returns></returns>
+        public static ProfileTracer CreateAsTrackedFunction(string functionName)
+        {
+            ProfileTracer tracer = new ProfileTracer(functionName, "Tracked Function", null);
+            return tracer;
+        }
+
         /// <summary>
         /// Used by non web apps to define transactions in code that are turned in to operations to be tracked in Stackify APM or Prefix
         /// </summary>
@@ -123,15 +135,15 @@ public static ProfileTracer CreateAsCodeBlock(string methodDisplayText)
         public static ProfileTracer CreateAsOperation(string operationName, string uniqueOperationID = null)
         {
 #if NET45 || NETSTANDARD1_3
-            //if(_etwEventListener == null)
-              //  _etwEventListener = new EtwEventListener();
+            if (_etwEventListener == null)
+                _etwEventListener = new EtwEventListener();
 #endif
             ProfileTracer tracer = new ProfileTracer(operationName, null, null);
             tracer.IsOperation = true;
 
             if (!string.IsNullOrEmpty(uniqueOperationID))
             {
-                tracer._transactionID = uniqueOperationID;
+                tracer._RequestID = uniqueOperationID;
             }
 
             return tracer;
@@ -143,13 +155,23 @@ public static ProfileTracer CreateAsOperation(string operationName, string uniqu
         /// <param name="methodDisplayText"></param>
         /// <returns></returns>
 
-        public static ProfileTracer CreateAsCodeBlock(string methodDisplayText, string requestLevelReportingCategory, string appLevelReportingCategory = null)
+        public static ProfileTracer CreateAsDependency(string methodDisplayText, string requestLevelReportingCategory, string appLevelReportingCategory = null)
         {
             ProfileTracer tracer = new ProfileTracer(methodDisplayText, requestLevelReportingCategory, appLevelReportingCategory);
             return tracer;
         }
 
 
+        public ProfileTracer SetUniqueOperationID(string uniqueOperationID)
+        {
+            if (!string.IsNullOrEmpty(uniqueOperationID))
+            {
+                this._RequestID = uniqueOperationID;
+            }
+
+            return this;
+        }
+
         public ProfileTracer CreateMetric(string categoryName, string metricName, bool trackCount = true, bool trackTime = true, bool autoReportZeroIfNothingReported = false)
         {
             _customMetricCategory = categoryName;
@@ -206,6 +228,14 @@ private Task ExecInternal2(string values, Func<Task> action)
             return t;
         }
 
+        [MethodImpl(MethodImplOptions.PreserveSig | MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
+        private Task<T> ExecInternal2<T>(string values, Func<Task<T>> action)
+        {
+            Task<T> t = action();
+            ExecInternalTaskStarted2(_transactionID + "|" + t.Id + "|" + IsOperation);
+            return t;
+        }
+
 
         [MethodImpl(MethodImplOptions.PreserveSig | MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
         private Task ExecInternalOperation(string values, Func<Task> action)
@@ -215,6 +245,14 @@ private Task ExecInternalOperation(string values, Func<Task> action)
             return t;
         }
 
+        [MethodImpl(MethodImplOptions.PreserveSig | MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
+        private Task<T> ExecInternalOperation<T>(string values, Func<Task<T>> action)
+        {
+            Task<T> t = action();
+            ExecInternalTaskStarted2(_transactionID + "|" + t.Id + "|" + IsOperation);
+            return t;
+        }
+
 
         [MethodImpl(MethodImplOptions.PreserveSig | MethodImplOptions.NoInlining | MethodImplOptions.NoOptimization)]
         private void ExecInternalTaskStarted2(string values)
@@ -253,7 +291,38 @@ public void Exec(Action action)
 
         }
 
+        public Task<T> ExecAsync<T>(Func<Task<T>> task)
+        {
+            DateTimeOffset now = DateTimeOffset.UtcNow;
+
+            Task<T> t;
+
+
+            if (this.IsOperation)
+            {
+                t = ExecInternalOperation<T>(_methodDisplayText + "|" + (ignoreChildFrames ? 1 : 0).ToString() + "|" + _requestReportingCategory + "|" + _appReportingCategory + "|" + _transactionID + "|" + _RequestID + "|" + IsOperation, task);
+            }
+            else
+            {
+                t = ExecInternal2<T>(_methodDisplayText + "|" + (ignoreChildFrames ? 1 : 0).ToString() + "|" + _requestReportingCategory + "|" + _appReportingCategory + "|" + _transactionID + "|" + _RequestID + "|" + IsOperation, task);
+            }
+
+            t.ContinueWith((tend) =>
+            {
+                if (_customMetricTime)
+                {
+                    Metrics.Time(_customMetricCategory, _customMetricName + " Time", now);
+                }
+                ExecInternalComplete2(_transactionID + "|" + _RequestID + "|" + tend.Id + "|" + IsOperation);
+            });
+
+            if (_customMetricCount)
+            {
+                Metrics.Count(_customMetricCategory, _customMetricName, 1, _autoReportZeroIfNothingReported);
+            }
 
+            return t;
+        }
 
         public Task ExecAsync(Func<Task> task)
         {
diff --git a/Src/StackifyLib/Properties/AssemblyInfo.cs b/Src/StackifyLib/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.22.*")]
-[assembly: AssemblyFileVersion("1.22.*")]
+[assembly: AssemblyVersion("1.24.*")]
+[assembly: AssemblyFileVersion("1.24.*")]
diff --git a/Src/StackifyLib/Utils/EtwEventListener.cs b/Src/StackifyLib/Utils/EtwEventListener.cs
@@ -0,0 +1,31 @@
+﻿#if NET45 || NETSTANDARD1_3
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.Tracing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace StackifyLib.Utils
+{
+    public class EtwEventListener : System.Diagnostics.Tracing.EventListener
+    {
+        private static readonly Guid tplGuid = new Guid("2e5dba47-a3d2-4d16-8ee0-6671ffdcd7b5");
+        //  private static readonly Guid aspnetGuid = new Guid("aff081fe-0247-4275-9c4e-021f3dc1da35");
+
+        protected override void OnEventSourceCreated(EventSource eventSource)
+        {
+            if (eventSource.Guid == tplGuid)
+            {
+                EnableEvents(eventSource, EventLevel.Informational);
+            }
+        }
+
+        protected override void OnEventWritten(EventWrittenEventArgs eventData)
+        {
+         
+        }
+    }
+}
+#endif
diff --git a/Src/StackifyLib/Utils/HttpClient.cs b/Src/StackifyLib/Utils/HttpClient.cs
@@ -623,11 +623,12 @@ private HttpWebRequest BuildJsonRequest(string url, string jsonData, bool compre
                 request.Method = "POST";
 
                 byte[] payload = Encoding.UTF8.GetBytes(jsonData);
-                request.Headers[HttpRequestHeader.ContentLength] = payload.Length.ToString();
 
 #if NET45 || NET40
+                request.ContentLength= payload.Length;
                 using (Stream stream = request.GetRequestStream())
 #else
+                request.Headers[HttpRequestHeader.ContentLength] = payload.Length.ToString();
                 using (Stream stream = request.GetRequestStreamAsync().GetAwaiter().GetResult())
 #endif
                 {
@@ -665,8 +666,10 @@ private HttpWebRequest BuildPOSTRequest(string url, string postdata)
 
 #if NET45 || NET40
             request.UserAgent = "StackifyLib-" + _version;
+            request.ContentLength = 0;
 #else
             request.Headers[HttpRequestHeader.UserAgent] = "StackifyLib-" + _version;
+            request.Headers[HttpRequestHeader.ContentLength] = "0";
 #endif
 
             //if (HttpClient.CustomWebProxy != null)
@@ -676,7 +679,7 @@ private HttpWebRequest BuildPOSTRequest(string url, string postdata)
 
 
             request.Method = "POST";
-            request.Headers[HttpRequestHeader.ContentLength] = "0";
+            
             if (!String.IsNullOrEmpty(postdata))
             {
                 byte[] payload = Encoding.UTF8.GetBytes(postdata);
diff --git a/Src/StackifyLib/Utils/PrefixOrAPM.cs b/Src/StackifyLib/Utils/PrefixOrAPM.cs
@@ -33,6 +33,16 @@ internal static ProfilerType GetProfilerType()
             _LastCheck = DateTime.UtcNow;
             bool foundProcess = false;
 
+            string instanceID = Left(Environment.GetEnvironmentVariable("WEBSITE_INSTANCE_ID"), 6);
+            string siteName = (Environment.GetEnvironmentVariable("WEBSITE_IIS_SITE_NAME") ?? "").TrimStart('~', '1');
+
+            //is azure app service?
+            if (!string.IsNullOrEmpty(instanceID) && !string.IsNullOrEmpty(siteName))
+            {
+                _LastProfilerType = ProfilerType.APM;
+                return _LastProfilerType;
+            }
+
             if (!_ScanProcessException)
             {
                 try
@@ -93,5 +103,23 @@ internal static ProfilerType GetProfilerType()
 
             return _LastProfilerType;
         }
+
+        private static string Left(string sValue, int iMaxLength)
+        {
+            //Check if the value is valid
+            if (string.IsNullOrEmpty(sValue))
+            {
+                //Set valid empty string as string could be null
+                sValue = string.Empty;
+            }
+            else if (sValue.Length > iMaxLength)
+            {
+                //Make the string no longer than the max length
+                sValue = sValue.Substring(0, iMaxLength);
+            }
+
+            //Return the string
+            return sValue;
+        }
     }
 }
diff --git a/Src/StackifyLib/project.json b/Src/StackifyLib/project.json
@@ -1,13 +1,12 @@
 {
-  "version": "1.23.1-beta3",
+  "version": "1.24.0",
 
   "title":  "Stackify API", 
 
   "packOptions": {
     "owners": [ "stackify_matt", "jtaylorstackify" ],
     "tags": [ "stackify", "metrics", "errors", "logs" ],
-    "summary": "Library for accessing the Stackify API",
-
+    "summary": "Library for accessing the Stackify API"
   },
 
   "dependencies": {
diff --git a/Src/StackifyLib/project.lock.json b/Src/StackifyLib/project.lock.json
diff --git a/Src/StackifyLibCore.sln b/Src/StackifyLibCore.sln

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ public static bool UploadMetrics(DateTime currentMinute)`
`369`	`369`	`if (!_httpClient.MatchedClientDeviceApp())`
`370`	`370`	`{`
`371`	`371`	`// purgeOlderThan = DateTime.UtcNow;`
`372`		`- StackifyAPILogger.Log("Upload metrics skipped due to being disabled");`
	`372`	`+ StackifyAPILogger.Log("Upload metrics skipped because we were unable to match the app to an app in Stackify");`
`373`	`373`	`}`
`374`	`374`	`else if (!_httpClient.IsAuthorized())`
`375`	`375`	`{`