From 92e68266b849825610e7217cf982e9c2cc832d0f Mon Sep 17 00:00:00 2001 From: Colton Allen Date: Tue, 13 Oct 2026 08:58:35 -0500 Subject: [PATCH 1/4] Set retries for base integration client to 0 --- src/sentry/net/http.py | 2 +- src/sentry/shared_integrations/client/base.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sentry/net/http.py b/src/sentry/net/http.py index 0eabc82121b2..074c12cd2cb0 100644 --- a/src/sentry/net/http.py +++ b/src/sentry/net/http.py @@ -216,7 +216,7 @@ class SafeSession(Session): def __init__( self, is_ipaddress_permitted: IsIpAddressPermitted = None, - max_retries: Retry | None = None, + max_retries: Retry | int | None = None, ) -> None: Session.__init__(self) self.headers.update({"User-Agent": USER_AGENT}) diff --git a/src/sentry/shared_integrations/client/base.py b/src/sentry/shared_integrations/client/base.py index 13f0f6944a57..26171bebc710 100644 --- a/src/sentry/shared_integrations/client/base.py +++ b/src/sentry/shared_integrations/client/base.py @@ -186,7 +186,7 @@ def build_session(self) -> SafeSession: """ Generates a safe Requests session for the API client to use. """ - return build_session() + return build_session(max_retries=0) @staticmethod def _normalize_cert_setting(cert_setting: object) -> str | tuple[str, str] | None: From 85aec8db7793d88eff2429df29769023dd5fe912 Mon Sep 17 00:00:00 2001 From: Colton Allen Date: Tue, 13 Oct 2026 09:39:23 -0500 Subject: [PATCH 2/4] Option gate max_retries --- src/sentry/options/defaults.py | 7 +++++++ src/sentry/shared_integrations/client/base.py | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/sentry/options/defaults.py b/src/sentry/options/defaults.py index 889eab3225f5..d61d3c5180cf 100644 --- a/src/sentry/options/defaults.py +++ b/src/sentry/options/defaults.py @@ -4665,3 +4665,10 @@ default=30, flags=FLAG_AUTOMATOR_MODIFIABLE, ) + +register( + "integrations.client.disable_retries", + default=False, + type=Bool, + flags=FLAG_AUTOMATOR_MODIFIABLE, +) diff --git a/src/sentry/shared_integrations/client/base.py b/src/sentry/shared_integrations/client/base.py index 26171bebc710..6fc1ca1f33de 100644 --- a/src/sentry/shared_integrations/client/base.py +++ b/src/sentry/shared_integrations/client/base.py @@ -11,6 +11,7 @@ from requests.adapters import RetryError from requests.exceptions import ConnectionError, HTTPError, Timeout +from sentry import options from sentry.exceptions import RestrictedIPAddress from sentry.http import build_session from sentry.net.http import SafeSession @@ -186,7 +187,8 @@ def build_session(self) -> SafeSession: """ Generates a safe Requests session for the API client to use. """ - return build_session(max_retries=0) + max_retries = 0 if options.get("integrations.client.disable_retries") else None + return build_session(max_retries=max_retries) @staticmethod def _normalize_cert_setting(cert_setting: object) -> str | tuple[str, str] | None: From 57606ed210eceef4b5fb57e33f6155b87baab36a Mon Sep 17 00:00:00 2001 From: Colton Allen Date: Tue, 13 Oct 2026 12:42:04 -0500 Subject: [PATCH 3/4] Fix tests --- tests/sentry/integrations/test_client.py | 4 ++++ tests/sentry/shared_integrations/client/test_base.py | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/tests/sentry/integrations/test_client.py b/tests/sentry/integrations/test_client.py index ace12e57a141..97fa8baf4e70 100644 --- a/tests/sentry/integrations/test_client.py +++ b/tests/sentry/integrations/test_client.py @@ -18,9 +18,13 @@ ApiTimeoutError, ) from sentry.shared_integrations.response.base import BaseApiResponse +from sentry.testutils.helpers.options import override_options class ApiClientTest(TestCase): + def setUp(self) -> None: + self.enterContext(override_options({"integrations.client.disable_retries": False})) + @responses.activate def test_get(self) -> None: responses.add(responses.GET, "http://example.com", json={}) diff --git a/tests/sentry/shared_integrations/client/test_base.py b/tests/sentry/shared_integrations/client/test_base.py index 33a633d92665..a85074372258 100644 --- a/tests/sentry/shared_integrations/client/test_base.py +++ b/tests/sentry/shared_integrations/client/test_base.py @@ -25,6 +25,12 @@ class Client(BaseApiClient): self.api_client = Client() + def test_build_session_disables_retries(self) -> None: + with self.options({"integrations.client.disable_retries": True}): + session = self.api_client.build_session() + + assert session.get_adapter("https://").max_retries.total == 0 + @responses.activate @patch.object(BaseApiClient, "finalize_request", side_effect=lambda req: req) def test_finalize_request(self, mock_finalize_request) -> None: From f738e6e3cb7c5721e5eb075dc2ba14284b907c69 Mon Sep 17 00:00:00 2001 From: Colton Allen Date: Tue, 13 Oct 2026 12:53:32 -0500 Subject: [PATCH 4/4] Remove unnecessary test --- tests/sentry/shared_integrations/client/test_base.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/sentry/shared_integrations/client/test_base.py b/tests/sentry/shared_integrations/client/test_base.py index a85074372258..33a633d92665 100644 --- a/tests/sentry/shared_integrations/client/test_base.py +++ b/tests/sentry/shared_integrations/client/test_base.py @@ -25,12 +25,6 @@ class Client(BaseApiClient): self.api_client = Client() - def test_build_session_disables_retries(self) -> None: - with self.options({"integrations.client.disable_retries": True}): - session = self.api_client.build_session() - - assert session.get_adapter("https://").max_retries.total == 0 - @responses.activate @patch.object(BaseApiClient, "finalize_request", side_effect=lambda req: req) def test_finalize_request(self, mock_finalize_request) -> None: