Abstract into the add_feature_flag function

Author: cmanallen

sentry_sdk/feature_flags.py

@@ -66,3 +66,7 @@ def add_feature_flag(flag, result):
     """
     flags = sentry_sdk.get_current_scope().flags
     flags.set(flag, result)
+
+    span = sentry_sdk.get_current_span()
+    if span:
+        span.set_data(f"flag.evaluation.{flag}", result)

sentry_sdk/integrations/launchdarkly.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
-import sentry_sdk
 
+from sentry_sdk.feature_flags import add_feature_flag
 from sentry_sdk.integrations import DidNotEnable, Integration
 
 try:
@@ -53,14 +53,7 @@ def metadata(self):
     def after_evaluation(self, series_context, data, detail):
         # type: (EvaluationSeriesContext, dict[Any, Any], EvaluationDetail) -> dict[Any, Any]
         if isinstance(detail.value, bool):
-            # Errors support.
-            flags = sentry_sdk.get_current_scope().flags
-            flags.set(series_context.key, detail.value)
-
-            # Spans support.
-            span = sentry_sdk.get_current_span()
-            if span:
-                span.set_data(f"flag.evaluation.{series_context.key}", detail.value)
+            add_feature_flag(series_context.key, detail.value)
 
         return data
 

sentry_sdk/integrations/openfeature.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
-import sentry_sdk
 
+from sentry_sdk.feature_flags import add_feature_flag
 from sentry_sdk.integrations import DidNotEnable, Integration
 
 try:
@@ -29,26 +29,9 @@ class OpenFeatureHook(Hook):
     def after(self, hook_context, details, hints):
         # type: (HookContext, FlagEvaluationDetails[bool], HookHints) -> None
         if isinstance(details.value, bool):
-            # Errors support.
-            flags = sentry_sdk.get_current_scope().flags
-            flags.set(details.flag_key, details.value)
-
-            # Spans support.
-            span = sentry_sdk.get_current_span()
-            if span:
-                span.set_data(f"flag.evaluation.{details.flag_key}", details.value)
+            add_feature_flag(details.flag_key, details.value)
 
     def error(self, hook_context, exception, hints):
         # type: (HookContext, Exception, HookHints) -> None
         if isinstance(hook_context.default_value, bool):
-            # Errors support.
-            flags = sentry_sdk.get_current_scope().flags
-            flags.set(hook_context.flag_key, hook_context.default_value)
-
-            # Spans support.
-            span = sentry_sdk.get_current_span()
-            if span:
-                span.set_data(
-                    f"flag.evaluation.{hook_context.flag_key}",
-                    hook_context.default_value,
-                )
+            add_feature_flag(hook_context.flag_key, hook_context.default_value)

sentry_sdk/integrations/statsig.py

@@ -1,7 +1,6 @@
 from functools import wraps
 from typing import Any, TYPE_CHECKING
 
-import sentry_sdk
 from sentry_sdk.feature_flags import add_feature_flag
 from sentry_sdk.integrations import Integration, DidNotEnable, _check_minimum_version
 from sentry_sdk.utils import parse_version
@@ -31,15 +30,8 @@ def setup_once():
         @wraps(old_check_gate)
         def sentry_check_gate(user, gate, *args, **kwargs):
             # type: (StatsigUser, str, *Any, **Any) -> Any
-            # Errors support.
             enabled = old_check_gate(user, gate, *args, **kwargs)
             add_feature_flag(gate, enabled)
-
-            # Spans support.
-            span = sentry_sdk.get_current_span()
-            if span:
-                span.set_data(f"flag.evaluation.{gate}", enabled)
-
             return enabled
 
         statsig_module.check_gate = sentry_check_gate

sentry_sdk/integrations/unleash.py

@@ -1,7 +1,7 @@
 from functools import wraps
 from typing import Any
 
-import sentry_sdk
+from sentry_sdk.feature_flags import add_feature_flag
 from sentry_sdk.integrations import Integration, DidNotEnable
 
 try:
@@ -24,17 +24,9 @@ def sentry_is_enabled(self, feature, *args, **kwargs):
             # type: (UnleashClient, str, *Any, **Any) -> Any
             enabled = old_is_enabled(self, feature, *args, **kwargs)
 
-            # Errors support.
-            #
             # We have no way of knowing what type of unleash feature this is, so we have to treat
             # it as a boolean / toggle feature.
-            flags = sentry_sdk.get_current_scope().flags
-            flags.set(feature, enabled)
-
-            # Spans support.
-            span = sentry_sdk.get_current_span()
-            if span:
-                span.set_data(f"flag.evaluation.{feature}", enabled)
+            add_feature_flag(feature, enabled)
 
             return enabled