From 26698a135fa0fdf1716864a617fbbfe37b250f96 Mon Sep 17 00:00:00 2001 From: Betty Da Date: Tue, 2 Nov 2021 19:22:13 -0400 Subject: [PATCH 1/2] fix(appstore-connect): Relax timeout for build fetching --- src/sentry/utils/appleconnect/appstore_connect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sentry/utils/appleconnect/appstore_connect.py b/src/sentry/utils/appleconnect/appstore_connect.py index 35c479aca1c42a..0220e1bc55c064 100644 --- a/src/sentry/utils/appleconnect/appstore_connect.py +++ b/src/sentry/utils/appleconnect/appstore_connect.py @@ -138,7 +138,7 @@ def _get_appstore_json( full_url += url logger.debug(f"GET {full_url}") with sentry_sdk.start_span(op="http", description="AppStoreConnect request"): - response = session.get(full_url, headers=headers, timeout=REQUEST_TIMEOUT) + response = session.get(full_url, headers=headers, timeout=REQUEST_TIMEOUT * 2) if not response.ok: err_info = { "url": full_url, From 591a150d068c82f8c212da2ed8c30db9da279762 Mon Sep 17 00:00:00 2001 From: Betty Da Date: Wed, 3 Nov 2021 17:09:55 -0400 Subject: [PATCH 2/2] address feedback --- src/sentry/utils/appleconnect/appstore_connect.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sentry/utils/appleconnect/appstore_connect.py b/src/sentry/utils/appleconnect/appstore_connect.py index 0220e1bc55c064..1ade65ed1566b4 100644 --- a/src/sentry/utils/appleconnect/appstore_connect.py +++ b/src/sentry/utils/appleconnect/appstore_connect.py @@ -20,7 +20,7 @@ AppConnectCredentials = namedtuple("AppConnectCredentials", ["key_id", "key", "issuer_id"]) -REQUEST_TIMEOUT = 15.0 +REQUEST_TIMEOUT = 30.0 class RequestError(Exception): @@ -137,8 +137,8 @@ def _get_appstore_json( full_url = "" full_url += url logger.debug(f"GET {full_url}") - with sentry_sdk.start_span(op="http", description="AppStoreConnect request"): - response = session.get(full_url, headers=headers, timeout=REQUEST_TIMEOUT * 2) + with sentry_sdk.start_transaction(op="http", description="AppStoreConnect request"): + response = session.get(full_url, headers=headers, timeout=REQUEST_TIMEOUT) if not response.ok: err_info = { "url": full_url,