Skip to content

chore(jira): Add more logs/expose them better #92359

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

Merged
merged 6 commits into from
May 28, 2025
Merged
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
16 changes: 14 additions & 2 deletions src/sentry/integrations/jira/integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

from sentry import features
from sentry.eventstore.models import GroupEvent
from sentry.exceptions import InvalidConfiguration
from sentry.integrations.base import (
FeatureDescription,
IntegrationData,
Expand Down Expand Up @@ -1006,24 +1007,35 @@ def sync_assignee_outbound(
extra={
"integration_id": external_issue.integration_id,
"user_id": user.id,
"user_emails": user.emails,
"issue_key": external_issue.key,
"organization_id": external_issue.organization_id,
},
)
return
if not user.emails:
raise InvalidConfiguration(
{
"email": "User must have a verified email on Sentry to sync assignee in Jira",
"help": "https://sentry.io/settings/account/emails",
}
)
raise InvalidConfiguration({"email": "Unable to find the requested user"})
try:
id_field = client.user_id_field()
client.assign_issue(external_issue.key, jira_user and jira_user.get(id_field))
except (ApiUnauthorized, ApiError):
except ApiError as e:
# TODO(jess): do we want to email people about these types of failures?
logger.info(
"jira.failed-to-assign",
exc_info=e,
extra={
"organization_id": external_issue.organization_id,
"integration_id": external_issue.integration_id,
"user_id": user.id if user else None,
"issue_key": external_issue.key,
},
)
raise

def sync_status_outbound(
self, external_issue: ExternalIssue, is_resolved: bool, project_id: int
Expand Down
7 changes: 4 additions & 3 deletions src/sentry/integrations/tasks/sync_assignee_outbound.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from sentry import analytics, features
from sentry.constants import ObjectStatus
from sentry.exceptions import InvalidConfiguration
from sentry.integrations.errors import OrganizationIntegrationNotFound
from sentry.integrations.models.external_issue import ExternalIssue
from sentry.integrations.models.integration import Integration
Expand All @@ -12,7 +13,7 @@
from sentry.integrations.services.assignment_source import AssignmentSource
from sentry.integrations.services.integration import integration_service
from sentry.models.organization import Organization
from sentry.shared_integrations.exceptions import IntegrationError
from sentry.shared_integrations.exceptions import ApiUnauthorized, IntegrationError
from sentry.silo.base import SiloMode
from sentry.tasks.base import instrumented_task, retry
from sentry.taskworker.config import TaskworkerConfig
Expand Down Expand Up @@ -96,5 +97,5 @@ def sync_assignee_outbound(
id=integration.id,
organization_id=external_issue.organization_id,
)
except OrganizationIntegrationNotFound:
lifecycle.record_halt("organization_integration_not_found")
except (OrganizationIntegrationNotFound, ApiUnauthorized, InvalidConfiguration) as e:
lifecycle.record_halt(halt_reason=e)
4 changes: 3 additions & 1 deletion tests/sentry/integrations/jira/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

from fixtures.integrations.jira.stub_client import StubJiraApiClient
from fixtures.integrations.stub_service import StubService
from sentry.exceptions import InvalidConfiguration
from sentry.integrations.jira.integration import JiraIntegrationProvider
from sentry.integrations.jira.views import SALT
from sentry.integrations.models.external_issue import ExternalIssue
Expand Down Expand Up @@ -824,7 +825,8 @@ def test_sync_assignee_outbound_no_email(self):
"https://example.atlassian.net/rest/api/2/user/assignable/search",
json=[{"accountId": "deadbeef123", "displayName": "Dead Beef"}],
)
installation.sync_assignee_outbound(external_issue, user)
with pytest.raises(InvalidConfiguration):
installation.sync_assignee_outbound(external_issue, user)

# No sync made as jira users don't have email addresses
assert len(responses.calls) == 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@

import pytest

from sentry.integrations.errors import OrganizationIntegrationNotFound
from sentry.integrations.example import ExampleIntegration
from sentry.integrations.models import ExternalIssue, Integration
from sentry.integrations.models.organization_integration import OrganizationIntegration
from sentry.integrations.tasks import sync_assignee_outbound
from sentry.integrations.types import EventLifecycleOutcome
from sentry.testutils.asserts import assert_success_metric
from sentry.testutils.asserts import assert_halt_metric, assert_success_metric
from sentry.testutils.cases import TestCase
from sentry.testutils.silo import assume_test_silo_mode_of
from sentry.users.services.user import RpcUser
Expand Down Expand Up @@ -151,4 +152,6 @@ def test_missing_organization_integration(self, mock_sync_assignee, mock_record_
mock_sync_assignee.assert_not_called()

assert mock_record_event.call_count == 2
assert_success_metric(mock_record_event)
assert_halt_metric(
mock_record_event, OrganizationIntegrationNotFound("missing org_integration")
)
Loading