Revert "Capture trace of error reporting thread and identify with boolean flag" (#88)

Reverts #87

Author: kattrali

CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## 3.X.X (TBD)
-
-* Capture trace of error reporting thread and identify with boolean flag
-  [#87](https://github.com/bugsnag/bugsnag-java/pull/87)
-
 ## 3.2.0 (2018-07-03)
 
 This release introduces automatic tracking of sessions, which by

src/main/java/com/bugsnag/ThreadState.java

@@ -1,6 +1,5 @@
 package com.bugsnag;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.ArrayList;
@@ -10,11 +9,9 @@
 import java.util.Map;
 
 class ThreadState {
-
-    private final Configuration config;
-    private final Thread thread;
-    private final StackTraceElement[] stackTraceElements;
-    private Boolean errorReportingThread;
+    private Configuration config;
+    private Thread thread;
+    private StackTraceElement[] stackTraceElements;
 
     ThreadState(Configuration config, Thread thread, StackTraceElement[] stackTraceElements) {
         this.config = config;
@@ -36,16 +33,19 @@ public int compare(Object first, Object second) {
         });
 
         List<ThreadState> threads = new ArrayList<ThreadState>();
+        for (int i = 0; i < keys.length; i++) {
+            Thread thread = (Thread) keys[i];
+
+            // Don't show the current stacktrace here. It'll point at this method
+            // rather than at the point they crashed.
+            if (thread.getId() == crashingThreadId) {
+                continue;
+            }
 
-        for (Object key : keys) {
-            Thread thread = (Thread) key;
             ThreadState threadState = new ThreadState(config, thread, liveThreads.get(thread));
             threads.add(threadState);
-
-            if (threadState.getId() == crashingThreadId) {
-                threadState.setErrorReportingThread(true);
-            }
         }
+
         return threads;
     }
 
@@ -63,14 +63,4 @@ public String getName() {
     public List<Stackframe> getStacktrace() {
         return Stackframe.getStacktrace(config, stackTraceElements);
     }
-
-    @JsonProperty("errorReportingThread")
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    public Boolean isErrorReportingThread() {
-        return errorReportingThread;
-    }
-
-    public void setErrorReportingThread(Boolean errorReportingThread) {
-        this.errorReportingThread = errorReportingThread;
-    }
 }

src/test/java/com/bugsnag/ThreadStateTest.java

@@ -1,18 +1,12 @@
 package com.bugsnag;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.lang.Exception;
 import java.util.List;
 
@@ -31,15 +25,16 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void testThreadStateContainsCurrentThread() {
-        int count = 0;
+    public void testThreadStateDoesNotContainCurrentThread() {
 
         for (ThreadState thread : threadStates) {
             if (thread.getId() == Thread.currentThread().getId()) {
-                count++;
+                fail();
             }
         }
-        assertEquals(1, count);
+
+        // Just test that there is at least one thread
+        assertTrue(threadStates.size() > 1);
     }
 
     @Test
@@ -56,46 +51,4 @@ public void testThreadStacktrace() {
             assertNotNull(stacktrace);
         }
     }
-
-    /**
-     * Verifies that the required values for 'thread' are serialised as an array
-     */
-    @Test
-    public void testSerialisation() throws Exception {
-        JsonNode root = serialiseThreadStateToJson();
-
-        for (JsonNode jsonNode : root) {
-            assertNotNull(jsonNode.get("id").asText());
-            assertNotNull(jsonNode.get("name").asText());
-            assertNotNull(jsonNode.get("stacktrace"));
-        }
-    }
-
-    /**
-     * Verifies that the current thread is serialised as an object, and that only this value
-     * contains the errorReportingThread boolean flag
-     */
-    @Test
-    public void testCurrentThread() throws Exception {
-        JsonNode root = serialiseThreadStateToJson();
-        long currentThreadId = Thread.currentThread().getId();
-        int currentThreadCount = 0;
-
-        for (JsonNode jsonNode : root) {
-            if (currentThreadId == jsonNode.get("id").asLong()) {
-                assertTrue(jsonNode.get("errorReportingThread").asBoolean());
-                currentThreadCount++;
-            } else {
-                assertFalse(jsonNode.has("errorReportingThread"));
-            }
-        }
-        assertEquals(1, currentThreadCount);
-    }
-
-    private JsonNode serialiseThreadStateToJson() throws IOException {
-        ObjectMapper mapper = new ObjectMapper();
-        String json = mapper.writeValueAsString(threadStates);
-        return mapper.readTree(json);
-    }
-
 }