Added tracking of HttpMethod. #12

dhindrik · Aug 19, 2024 · f94ee43 · f94ee43
1 parent fec48f6
commit f94ee43
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 11 deletions.
diff --git a/TinyInsights.sln b/TinyInsights.sln
@@ -27,6 +27,7 @@ Global
 		{CD742E15-674D-41DB-8467-B8A83E26D5BC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{606F1693-DAA1-4BEA-BF62-F21F0F509E75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{606F1693-DAA1-4BEA-BF62-F21F0F509E75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{606F1693-DAA1-4BEA-BF62-F21F0F509E75}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{606F1693-DAA1-4BEA-BF62-F21F0F509E75}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{606F1693-DAA1-4BEA-BF62-F21F0F509E75}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

diff --git a/TinyInsights/ApplicationInsightsProvider.cs b/TinyInsights/ApplicationInsightsProvider.cs
@@ -293,7 +293,7 @@ public Task TrackPageViewAsync(string viewName, Dictionary<string, string>? prop
         return Task.CompletedTask;
     }
 
-    public Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, DateTimeOffset startTime, TimeSpan duration, bool success, int resultCode = 0, Exception? exception = null)
+    public Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, HttpMethod? httpMethod, DateTimeOffset startTime, TimeSpan duration, bool success, int resultCode = 0, Exception? exception = null)
     {
         try
         {
@@ -315,11 +315,16 @@ public Task TrackDependencyAsync(string dependencyType, string dependencyName, s
                 Timestamp = startTime,
                 Success = success,
                 Duration = duration,
-                ResultCode = resultCode.ToString()
+                ResultCode = resultCode.ToString(),
             };
 
             dependency.Properties.Add("FullUrl", fullUrl);
 
+            if (httpMethod != null)
+            {
+                dependency.Properties.Add("HttpMethod", httpMethod.ToString());
+            }
+
             if (exception != null)
             {
                 dependency.Properties.Add("ExceptionMessage", exception.Message);
@@ -342,6 +347,11 @@ public Task TrackDependencyAsync(string dependencyType, string dependencyName, s
         return Task.CompletedTask;
     }
 
+    public Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, DateTimeOffset startTime, TimeSpan duration, bool success, int resultCode = 0, Exception? exception = null)
+    {
+        return TrackDependencyAsync(dependencyType, dependencyName, data, null, startTime, duration, success, resultCode, exception);
+    }
+
     #region ILogger
     public async void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
     {

diff --git a/TinyInsights/Dependency.cs b/TinyInsights/Dependency.cs
@@ -15,8 +15,9 @@ internal Dependency(IInsights insights)
     public string Data { get; internal set; }
     public DateTimeOffset StartTime { get; private set; }
     public TimeSpan Duration { get; private set; }
+    public HttpMethod? HttpMethod { get; internal set; }
 
-    private SemaphoreSlim semaphore = new SemaphoreSlim(1,1);
+    private SemaphoreSlim semaphore = new SemaphoreSlim(1, 1);
 
     private bool isFinished;
 
@@ -43,11 +44,11 @@ public async Task Finish(bool sucess, int resultCode, Exception exception = null
         {
             Duration = DateTimeOffset.Now - StartTime;
 
-            await insights.TrackDependencyAsync(DependencyType, DependencyName, Data, StartTime, Duration, sucess, resultCode, exception);
+            await insights.TrackDependencyAsync(DependencyType, DependencyName, Data, HttpMethod, StartTime, Duration, sucess, resultCode, exception);
 
             isFinished = true;
 
-            semaphore.Release(); 
+            semaphore.Release();
         }
     }
 }
diff --git a/TinyInsights/IInsights.cs b/TinyInsights/IInsights.cs
@@ -10,7 +10,9 @@ public interface IInsights
 
     Task TrackEventAsync(string eventName, Dictionary<string, string>? properties = null);
 
-    Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, DateTimeOffset startTime, TimeSpan duration, bool success, int resultCode = 0, Exception exception = null);
+    Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, DateTimeOffset startTime, TimeSpan duration, bool success, int resultCode = 0, Exception? exception = null);
+    Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, HttpMethod? httpMethod, DateTimeOffset startTime, TimeSpan duration,
+       bool success, int resultCode = 0, Exception? exception = null);
     Dependency CreateDependencyTracker(string dependencyType, string dependencyName, string data);
     void OverrideAnonymousUserId(string userId);
     void GenerateNewAnonymousUserId();

diff --git a/TinyInsights/IInsightsProvider.cs b/TinyInsights/IInsightsProvider.cs
@@ -14,6 +14,7 @@ public interface IInsightsProvider
 
     Task TrackEventAsync(string eventName, Dictionary<string, string>? properties = null);
 
+    Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, HttpMethod? httpMethod, DateTimeOffset startTime, TimeSpan duration, bool success, int resultCode = 0, Exception? exception = null);
     Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, DateTimeOffset startTime, TimeSpan duration, bool success, int resultCode = 0, Exception? exception = null);
     void OverrideAnonymousUserId(string userId);
     void GenerateNewAnonymousUserId();

diff --git a/TinyInsights/Insights.cs b/TinyInsights/Insights.cs
@@ -55,12 +55,18 @@ public Task TrackEventAsync(string eventName, Dictionary<string, string>? proper
 
     public Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, DateTimeOffset startTime, TimeSpan duration,
         bool success, int resultCode = 0, Exception? exception = null)
+    {
+        return TrackDependencyAsync(dependencyType, dependencyName, data, null, startTime, duration, success, resultCode, exception);
+    }
+
+    public Task TrackDependencyAsync(string dependencyType, string dependencyName, string data, HttpMethod? httpMethod, DateTimeOffset startTime, TimeSpan duration,
+       bool success, int resultCode = 0, Exception? exception = null)
     {
         var tasks = new List<Task>();
 
         foreach (var provider in insightsProviders.Where(x => x.IsTrackDependencyEnabled))
         {
-            var task = provider.TrackDependencyAsync(dependencyType, dependencyName, data, startTime, duration, success, resultCode, exception);
+            var task = provider.TrackDependencyAsync(dependencyType, dependencyName, data, httpMethod, startTime, duration, success, resultCode, exception);
             tasks.Add(task);
         }
 
@@ -81,6 +87,19 @@ public Dependency CreateDependencyTracker(string dependencyType, string dependen
         return dependency;
     }
 
+    public Dependency CreateDependencyTracker(string dependencyType, string dependencyName, string data, HttpMethod httpMethod)
+    {
+        var dependency = new Dependency(this)
+        {
+            DependencyType = dependencyType,
+            DependencyName = dependencyName,
+            Data = data,
+            HttpMethod = httpMethod
+        };
+
+        return dependency;
+    }
+
     public void OverrideAnonymousUserId(string userId)
     {
         foreach (var provider in insightsProviders.Where(x => x.IsTrackDependencyEnabled))

diff --git a/TinyInsights/InsightsMessageHandler.cs b/TinyInsights/InsightsMessageHandler.cs
@@ -3,11 +3,11 @@ namespace TinyInsights;
 public class InsightsMessageHandler : DelegatingHandler
 {
     private readonly IInsights insights;
-    
+
     public InsightsMessageHandler(IInsights insights)
     {
         this.insights = insights;
-        
+
         InnerHandler = new HttpClientHandler();
     }
 
@@ -32,15 +32,15 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
                 exception = e;
             }
 
-            await insights.TrackDependencyAsync("HTTP", request.RequestUri.Host, request.RequestUri.ToString(), startTime, endTime - startTime,
+            await insights.TrackDependencyAsync("HTTP", request.RequestUri.Host, request.RequestUri.ToString(), request.Method, startTime, endTime - startTime,
                 response.IsSuccessStatusCode, (int)response.StatusCode, exception);
 
             return response;
         }
         catch (Exception ex)
         {
             var endTime = DateTime.Now;
-            await insights.TrackDependencyAsync("HTTP",request.RequestUri.Host, request.RequestUri.ToString(), startTime, endTime - startTime,
+            await insights.TrackDependencyAsync("HTTP", request.RequestUri.Host, request.RequestUri.ToString(), startTime, endTime - startTime,
                 false, 0, ex);
 
             throw;