Updates to session heartbeats

Author: niemyjski

Source/Shared/Plugins/Default/050_EnvironmentInfoPlugin.cs

@@ -10,6 +10,9 @@ public void Run(EventPluginContext context) {
             if (context.Event.Data.ContainsKey(Event.KnownDataKeys.EnvironmentInfo))
                 return;
 
+            if (!String.IsNullOrEmpty(context.Event.SessionId) && context.Event.IsSessionEnd() || context.Event.IsSessionHeartbeat())
+                return;
+
             try {
                 var collector = context.Resolver.GetEnvironmentInfoCollector();
                 if (collector == null)

Source/Shared/Plugins/Default/100_SessionManagerPlugin.cs

@@ -16,7 +16,7 @@ public void Run(EventPluginContext context) {
             if (String.IsNullOrEmpty(identity))
                 return;
 
-            string sessionId = null;
+            string sessionId;
 
             if (context.Event.IsSessionStart()) {
                 sessionId = sessionManager.StartSession(identity);

Source/Shared/Plugins/Default/110 _HeartbeatPlugin.cs

@@ -13,15 +13,14 @@ public class HeartbeatPlugin : IEventPlugin, IDisposable {
         public void Run(EventPluginContext context) {
             if (context.Event.IsSessionHeartbeat())
                 return;
-
-            var user = context.Event.GetUserIdentity();
-            var sessionIdentifier = context.Event.SessionId ?? user?.Identity;
+            
+            var sessionIdentifier = context.Event.SessionId;
             if (String.IsNullOrEmpty(sessionIdentifier))
                 return;
 
             lock (_lock) {
                 if (!_sessionHeartbeats.ContainsKey(sessionIdentifier)) {
-                    _sessionHeartbeats.Add(sessionIdentifier, new SessionHeartbeat(context.Event.SessionId, user, context.Client));
+                    _sessionHeartbeats.Add(sessionIdentifier, new SessionHeartbeat(sessionIdentifier, context.Client));
                 } else if (context.Event.IsSessionEnd()) {
                     _sessionHeartbeats[sessionIdentifier].Dispose();
                     _sessionHeartbeats.Remove(sessionIdentifier);
@@ -51,21 +50,15 @@ public SessionHeartbeat(string sessionId, ExceptionlessClient client) {
             _client = client;
             _timer = new Timer(SendHeartbeat, null, _interval, _interval);
         }
-
-        public SessionHeartbeat(string sessionId, UserInfo user, ExceptionlessClient client) : this(sessionId, client) {
-            UserInfo = user;
-        }
-
+        
         public string SessionId { get; set; }
-
-        public UserInfo UserInfo { get; set; }
-
+        
         public void DelayNext() {
             _timer.Change(_interval, _interval);
         }
 
         private void SendHeartbeat(object state) {
-            _client.CreateSessionHeartbeat(SessionId).SetUserIdentity(UserInfo?.Identity, UserInfo?.Name).Submit();
+            _client.SubmitSessionHeartbeat(SessionId);
         }
 
         public void Dispose() {