Merge branch 'master' into potel-base

Author: sentrivana

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.19.2
+
+### Various fixes & improvements
+
+- Deepcopy and ensure get_all function always terminates (#3861) by @cmanallen
+- Cleanup chalice test environment (#3858) by @antonpirker
+
 ## 2.19.1
 
 ### Various fixes & improvements

docs/conf.py

@@ -31,7 +31,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.19.1"
+release = "2.19.2"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

scripts/ready_yet/requirements.txt

@@ -1,3 +1,2 @@
 requests
-pathlib
-tox
+tox

sentry_sdk/_lru_cache.py

@@ -62,7 +62,7 @@
 
 """
 
-from copy import copy
+from copy import copy, deepcopy
 
 SENTINEL = object()
 
@@ -95,7 +95,7 @@ def __copy__(self):
         cache = LRUCache(self.max_size)
         cache.full = self.full
         cache.cache = copy(self.cache)
-        cache.root = copy(self.root)
+        cache.root = deepcopy(self.root)
         return cache
 
     def set(self, key, value):
@@ -167,7 +167,15 @@ def get(self, key, default=None):
     def get_all(self):
         nodes = []
         node = self.root[NEXT]
-        while node is not self.root:
+
+        # To ensure the loop always terminates we iterate to the maximum
+        # size of the LRU cache.
+        for _ in range(self.max_size):
+            # The cache may not be full. We exit early if we've wrapped
+            # around to the head.
+            if node is self.root:
+                break
             nodes.append((node[KEY], node[VALUE]))
             node = node[NEXT]
+
         return nodes

sentry_sdk/consts.py

@@ -567,4 +567,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.19.1"
+VERSION = "2.19.2"

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.19.1",
+    version="2.19.2",
     author="Sentry Team and Contributors",
     author_email="[email protected]",
     url="https://github.com/getsentry/sentry-python",

tests/test_lru_cache.py

@@ -1,4 +1,5 @@
 import pytest
+from copy import copy
 
 from sentry_sdk._lru_cache import LRUCache
 
@@ -58,3 +59,20 @@ def test_cache_get_all():
     assert cache.get_all() == [(1, 1), (2, 2), (3, 3)]
     cache.get(1)
     assert cache.get_all() == [(2, 2), (3, 3), (1, 1)]
+
+
+def test_cache_copy():
+    cache = LRUCache(3)
+    cache.set(0, 0)
+    cache.set(1, 1)
+
+    copied = copy(cache)
+    cache.set(2, 2)
+    cache.set(3, 3)
+    assert copied.get_all() == [(0, 0), (1, 1)]
+    assert cache.get_all() == [(1, 1), (2, 2), (3, 3)]
+
+    copied = copy(cache)
+    cache.get(1)
+    assert copied.get_all() == [(1, 1), (2, 2), (3, 3)]
+    assert cache.get_all() == [(2, 2), (3, 3), (1, 1)]