change to serialize the session in the report

Author: Pezzah

bugsnag/src/main/java/com/bugsnag/Bugsnag.java

@@ -472,16 +472,11 @@ public boolean notify(Report report, Callback reportCallback) {
         Session session = sessionTracker.getSession();
 
         if (session != null) {
-            try {
-                if (report.getUnhandled()) {
-                    session = session.incrementUnhandledCountAndClone();
-                } else {
-                    session = session.incrementHandledCountAndClone();
-                }
-            } catch (InterruptedException ex) {
-                // Failed to increment session counts properly
+            if (report.getUnhandled()) {
+                session.incrementUnhandledCount();
+            } else {
+                session.incrementHandledCount();
             }
-
             report.setSession(session);
         }
 

bugsnag/src/main/java/com/bugsnag/Report.java

@@ -23,7 +23,7 @@ public class Report {
     private String groupingHash;
     private Diagnostics diagnostics;
     private boolean shouldCancel = false;
-    private Session session;
+    private Map<String, Object> sessionMap;
     private final List<ThreadState> threadStates;
 
     /**
@@ -131,23 +131,22 @@ public Map<String, Object> getMetaData() {
 
     @Expose
     Map<String, Object> getSession() {
+        return sessionMap;
+    }
+
+    void setSession(Session session) {
         if (session == null) {
-            return null;
+            sessionMap = null;
         }
-        
-        Map<String, Object> map = new HashMap<String, Object>();
-        map.put("id", session.getId());
-        map.put("startedAt", session.getStartedAt());
+
+        sessionMap = new HashMap<String, Object>();
+        sessionMap.put("id", session.getId());
+        sessionMap.put("startedAt", session.getStartedAt());
 
         Map<String, Object> handledCounts = new HashMap<String, Object>();
         handledCounts.put("handled", session.getHandledCount());
         handledCounts.put("unhandled", session.getUnhandledCount());
-        map.put("events", handledCounts);
-        return map;
-    }
-
-    void setSession(Session session) {
-        this.session = session;
+        sessionMap.put("events", handledCounts);
     }
 
     /**

bugsnag/src/main/java/com/bugsnag/Session.java

@@ -3,13 +3,10 @@
 import com.bugsnag.serialization.Expose;
 
 import java.util.Date;
-import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicInteger;
 
 class Session {
 
-    private final Semaphore incrementRequest = new Semaphore(1);
-
     private final String id;
     private final Date startedAt;
     private final AtomicInteger handledCount;
@@ -22,13 +19,6 @@ class Session {
         this.unhandledCount = new AtomicInteger(0);
     }
 
-    private Session(String id, Date startedAt, int handledCount, int unhandledCount) {
-        this.id = id;
-        this.startedAt = startedAt;
-        this.handledCount = new AtomicInteger(handledCount);
-        this.unhandledCount = new AtomicInteger(unhandledCount);
-    }
-
     int getHandledCount() {
         return handledCount.get();
     }
@@ -37,16 +27,6 @@ void incrementHandledCount() {
         this.handledCount.incrementAndGet();
     }
 
-    Session incrementHandledCountAndClone() throws InterruptedException {
-        try {
-            incrementRequest.acquire();
-            incrementHandledCount();
-            return cloneSession();
-        } finally {
-            incrementRequest.release();
-        }
-    }
-
     int getUnhandledCount() {
         return unhandledCount.get();
     }
@@ -55,20 +35,6 @@ void incrementUnhandledCount() {
         this.unhandledCount.incrementAndGet();
     }
 
-    Session incrementUnhandledCountAndClone() throws InterruptedException {
-        try {
-            incrementRequest.acquire();
-            incrementUnhandledCount();
-            return cloneSession();
-        } finally {
-            incrementRequest.release();
-        }
-    }
-
-    private Session cloneSession() {
-        return new Session(id, startedAt, handledCount.get(), unhandledCount.get());
-    }
-
     String getId() {
         return id;
     }