Cleanup thread local context in ThreadLocalContextManager after e…

CHANGES

@@ -3,6 +3,7 @@ Version 1.1.1
 
 - Allow overriding the location of the properties file.
 - Add support for handling and uploading Proguard files to Sentry (for Android applications).
+- Cleanup thread local context in ``ThreadLocalContextManager`` after each servlet request finishes.
 - Change the ``EventBuilder`` hostname lookup code to only run one thread at a time.
 
 Version 1.1.0

sentry/src/main/java/io/sentry/Sentry.java

@@ -182,7 +182,7 @@ public static void setUser(User user) {
      * Clears the current context.
      */
     public static void clearContext() {
-        getStoredClient().getContext().clear();
+        getStoredClient().clearContext();
     }
 
     /**

sentry/src/main/java/io/sentry/SentryClient.java

@@ -215,6 +215,13 @@ public void closeConnection() {
         }
     }
 
+    /**
+     * Clears the {@link ContextManager} data.
+     */
+    public void clearContext() {
+        contextManager.clear();
+    }
+
     public Context getContext() {
         return contextManager.getContext();
     }

sentry/src/main/java/io/sentry/context/ContextManager.java

@@ -17,4 +17,9 @@ public interface ContextManager {
      */
     Context getContext();
 
+    /**
+     * Clear the underlying context data.
+     */
+    void clear();
+
 }

sentry/src/main/java/io/sentry/context/SingletonContextManager.java

@@ -16,4 +16,9 @@ public class SingletonContextManager implements ContextManager {
     public Context getContext() {
         return context;
     }
+
+    @Override
+    public void clear() {
+        context.clear();
+    }
 }

sentry/src/main/java/io/sentry/context/ThreadLocalContextManager.java

@@ -21,4 +21,9 @@ public Context getContext() {
         return context.get();
     }
 
+    @Override
+    public void clear() {
+        context.remove();
+    }
+
 }

sentry/src/main/java/io/sentry/servlet/SentryServletRequestListener.java

@@ -31,7 +31,7 @@ public void requestDestroyed(ServletRequestEvent servletRequestEvent) {
         try {
             SentryClient sentryClient = Sentry.getStoredClient();
             if (sentryClient != null) {
-                sentryClient.getContext().clear();
+                sentryClient.clearContext();
             }
         } catch (Exception e) {
             logger.error("Error clearing Context state.", e);

sentry/src/test/java/io/sentry/SentryClientTest.java

@@ -35,7 +35,7 @@ public class SentryClientTest extends BaseTest {
 
     @BeforeMethod
     public void setup() {
-        contextManager.getContext().clear();
+        contextManager.clear();
     }
 
     @Test

sentry/src/test/java/io/sentry/SentryTest.java

@@ -34,7 +34,7 @@ public class SentryTest extends BaseTest {
 
     @BeforeMethod
     public void setup() {
-        contextManager.getContext().clear();
+        contextManager.clear();
     }
 
     @Test

sentry/src/test/java/io/sentry/event/BreadcrumbTest.java

@@ -28,7 +28,7 @@ public class BreadcrumbTest extends BaseTest {
 
     @BeforeMethod
     public void setup() {
-        contextManager.getContext().clear();
+        contextManager.clear();
     }
 
     @Test

sentry/src/test/java/io/sentry/event/UserTest.java

@@ -26,7 +26,7 @@ public class UserTest extends BaseTest {
 
     @BeforeMethod
     public void setup() {
-        contextManager.getContext().clear();
+        contextManager.clear();
     }
 
     @Test