Fixed a bug where the web clients could overwrite previously set request info or user info

Author: niemyjski

Source/Platforms/Web/ExceptionlessWebPlugin.cs

@@ -1,56 +1,60 @@
 using System;
 using System.Web;
+using Exceptionless.Dependency;
 using Exceptionless.Plugins;
 using Exceptionless.Extensions;
 using Exceptionless.Logging;
 using Exceptionless.Models;
-using Exceptionless.Models.Data;
 
 namespace Exceptionless.Web {
     [Priority(90)]
     internal class ExceptionlessWebPlugin : IEventPlugin {
         private const string TAGS_HTTP_CONTEXT_NAME = "Exceptionless.Tags";
 
         public void Run(EventPluginContext context) {
-            HttpContextBase httpContext = context.ContextData.GetHttpContext();
+            var httpContext = context.ContextData.GetHttpContext();
 
             // if the context is not passed in, try and grab it
             if (httpContext == null && HttpContext.Current != null)
                 httpContext = HttpContext.Current.ToWrapped();
 
             if (httpContext == null)
                 return;
-
-            // ev.ExceptionlessClientInfo.Platform = ".NET Web";
-            if (context.Client.Configuration.IncludePrivateInformation
-                && httpContext.User != null
-                && httpContext.User.Identity.IsAuthenticated)
-                context.Event.SetUserIdentity(httpContext.User.Identity.Name);
+            
+            var serializer = context.Client.Configuration.Resolver.GetJsonSerializer();
+            if (context.Client.Configuration.IncludePrivateInformation && httpContext.User != null && httpContext.User.Identity.IsAuthenticated) {
+                var user = context.Event.GetUserIdentity(serializer);
+                if (user == null)
+                    context.Event.SetUserIdentity(httpContext.User.Identity.Name);
+            }
 
             var tags = httpContext.Items[TAGS_HTTP_CONTEXT_NAME] as TagSet;
             if (tags != null)
                 context.Event.Tags.UnionWith(tags);
+            
+            var ri = context.Event.GetRequestInfo(serializer);
+            if (ri != null)
+                return;
 
-            RequestInfo requestInfo = null;
             try {
-                requestInfo = httpContext.GetRequestInfo(context.Client.Configuration);
+                ri = httpContext.GetRequestInfo(context.Client.Configuration);
             } catch (Exception ex) {
                 context.Log.Error(typeof(ExceptionlessWebPlugin), ex, "Error adding request info.");
             }
 
-            if (requestInfo == null)
+            if (ri == null)
                 return;
 
             var httpException = context.ContextData.GetException() as HttpException;
             if (httpException != null) {
                 int httpCode = httpException.GetHttpCode();
                 if (httpCode == 404) {
                     context.Event.Type = Event.KnownTypes.NotFound;
-                    context.Event.Source = requestInfo.GetFullPath(includeHttpMethod: true, includeHost: false, includeQueryString: false);
+                    context.Event.Source = ri.GetFullPath(includeHttpMethod: true, includeHost: false, includeQueryString: false);
                 }
             }
 
-            context.Event.AddRequestInfo(requestInfo);
+            context.Event.AddRequestInfo(ri);
         }
     }
 }

Source/Platforms/WebApi/ExceptionlessWebApiPlugin.cs

@@ -5,13 +5,11 @@
 using System.Reflection;
 using System.Security.Principal;
 using System.Threading;
-using System.Web.Http.Controllers;
 using Exceptionless.Dependency;
 using Exceptionless.Plugins;
 using Exceptionless.Extensions;
 using Exceptionless.Logging;
 using Exceptionless.Models;
-using Exceptionless.Models.Data;
 
 namespace Exceptionless.WebApi {
     [Priority(90)]
@@ -20,31 +18,40 @@ public void Run(EventPluginContext context) {
             if (!context.ContextData.ContainsKey("HttpActionContext"))
                 return;
 
-            HttpActionContext actionContext = context.ContextData.GetHttpActionContext();
+            var actionContext = context.ContextData.GetHttpActionContext();
             if (actionContext == null)
                 return;
 
-            IPrincipal principal = GetPrincipal(actionContext.Request);
-            if (context.Client.Configuration.IncludePrivateInformation && principal != null && principal.Identity.IsAuthenticated)
-                context.Event.SetUserIdentity(principal.Identity.Name);
+            var serializer = context.Client.Configuration.Resolver.GetJsonSerializer();
+            if (context.Client.Configuration.IncludePrivateInformation) {
+                var user = context.Event.GetUserIdentity(serializer);
+                if (user == null) {
+                    IPrincipal principal = GetPrincipal(actionContext.Request);
+                    if (principal != null && principal.Identity.IsAuthenticated)
+                        context.Event.SetUserIdentity(principal.Identity.Name);
+                }
+            }
+
+            var ri = context.Event.GetRequestInfo(serializer);
+            if (ri != null)
+                return;
 
-            RequestInfo requestInfo = null;
             try {
-                requestInfo = actionContext.GetRequestInfo(context.Client.Configuration);
+                ri = actionContext.GetRequestInfo(context.Client.Configuration);
             } catch (Exception ex) {
                 context.Log.Error(typeof(ExceptionlessWebApiPlugin), ex, "Error adding request info.");
             }
 
-            if (requestInfo == null)
+            if (ri == null)
                 return;
 
-            var error = context.Event.GetError(context.Client.Configuration.Resolver.GetJsonSerializer());
+            var error = context.Event.GetError(serializer);
             if (error != null && error.Code == "404") {
                 context.Event.Type = Event.KnownTypes.NotFound;
-                context.Event.Source = requestInfo.GetFullPath(includeHttpMethod: true, includeHost: false, includeQueryString: false);
+                context.Event.Source = ri.GetFullPath(includeHttpMethod: true, includeHost: false, includeQueryString: false);
             }
 
-            context.Event.AddRequestInfo(requestInfo);
+            context.Event.AddRequestInfo(ri);
         }
 
         private static IPrincipal GetPrincipal(HttpRequestMessage request) {