Skip to content

fix(seer): Keep service account actors when resolving Seer viewer context #128718

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.

Sign up for GitHub

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

Open
gricha wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(seer): Keep service account actors when resolving Seer viewer context #128718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/sentry/seer/signed_seer_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,9 @@ def _resolve_viewer_context(
org_id = explicit_org_id

if explicit_user_id is not None:
if user_id is not None and user_id != explicit_user_id:
# A service account is its own principal; never re-attribute it to a human.
is_service_account = actor.type == ActorType.SERVICE_ACCOUNT
if (user_id is not None or is_service_account) and user_id != explicit_user_id:
logger.warning(
"seer.viewer_context_mismatch",
extra={
Expand All @@ -132,7 +134,7 @@ def _resolve_viewer_context(
actor = replace(actor, actor_id=explicit_user_id)
elif actor.type == ActorType.AGENT:
actor = replace(actor, delegated_user_id=explicit_user_id)
else:
elif not is_service_account:
actor = Actor(type=ActorType.USER, actor_id=explicit_user_id)

metrics.incr(
Expand Down
22 changes: 22 additions & 0 deletions tests/sentry/seer/test_signed_seer_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,28 @@ def test_agent_mismatch_warns_and_keeps_agent(self, mock_logger: MagicMock) -> N
"user_id",
}

@patch("sentry.seer.signed_seer_api.logger")
def test_service_account_is_not_reattributed_to_user(self, mock_logger: MagicMock) -> None:
ctx = ViewerContext(
actor=Actor(
type=ActorType.SERVICE_ACCOUNT,
actor_id=5,
superuser=SuperuserAccess(expires_at=1234567890),
),
organization_id=42,
project_id=3,
)
with viewer_context_scope(ctx):
result = _resolve_viewer_context(SeerViewerContext(organization_id=42, user_id=99))

assert isinstance(result, ViewerContext)
assert result.actor.type == ActorType.SERVICE_ACCOUNT
assert result.actor.actor_id == 5
assert result.actor.superuser is None
assert result.project_id is None
mock_logger.warning.assert_called_once()
assert mock_logger.warning.call_args[1]["extra"]["field"] == "user_id"

@patch("sentry.seer.signed_seer_api.metrics")
def test_match_emits_metric_with_project_id(self, mock_metrics: MagicMock) -> None:
ctx = ViewerContext(
Expand Down
Loading