Merge remote-tracking branch 'refs/remotes/origin/master' into session

Author: niemyjski

Source/Platforms/WebApi/ExceptionlessHandleErrorAttribute.cs

@@ -8,10 +8,17 @@
 
 namespace Exceptionless.WebApi {
     public class ExceptionlessHandleErrorAttribute : IExceptionFilter {
-        public bool HasWrappedFilter { get { return WrappedFilter != null; } }
+        private readonly ExceptionlessClient _client;
+
+        public bool HasWrappedFilter => WrappedFilter != null;
 
         public IExceptionFilter WrappedFilter { get; set; }
-        public bool AllowMultiple { get { return HasWrappedFilter && WrappedFilter.AllowMultiple; } }
+
+        public bool AllowMultiple => HasWrappedFilter && WrappedFilter.AllowMultiple;
+
+        public ExceptionlessHandleErrorAttribute(ExceptionlessClient client = null) {
+            _client = client ?? ExceptionlessClient.Default;
+        }
 
         public virtual void OnHttpException(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken) {
             if (HasWrappedFilter)
@@ -22,11 +29,11 @@ public virtual void OnHttpException(HttpActionExecutedContext actionExecutedCont
             contextData.SetSubmissionMethod("ExceptionHttpFilter");
             contextData.Add("HttpActionContext", actionExecutedContext.ActionContext);
 
-            actionExecutedContext.Exception.ToExceptionless(contextData).Submit();
+            actionExecutedContext.Exception.ToExceptionless(contextData, _client).Submit();
         }
 
         public Task ExecuteExceptionFilterAsync(HttpActionExecutedContext actionExecutedContext, CancellationToken cancellationToken) {
-            ExceptionlessClient.Default.Configuration.Resolver.GetLog().Trace("ExecuteExceptionFilterAsync executing...");
+            _client.Configuration.Resolver.GetLog().Trace("ExecuteExceptionFilterAsync executing...");
             if (actionExecutedContext == null)
                 throw new ArgumentNullException(nameof(actionExecutedContext));
 

Source/Platforms/WebApi/ExceptionlessWebApiExtensions.cs

@@ -24,7 +24,7 @@ public static void RegisterWebApi(this ExceptionlessClient client, HttpConfigura
             config.Services.Add(typeof(IExceptionLogger), new ExceptionlessExceptionLogger());
 #endif
 
-            ReplaceHttpErrorHandler(config);
+            ReplaceHttpErrorHandler(config, client);
         }
 
         /// <summary>
@@ -36,9 +36,9 @@ public static void UnregisterWebApi(this ExceptionlessClient client) {
             client.Configuration.RemovePlugin<ExceptionlessWebApiPlugin>();
         }
 
-        private static void ReplaceHttpErrorHandler(HttpConfiguration config) {
+        private static void ReplaceHttpErrorHandler(HttpConfiguration config, ExceptionlessClient client) {
             FilterInfo filter = config.Filters.FirstOrDefault(f => f.Instance is IExceptionFilter);
-            var handler = new ExceptionlessHandleErrorAttribute();
+            var handler = new ExceptionlessHandleErrorAttribute(client);
 
             if (filter != null) {
                 if (filter.Instance is ExceptionlessHandleErrorAttribute)