Merge pull request #26 from dbones-labs/feature/cleanup-code

Feature/cleanup code

Author: dbones

src/Auditable.AspNetCore.Tests/When_creating_a_log_entry_with_an_authorized_user_and_request_id.cs

@@ -5,14 +5,17 @@
     using System.Net.Http;
     using Collectors;
     using global::Auditable.Collectors;
+    using global::Auditable.Collectors.Initiator;
+    using global::Auditable.Collectors.Request;
+    using global::Auditable.Infrastructure;
     using global::Auditable.Tests;
     using global::Auditable.Tests.Models.Simple;
     using Infrastructure;
     using Machine.Specifications;
     using Microsoft.Extensions.DependencyInjection;
     using Parsing;
     using Writers;
-    using Environment = global::Auditable.Collectors.Environment;
+    using Environment = global::Auditable.Collectors.Environment.Environment;
 
     [Subject("auditable")]
     public class When_creating_a_log_entry_with_an_authorized_user_and_request_id

src/Auditable.AspNetCore/Collectors/ClaimsInitiatorCollector.cs

@@ -2,6 +2,7 @@
 {
     using System.Threading.Tasks;
     using global::Auditable.Collectors;
+    using global::Auditable.Collectors.Initiator;
 
     class ClaimsInitiatorCollector : IInitiatorCollector
     {

src/Auditable.AspNetCore/Collectors/RequestContextCollector.cs

@@ -2,6 +2,7 @@
 {
     using System.Threading.Tasks;
     using global::Auditable.Collectors;
+    using global::Auditable.Collectors.Request;
 
     class RequestContextCollector : IRequestContextCollector
     {

src/Auditable.AspNetCore/Middleware/InitiatorMiddleware.cs

@@ -4,6 +4,7 @@
     using System.Threading.Tasks;
     using Collectors;
     using global::Auditable.Collectors;
+    using global::Auditable.Collectors.Initiator;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.DependencyInjection;
 

src/Auditable.AspNetCore/Middleware/RequestMiddleware.cs

@@ -3,7 +3,7 @@
     using System.Diagnostics;
     using System.Threading.Tasks;
     using Collectors;
-    using global::Auditable.Collectors;
+    using global::Auditable.Collectors.Request;
     using Microsoft.AspNetCore.Http;
     using Microsoft.Extensions.DependencyInjection;
 
@@ -26,34 +26,26 @@ public async Task InvokeAsync(HttpContext context)
 
             //https://www.w3.org/TR/trace-context/#trace-context-http-headers-format
             //curl --header "traceparent: 00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01" localhost:8080
+            
+            //simple check for the header.
             var hasW3cTraceParent = context.Request.Headers.ContainsKey("traceparent");
             var hasActivity = Activity.Current != null;
-            if (!hasW3cTraceParent || !hasActivity) await _next(context);
-
-            //var raw = context.Request.Headers["traceparent"].FirstOrDefault()?.Split("-");
-            //if (raw == null) await _next(context);
-
-            var activity = Activity.Current;
 
-            //var version = raw[0];
-            //var trace = raw[1];
-            //var span = raw[2];
-            //var flags = raw[3];
+            if (!hasW3cTraceParent || !hasActivity)
+            {
+                await _next(context);
+            }
 
+            //use the Activity set by the OpenTelemetry Lib
+            var activity = Activity.Current;
 
-
-
-            requestCollector.RequestContext = new RequestContext()
+            requestCollector.RequestContext = new RequestContext
             {
                 SpanId = activity.SpanId.ToString(),
                 TraceId = activity.TraceId.ToString(),
                 ParentId = activity.ParentSpanId.ToString()
             };
 
-
-            
-        
-
             await _next(context);
         }
     }

src/Auditable.AspNetCore/SetupAuditable.cs

@@ -2,6 +2,8 @@
 {
     using Collectors;
     using global::Auditable.Collectors;
+    using global::Auditable.Collectors.Initiator;
+    using global::Auditable.Collectors.Request;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.Extensions.DependencyInjection;
     using Microsoft.Extensions.Hosting;

src/Auditable.Tests/Core/Explicit/When_auditing_explicit_delete.cs

@@ -1,4 +1,4 @@
-using Env = Auditable.Collectors.Environment;
+using Env = Auditable.Collectors.Environment.Environment;
 
 namespace Auditable.Tests.Core.Explicit
 {
@@ -7,6 +7,7 @@ namespace Auditable.Tests.Core.Explicit
     using Configuration;
     using global::Auditable.Parsing;
     using global::Auditable.Tests.Models.Simple;
+    using Infrastructure;
     using Machine.Specifications;
     using Microsoft.Extensions.DependencyInjection;
 

src/Auditable.Tests/Core/Explicit/When_auditing_explicit_read.cs

@@ -1,4 +1,4 @@
-using Env = Auditable.Collectors.Environment;
+using Env = Auditable.Collectors.Environment.Environment;
 
 namespace Auditable.Tests.Core.Explicit
 {
@@ -7,6 +7,7 @@ namespace Auditable.Tests.Core.Explicit
     using Configuration;
     using global::Auditable.Parsing;
     using global::Auditable.Tests.Models.Simple;
+    using Infrastructure;
     using Machine.Specifications;
     using Microsoft.Extensions.DependencyInjection;
 

src/Auditable.Tests/Core/Observed/When_auditing_observed_change.cs

@@ -1,4 +1,4 @@
-using Env = Auditable.Collectors.Environment;
+using Env = Auditable.Collectors.Environment.Environment;
 
 namespace Auditable.Tests.Core.Observed
 {
@@ -8,6 +8,7 @@ namespace Auditable.Tests.Core.Observed
     using Configuration;
     using global::Auditable.Parsing;
     using global::Auditable.Tests.Models.Simple;
+    using Infrastructure;
     using Machine.Specifications;
     using Microsoft.Extensions.DependencyInjection;
     using PowerAssert;

src/Auditable.Tests/Core/Observed/When_auditing_observed_read.cs

@@ -1,4 +1,4 @@
-using Env = Auditable.Collectors.Environment;
+using Env = Auditable.Collectors.Environment.Environment;
 
 namespace Auditable.Tests.Core.Observed
 {
@@ -7,6 +7,7 @@ namespace Auditable.Tests.Core.Observed
     using Configuration;
     using global::Auditable.Parsing;
     using global::Auditable.Tests.Models.Simple;
+    using Infrastructure;
     using Machine.Specifications;
     using Microsoft.Extensions.DependencyInjection;