added envelope logging to the IExecutionLogger implementations

DarthFubuMVC · Sep 1, 2015 · d2b349c · d2b349c
1 parent 0aedcbe
commit d2b349c
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 12 deletions.
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/IChainExecutionLog.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/IChainExecutionLog.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using FubuMVC.Core.Registration.Nodes;
+using FubuMVC.Core.ServiceBus.Runtime;
 
 namespace FubuMVC.Core.Diagnostics.Instrumentation
 {
@@ -14,6 +15,9 @@ public interface IChainExecutionLog
         void RecordHeaders(IDictionary<string, object> env);
         void RecordBody(IDictionary<string, object> env);
 
+        void RecordHeaders(Envelope envelope);
+        void RecordBody(Envelope envelope);
+
         Guid Id { get; }
         BehaviorChain RootChain { get; set; }
     }

diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/IExecutionLogger.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/IExecutionLogger.cs
@@ -1,9 +1,11 @@
 using System.Collections.Generic;
+using FubuMVC.Core.ServiceBus.Runtime;
 
 namespace FubuMVC.Core.Diagnostics.Instrumentation
 {
     public interface IExecutionLogger
     {
         void Record(IChainExecutionLog log, IDictionary<string, object> http);
+        void Record(IChainExecutionLog log, Envelope envelope);
     }
 }
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/IRequestLog.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/IRequestLog.cs
@@ -1,10 +1,10 @@
+using FubuMVC.Core.ServiceBus.Runtime;
+
 namespace FubuMVC.Core.Diagnostics.Instrumentation
 {
     public interface IRequestLog
     {
         double ExecutionTime { get; }
         bool HadException { get; }
-
-
     }
 }
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/NulloExecutionLogger.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/NulloExecutionLogger.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FubuMVC.Core.ServiceBus.Runtime;
 
 namespace FubuMVC.Core.Diagnostics.Instrumentation
 {
@@ -8,5 +9,10 @@ public void Record(IChainExecutionLog log, IDictionary<string, object> http)
         {
             // no-op
         }
+
+        public void Record(IChainExecutionLog log, Envelope envelope)
+        {
+            // no-op
+        }
     }
 }
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/ProductionExecutionLogger.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/ProductionExecutionLogger.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FubuMVC.Core.ServiceBus.Runtime;
 
 namespace FubuMVC.Core.Diagnostics.Instrumentation
 {
@@ -16,5 +17,12 @@ public void Record(IChainExecutionLog log, IDictionary<string, object> http)
             log.RecordHeaders(http);
             _storage.Store(log);
         }
+
+        public void Record(IChainExecutionLog log, Envelope envelope)
+        {
+            log.RecordHeaders(envelope);
+
+            _storage.Store(log);
+        }
     }
 }
diff --git a/src/FubuMVC.Core/Diagnostics/Instrumentation/VerboseExecutionLogger.cs b/src/FubuMVC.Core/Diagnostics/Instrumentation/VerboseExecutionLogger.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using FubuMVC.Core.ServiceBus.Runtime;
 
 namespace FubuMVC.Core.Diagnostics.Instrumentation
 {
@@ -18,5 +19,13 @@ public void Record(IChainExecutionLog log, IDictionary<string, object> http)
 
             _storage.Store(log);
         }
+
+        public void Record(IChainExecutionLog log, Envelope envelope)
+        {
+            log.RecordHeaders(envelope);
+            log.RecordBody(envelope);
+
+            _storage.Store(log);
+        }
     }
 }
diff --git a/src/FubuMVC.Tests/Diagnostics/Instrumentation/ChainExecutionLogTester.cs b/src/FubuMVC.Tests/Diagnostics/Instrumentation/ChainExecutionLogTester.cs
@@ -147,16 +147,6 @@ public void has_exception()
             log.HadException.ShouldBeTrue();
         }
 
-        [Test]
-        public void mark_finished()
-        {
-            var log = new ChainExecutionLog();
-            Thread.Sleep(5);
-            log.MarkFinished();
-
-            log.ExecutionTime.ShouldBeGreaterThan(0);
-        }
-
         [Test]
         public void record_headers_from_http_request()
         {

diff --git a/src/FubuMVC.Tests/Diagnostics/Instrumentation/ProductionExecutionLoggerTester.cs b/src/FubuMVC.Tests/Diagnostics/Instrumentation/ProductionExecutionLoggerTester.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using FubuMVC.Core.Diagnostics.Instrumentation;
+using FubuMVC.Core.ServiceBus.Runtime;
 using FubuMVC.Tests.TestSupport;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -22,5 +23,19 @@ public void record()
 
             MockFor<IExecutionLogStorage>().AssertWasCalled(x => x.Store(log));
         }
+
+        [Test]
+        public void record_for_envelope()
+        {
+            var log = MockFor<IChainExecutionLog>();
+            var envelope = new Envelope();
+
+            ClassUnderTest.Record(log, envelope);
+
+            log.AssertWasCalled(x => x.RecordHeaders(envelope));
+            log.AssertWasNotCalled(x => x.RecordBody(envelope));
+
+            MockFor<IExecutionLogStorage>().AssertWasCalled(x => x.Store(log));
+        }
     }
 }
diff --git a/src/FubuMVC.Tests/Diagnostics/Instrumentation/VerboseExecutionLoggerTester.cs b/src/FubuMVC.Tests/Diagnostics/Instrumentation/VerboseExecutionLoggerTester.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using FubuMVC.Core.Diagnostics.Instrumentation;
+using FubuMVC.Core.ServiceBus.Runtime;
 using FubuMVC.Tests.TestSupport;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -22,5 +23,19 @@ public void record()
 
             MockFor<IExecutionLogStorage>().AssertWasCalled(x => x.Store(log));
         }
+
+        [Test]
+        public void record_for_envelope()
+        {
+            var log = MockFor<IChainExecutionLog>();
+            var envelope = new Envelope();
+
+            ClassUnderTest.Record(log, envelope);
+
+            log.AssertWasCalled(x => x.RecordHeaders(envelope));
+            log.AssertWasCalled(x => x.RecordBody(envelope));
+
+            MockFor<IExecutionLogStorage>().AssertWasCalled(x => x.Store(log));
+        }
     }
 }