Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add feature flag tracking #3503

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sentry_sdk/_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ class SDKInfo(TypedDict):
tuple[None, None, None],
]

Flag = TypedDict("Flag", {"flag": str, "result": bool})
Flags = list[Flag]

Hint = Dict[str, Any]

Breadcrumb = Dict[str, Any]
Expand Down
6 changes: 6 additions & 0 deletions sentry_sdk/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,12 @@ def set_extra(key, value):
return get_isolation_scope().set_extra(key, value)


@scopemethod
def set_flag(flag, result):
# type: (str, bool) -> None
return get_isolation_scope().set_flag(flag, result)


@scopemethod
def set_user(value):
# type: (Optional[Dict[str, Any]]) -> None
Expand Down
3 changes: 3 additions & 0 deletions sentry_sdk/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,9 @@ def _prepare_event(
"event_processor", data_category="span", quantity=spans_delta
)

# TODO: Where should I put this?
event["contexts"]["flags"] = scope._flag_manager.serialize()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@antonpirker Could you help me fill in the gaps here? Where should this live? Also are scopes nested? Would it be possible to merge the flags from a global scope and a thread scope here?


if (
self.options["attach_stacktrace"]
and "exception" not in event
Expand Down
55 changes: 55 additions & 0 deletions sentry_sdk/flag.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
from typing import TYPE_CHECKING
from sentry_sdk._lru_cache import LRUCache, KEY, NEXT, VALUE


if TYPE_CHECKING:
from sentry_sdk._types import Flag as FType, Flags


class Flag:

__slots__ = ("name", "result")

def __init__(self, name, result):
# type: (str, bool) -> None
self.result = result
self.name = name

@property
def as_dict(self):
# type: () -> FType
return {
"flag": self.name,
"result": self.result,
}


class FlagManager:

def __init__(self, capacity):
# type: (int) -> None
self._cache = LRUCache(max_size=capacity)

def add(self, name, result):
# type: (str, bool) -> None
# NOTE: Should we log null names?
if name is not None:
self._cache.set(name, Flag(name, result))

def serialize(self):
# type: () -> Flags
"""Serialize flags.

Flags are serialized in order of first-evaluation.
"""

def iter_flags():
# This only works if you know the root node is the only
# item with a null key. The list is circularly linked so we
# need a termination condition.
node = self._cache.root[NEXT]
while node[KEY] is not None:
yield node[VALUE].as_dict
node = node[NEXT]

return [f for f in iter_flags()]
7 changes: 7 additions & 0 deletions sentry_sdk/scope.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from sentry_sdk.attachments import Attachment
from sentry_sdk.consts import DEFAULT_MAX_BREADCRUMBS, FALSE_VALUES, INSTRUMENTER
from sentry_sdk.flag import FlagManager
from sentry_sdk.profiler.continuous_profiler import try_autostart_continuous_profiler
from sentry_sdk.profiler.transaction_profiler import Profile
from sentry_sdk.session import Session
Expand Down Expand Up @@ -190,6 +191,7 @@ class Scope:
"client",
"_type",
"_last_event_id",
"_flag_manager",
)

def __init__(self, ty=None, client=None):
Expand All @@ -198,6 +200,7 @@ def __init__(self, ty=None, client=None):

self._event_processors = [] # type: List[EventProcessor]
self._error_processors = [] # type: List[ErrorProcessor]
self._flag_manager = FlagManager(capacity=50)

self._name = None # type: Optional[str]
self._propagation_context = None # type: Optional[PropagationContext]
Expand Down Expand Up @@ -786,6 +789,10 @@ def set_user(self, value):
if session is not None:
session.update(user=value)

def set_flag(self, flag, result):
# type: (str, bool) -> None
self._flag_manager.add(flag, result)

@property
def span(self):
# type: () -> Optional[Span]
Expand Down
30 changes: 30 additions & 0 deletions tests/test_flag.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
from sentry_sdk.flag import Flag, FlagManager


def test_serializing_flag():
flag = Flag("k", True)
assert flag.as_dict == {"flag": "k", "result": True}


def test_flag_manager():
manager = FlagManager(capacity=2)

# Partially filled buffer serializes in the correct order.
manager.add("a", True)
flags = manager.serialize()
assert flags == [{"flag": "a", "result": True}]

# Filled buffer serializes in the correct order.
manager.add("b", False)
flags = manager.serialize()
assert flags == [{"flag": "a", "result": True}, {"flag": "b", "result": False}]

# Over-filled buffer serializes in the correct order.
manager.add("c", True)
flags = manager.serialize()
assert flags == [{"flag": "b", "result": False}, {"flag": "c", "result": True}]

# Twice-filled buffer serializes in the correct order.
manager.add("d", True)
flags = manager.serialize()
assert flags == [{"flag": "c", "result": True}, {"flag": "d", "result": True}]
Loading