Merge branch 'master' into ivana/populate-tox-step-by-step

sentrivana · sentrivana · commit a1e7da738c50 · 2025-01-14T12:06:26.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+## 2.20.0
+
+- **New integration:** Add [Typer](https://typer.tiangolo.com/) integration (#3869) by @patrick91
+  
+  For more information, see the documentation for the [TyperIntegration](https://docs.sentry.io/platforms/python/integrations/typer/).
+
+- **New integration:** Add [Unleash](https://www.getunleash.io/) feature flagging integration (#3888) by @aliu39
+
+  For more information, see the documentation for the [UnleashIntegration](https://docs.sentry.io/platforms/python/integrations/unleash/).
+
+- Add custom tracking of feature flag evaluations (#3860) by @aliu39
+- Feature Flags: Register LD hook in setup instead of init, and don't check for initialization (#3890) by @aliu39
+- Feature Flags: Moved adding of `flags` context into Scope (#3917) by @antonpirker
+- Create a separate group for feature flag test suites (#3911) by @sentrivana
+- Fix flaky LaunchDarkly tests (#3896) by @aliu39
+- Fix LRU cache copying (#3883) by @ffelixg
+- Fix cache pollution from mutable reference (#3887) by @cmanallen
+- Centralize minimum version checking (#3910) by @sentrivana
+- Support SparkIntegration activation after SparkContext created (#3411) by @seyoon-lim
+- Preserve ARQ enqueue_job __kwdefaults__ after patching (#3903) by @danmr
+- Add Github workflow to comment on issues when a fix was released (#3866) by @antonpirker
+- Update test matrix for Sanic (#3904) by @antonpirker
+- Rename scripts (#3885) by @sentrivana
+- Fix CI (#3878) by @sentrivana
+- Treat `potel-base` as release branch in CI (#3912) by @sentrivana
+- build(deps): bump actions/create-github-app-token from 1.11.0 to 1.11.1 (#3893) by @dependabot
+- build(deps): bump codecov/codecov-action from 5.0.7 to 5.1.1 (#3867) by @dependabot
+- build(deps): bump codecov/codecov-action from 5.1.1 to 5.1.2 (#3892) by @dependabot
+
 ## 2.19.2
 
 ### Various fixes & improvements
@@ -55,6 +84,14 @@
 
 ### Various fixes & improvements
 
+- **New integration:** Add [LaunchDarkly](https://launchdarkly.com/) integration (#3648) by @cmanallen
+  
+  For more information, see the documentation for the [LaunchDarklyIntegration](https://docs.sentry.io/platforms/python/integrations/launchdarkly/).
+
+- **New integration:** Add [OpenFeature](https://openfeature.dev/) feature flagging integration (#3648) by @cmanallen
+
+  For more information, see the documentation for the [OpenFeatureIntegration](https://docs.sentry.io/platforms/python/integrations/opoenfeature/).
+
 - Add LaunchDarkly and OpenFeature integration (#3648) by @cmanallen
 - Correct typo in a comment (#3726) by @szokeasaurusrex
 - End `http.client` span on timeout (#3723) by @Zylphrex
diff --git a/docs/conf.py b/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.2"
+release = "2.20.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 
diff --git a/sentry_sdk/consts.py b/sentry_sdk/consts.py
@@ -581,4 +581,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.19.2"
+VERSION = "2.20.0"
diff --git a/sentry_sdk/integrations/unleash.py b/sentry_sdk/integrations/unleash.py
@@ -18,7 +18,6 @@ def setup_once():
         # type: () -> None
         # Wrap and patch evaluation methods (instance methods)
         old_is_enabled = UnleashClient.is_enabled
-        old_get_variant = UnleashClient.get_variant
 
         @wraps(old_is_enabled)
         def sentry_is_enabled(self, feature, *args, **kwargs):
@@ -32,19 +31,4 @@ def sentry_is_enabled(self, feature, *args, **kwargs):
 
             return enabled
 
-        @wraps(old_get_variant)
-        def sentry_get_variant(self, feature, *args, **kwargs):
-            # type: (UnleashClient, str, *Any, **Any) -> Any
-            variant = old_get_variant(self, feature, *args, **kwargs)
-            enabled = variant.get("enabled", False)
-
-            # Payloads are not always used as the feature's value for application logic. They
-            # may be used for metrics or debugging context instead. Therefore, we treat every
-            # variant as a boolean toggle, using the `enabled` field.
-            flags = sentry_sdk.get_current_scope().flags
-            flags.set(feature, enabled)
-
-            return variant
-
         UnleashClient.is_enabled = sentry_is_enabled  # type: ignore
-        UnleashClient.get_variant = sentry_get_variant  # type: ignore
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="2.19.2",
+    version="2.20.0",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",
diff --git a/tests/integrations/unleash/test_unleash.py b/tests/integrations/unleash/test_unleash.py
@@ -15,7 +15,7 @@ def test_is_enabled(sentry_init, capture_events, uninstall_integration):
     uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
-        client = UnleashClient()
+        client = UnleashClient()  # type: ignore[arg-type]
         sentry_init(integrations=[UnleashIntegration()])
         client.is_enabled("hello")
         client.is_enabled("world")
@@ -34,41 +34,12 @@ def test_is_enabled(sentry_init, capture_events, uninstall_integration):
     }
 
 
-def test_get_variant(sentry_init, capture_events, uninstall_integration):
-    uninstall_integration(UnleashIntegration.identifier)
-
-    with mock_unleash_client():
-        client = UnleashClient()
-        sentry_init(integrations=[UnleashIntegration()])  # type: ignore
-        client.get_variant("no_payload_feature")
-        client.get_variant("string_feature")
-        client.get_variant("json_feature")
-        client.get_variant("csv_feature")
-        client.get_variant("number_feature")
-        client.get_variant("unknown_feature")
-
-    events = capture_events()
-    sentry_sdk.capture_exception(Exception("something wrong!"))
-
-    assert len(events) == 1
-    assert events[0]["contexts"]["flags"] == {
-        "values": [
-            {"flag": "no_payload_feature", "result": True},
-            {"flag": "string_feature", "result": True},
-            {"flag": "json_feature", "result": True},
-            {"flag": "csv_feature", "result": True},
-            {"flag": "number_feature", "result": True},
-            {"flag": "unknown_feature", "result": False},
-        ]
-    }
-
-
 def test_is_enabled_threaded(sentry_init, capture_events, uninstall_integration):
     uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
-        client = UnleashClient()
-        sentry_init(integrations=[UnleashIntegration()])  # type: ignore
+        client = UnleashClient()  # type: ignore[arg-type]
+        sentry_init(integrations=[UnleashIntegration()])
         events = capture_events()
 
         def task(flag_key):
@@ -112,63 +83,14 @@ def task(flag_key):
     }
 
 
-def test_get_variant_threaded(sentry_init, capture_events, uninstall_integration):
-    uninstall_integration(UnleashIntegration.identifier)
-
-    with mock_unleash_client():
-        client = UnleashClient()
-        sentry_init(integrations=[UnleashIntegration()])  # type: ignore
-        events = capture_events()
-
-        def task(flag_key):
-            # Creates a new isolation scope for the thread.
-            # This means the evaluations in each task are captured separately.
-            with sentry_sdk.isolation_scope():
-                client.get_variant(flag_key)
-                # use a tag to identify to identify events later on
-                sentry_sdk.set_tag("task_id", flag_key)
-                sentry_sdk.capture_exception(Exception("something wrong!"))
-
-        # Capture an eval before we split isolation scopes.
-        client.get_variant("hello")
-
-        with cf.ThreadPoolExecutor(max_workers=2) as pool:
-            pool.map(task, ["no_payload_feature", "other"])
-
-    # Capture error in original scope
-    sentry_sdk.set_tag("task_id", "0")
-    sentry_sdk.capture_exception(Exception("something wrong!"))
-
-    assert len(events) == 3
-    events.sort(key=lambda e: e["tags"]["task_id"])
-
-    assert events[0]["contexts"]["flags"] == {
-        "values": [
-            {"flag": "hello", "result": False},
-        ]
-    }
-    assert events[1]["contexts"]["flags"] == {
-        "values": [
-            {"flag": "hello", "result": False},
-            {"flag": "no_payload_feature", "result": True},
-        ]
-    }
-    assert events[2]["contexts"]["flags"] == {
-        "values": [
-            {"flag": "hello", "result": False},
-            {"flag": "other", "result": False},
-        ]
-    }
-
-
 @pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
 def test_is_enabled_asyncio(sentry_init, capture_events, uninstall_integration):
     asyncio = pytest.importorskip("asyncio")
     uninstall_integration(UnleashIntegration.identifier)
 
     with mock_unleash_client():
-        client = UnleashClient()
-        sentry_init(integrations=[UnleashIntegration()])  # type: ignore
+        client = UnleashClient()  # type: ignore[arg-type]
+        sentry_init(integrations=[UnleashIntegration()])
         events = capture_events()
 
         async def task(flag_key):
@@ -212,66 +134,12 @@ async def runner():
     }
 
 
-@pytest.mark.skipif(sys.version_info < (3, 7), reason="requires python3.7 or higher")
-def test_get_variant_asyncio(sentry_init, capture_events, uninstall_integration):
-    asyncio = pytest.importorskip("asyncio")
-
-    uninstall_integration(UnleashIntegration.identifier)
-
-    with mock_unleash_client():
-        client = UnleashClient()
-        sentry_init(integrations=[UnleashIntegration()])  # type: ignore
-        events = capture_events()
-
-        async def task(flag_key):
-            with sentry_sdk.isolation_scope():
-                client.get_variant(flag_key)
-                # use a tag to identify to identify events later on
-                sentry_sdk.set_tag("task_id", flag_key)
-                sentry_sdk.capture_exception(Exception("something wrong!"))
-
-        async def runner():
-            return asyncio.gather(task("no_payload_feature"), task("other"))
-
-        # Capture an eval before we split isolation scopes.
-        client.get_variant("hello")
-
-        asyncio.run(runner())
-
-    # Capture error in original scope
-    sentry_sdk.set_tag("task_id", "0")
-    sentry_sdk.capture_exception(Exception("something wrong!"))
-
-    assert len(events) == 3
-    events.sort(key=lambda e: e["tags"]["task_id"])
-
-    assert events[0]["contexts"]["flags"] == {
-        "values": [
-            {"flag": "hello", "result": False},
-        ]
-    }
-    assert events[1]["contexts"]["flags"] == {
-        "values": [
-            {"flag": "hello", "result": False},
-            {"flag": "no_payload_feature", "result": True},
-        ]
-    }
-    assert events[2]["contexts"]["flags"] == {
-        "values": [
-            {"flag": "hello", "result": False},
-            {"flag": "other", "result": False},
-        ]
-    }
-
-
 def test_wraps_original(sentry_init, uninstall_integration):
     with mock_unleash_client():
-        client = UnleashClient()
+        client = UnleashClient()  # type: ignore[arg-type]
 
         mock_is_enabled = mock.Mock(return_value=random() < 0.5)
-        mock_get_variant = mock.Mock(return_value={"enabled": random() < 0.5})
         client.is_enabled = mock_is_enabled
-        client.get_variant = mock_get_variant
 
         uninstall_integration(UnleashIntegration.identifier)
         sentry_init(integrations=[UnleashIntegration()])  # type: ignore
@@ -283,26 +151,16 @@ def test_wraps_original(sentry_init, uninstall_integration):
         {"kwarg": 1},
     )
 
-    res = client.get_variant("test-flag", "arg", kwarg=1)
-    assert res == mock_get_variant.return_value
-    assert mock_get_variant.call_args == (
-        ("test-flag", "arg"),
-        {"kwarg": 1},
-    )
-
 
 def test_wrapper_attributes(sentry_init, uninstall_integration):
     with mock_unleash_client():
-        client = UnleashClient()  # <- Returns a MockUnleashClient
+        client = UnleashClient()  # type: ignore[arg-type]
 
         original_is_enabled = client.is_enabled
-        original_get_variant = client.get_variant
 
         uninstall_integration(UnleashIntegration.identifier)
         sentry_init(integrations=[UnleashIntegration()])  # type: ignore
 
         # Mock clients methods have not lost their qualified names after decoration.
         assert client.is_enabled.__name__ == "is_enabled"
         assert client.is_enabled.__qualname__ == original_is_enabled.__qualname__
-        assert client.get_variant.__name__ == "get_variant"
-        assert client.get_variant.__qualname__ == original_get_variant.__qualname__
diff --git a/tests/integrations/unleash/testutils.py b/tests/integrations/unleash/testutils.py
@@ -8,8 +8,8 @@ def mock_unleash_client():
     Temporarily replaces UnleashClient's methods with mock implementations
     for testing.
 
-    This context manager swaps out UnleashClient's __init__, is_enabled,
-    and get_variant methods with mock versions from MockUnleashClient.
+    This context manager swaps out UnleashClient's __init__ and is_enabled,
+    methods with mock versions from MockUnleashClient.
     Original methods are restored when exiting the context.
 
     After mocking the client class the integration can be initialized.
@@ -23,17 +23,14 @@ def mock_unleash_client():
     """
     old_init = UnleashClient.__init__
     old_is_enabled = UnleashClient.is_enabled
-    old_get_variant = UnleashClient.get_variant
 
     UnleashClient.__init__ = MockUnleashClient.__init__
     UnleashClient.is_enabled = MockUnleashClient.is_enabled
-    UnleashClient.get_variant = MockUnleashClient.get_variant
 
     yield
 
     UnleashClient.__init__ = old_init
     UnleashClient.is_enabled = old_is_enabled
-    UnleashClient.get_variant = old_get_variant
 
 
 class MockUnleashClient:
@@ -44,34 +41,5 @@ def __init__(self, *a, **kw):
             "world": False,
         }
 
-        self.feature_to_variant = {
-            "string_feature": {
-                "name": "variant1",
-                "enabled": True,
-                "payload": {"type": "string", "value": "val1"},
-            },
-            "json_feature": {
-                "name": "variant1",
-                "enabled": True,
-                "payload": {"type": "json", "value": '{"key1": 0.53}'},
-            },
-            "number_feature": {
-                "name": "variant1",
-                "enabled": True,
-                "payload": {"type": "number", "value": "134.5"},
-            },
-            "csv_feature": {
-                "name": "variant1",
-                "enabled": True,
-                "payload": {"type": "csv", "value": "abc 123\ncsbq 94"},
-            },
-            "no_payload_feature": {"name": "variant1", "enabled": True},
-        }
-
-        self.disabled_variant = {"name": "disabled", "enabled": False}
-
     def is_enabled(self, feature, *a, **kw):
         return self.features.get(feature, False)
-
-    def get_variant(self, feature, *a, **kw):
-        return self.feature_to_variant.get(feature, self.disabled_variant)

Original file line number	Diff line number	Diff line change
`@@ -581,4 +581,4 @@ def _get_default_options():`
`581`	`581`	`del _get_default_options`
`582`	`582`
`583`	`583`
`584`		`-VERSION = "2.19.2"`
	`584`	`+VERSION = "2.20.0"`