Remove remaining Hudl.Common dependency for WithData

hudl · Apr 3, 2017 · 871ab1c · 871ab1c
1 parent 0edaaf2
commit 871ab1c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/Hudl.Mjolnir.Tests/Hudl.Mjolnir.Tests.csproj b/Hudl.Mjolnir.Tests/Hudl.Mjolnir.Tests.csproj
@@ -44,10 +44,6 @@
     <Reference Include="Castle.Core">
       <HintPath>..\packages\Castle.Core.2.5.1\lib\NET35\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Hudl.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Hudl.Common.1.4.1\lib\net35\Hudl.Common.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\log4net.2.0.0\lib\net40-full\log4net.dll</HintPath>

diff --git a/Hudl.Mjolnir.Tests/packages.config b/Hudl.Mjolnir.Tests/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="2.5.1" targetFramework="net45" />
-  <package id="Hudl.Common" version="1.4.1" targetFramework="net45" />
   <package id="log4net" version="2.0.0" targetFramework="net45" />
   <package id="Moq" version="4.1.1309.1617" targetFramework="net45" />
   <package id="xunit" version="2.0.0" targetFramework="net45" />

diff --git a/Hudl.Mjolnir/Command/CommandInvoker.cs b/Hudl.Mjolnir/Command/CommandInvoker.cs
@@ -1,5 +1,4 @@
-using Hudl.Common.Extensions;
-using Hudl.Mjolnir.Breaker;
+using Hudl.Mjolnir.Breaker;
 using Hudl.Mjolnir.Bulkhead;
 using Hudl.Mjolnir.External;
 using log4net;
@@ -587,15 +586,12 @@ private static void AttachCommandExceptionData(BaseCommand command, Exception ex
         {
             // Use namespaced keys here to avoid clobbering data that the application might've
             // already attached (or will attach later).
-            exception.WithData(new
-            {
-                MjolnirCommand = command.Name,
-                MjolnirStatus = status,
-                MjolnirBreaker = command.BreakerKey,
-                MjolnirBulkhead = command.BulkheadKey,
-                MjolnirTimeoutMillis = ct.DescriptionForLog,
-                MjolnirExecuteMillis = command.ExecutionTimeMillis,
-            });
+            exception.Data["MjolnirCommand"] = command.Name;
+            exception.Data["MjolnirStatus"] = status;
+            exception.Data["MjolnirBreaker"] = command.BreakerKey;
+            exception.Data["MjolnirBulkhead"] = command.BulkheadKey;
+            exception.Data["MjolnirTimeoutMillis"] = ct.DescriptionForLog;
+            exception.Data["MjolnirExecuteMillis"] = command.ExecutionTimeMillis;
         }
 
         private static bool IsCancellationException(Exception e)

diff --git a/Hudl.Mjolnir/Hudl.Mjolnir.csproj b/Hudl.Mjolnir/Hudl.Mjolnir.csproj
@@ -38,10 +38,6 @@
     <Reference Include="Castle.Core">
       <HintPath>..\packages\Castle.Core.2.5.1\lib\NET35\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Hudl.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Hudl.Common.1.4.1\lib\net35\Hudl.Common.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Hudl.Mjolnir.Attributes, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Hudl.Mjolnir.Attributes.1.0.0\lib\net45\Hudl.Mjolnir.Attributes.dll</HintPath>

diff --git a/Hudl.Mjolnir/packages.config b/Hudl.Mjolnir/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Castle.Core" version="2.5.1" targetFramework="net45" />
-  <package id="Hudl.Common" version="1.4.1" targetFramework="net45" />
   <package id="Hudl.Mjolnir.Attributes" version="1.0.0" targetFramework="net45" />
   <package id="log4net" version="2.0.0" targetFramework="net45" />
 </packages>