Skip to content
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
18 changes: 9 additions & 9 deletions src/sentry/seer/similarity/grouping_records.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@
from typing import TypedDict

from django.conf import settings
from urllib3.exceptions import ReadTimeoutError
from urllib3.exceptions import MaxRetryError, ReadTimeoutError, TimeoutError

from sentry import options
from sentry.conf.server import (
SEER_HASH_GROUPING_RECORDS_DELETE_URL,
SEER_PROJECT_GROUPING_RECORDS_DELETE_URL,
)
from sentry.net.http import connection_from_url
from sentry.seer.signed_seer_api import make_signed_seer_api_request
from sentry.utils import json, metrics

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -75,24 +76,23 @@ def call_seer_to_delete_project_grouping_records(
def call_seer_to_delete_these_hashes(project_id: int, hashes: Sequence[str]) -> bool:
extra = {"project_id": project_id, "hashes": hashes}
try:
body = {"project_id": project_id, "hash_list": hashes}
response = seer_grouping_connection_pool.urlopen(
"POST",
body = json.dumps({"project_id": project_id, "hash_list": hashes}).encode("utf-8")
response = make_signed_seer_api_request(
seer_grouping_connection_pool,
SEER_HASH_GROUPING_RECORDS_DELETE_URL,
body=json.dumps(body),
headers={"Content-Type": "application/json;charset=utf-8"},
body=body,
timeout=POST_BULK_GROUPING_RECORDS_TIMEOUT,
)
except ReadTimeoutError:
extra.update({"reason": "ReadTimeoutError", "timeout": POST_BULK_GROUPING_RECORDS_TIMEOUT})
except (TimeoutError, MaxRetryError) as e:
extra.update({"reason": type(e).__name__, "timeout": POST_BULK_GROUPING_RECORDS_TIMEOUT})
logger.exception(
"seer.delete_grouping_records.hashes.timeout",
extra=extra,
)
metrics.incr(
DELETE_HASH_METRIC,
sample_rate=options.get("seer.similarity.metrics_sample_rate"),
tags={"success": False, "reason": "ReadTimeoutError"},
tags={"success": False, "reason": type(e).__name__},
)
return False

Expand Down
6 changes: 3 additions & 3 deletions tests/sentry/seer/similarity/test_grouping_records.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

@django_db_all
@mock.patch("sentry.seer.similarity.grouping_records.logger")
@mock.patch("sentry.seer.similarity.grouping_records.seer_grouping_connection_pool.urlopen")
@mock.patch("sentry.seer.similarity.grouping_records.make_signed_seer_api_request")
def test_delete_grouping_records_by_hash_success(
mock_seer_request: MagicMock, mock_logger: MagicMock
):
Expand All @@ -40,7 +40,7 @@ def test_delete_grouping_records_by_hash_success(

@django_db_all
@mock.patch("sentry.seer.similarity.grouping_records.logger")
@mock.patch("sentry.seer.similarity.grouping_records.seer_grouping_connection_pool.urlopen")
@mock.patch("sentry.seer.similarity.grouping_records.make_signed_seer_api_request")
def test_delete_grouping_records_by_hash_timeout(
mock_seer_request: MagicMock, mock_logger: MagicMock
):
Expand All @@ -63,7 +63,7 @@ def test_delete_grouping_records_by_hash_timeout(

@django_db_all
@mock.patch("sentry.seer.similarity.grouping_records.logger")
@mock.patch("sentry.seer.similarity.grouping_records.seer_grouping_connection_pool.urlopen")
@mock.patch("sentry.seer.similarity.grouping_records.make_signed_seer_api_request")
def test_delete_grouping_records_by_hash_failure(
mock_seer_request: MagicMock, mock_logger: MagicMock
):
Expand Down
Loading