Skip to content

Commit da0f91c

Browse files
committed
feat: tweak http response error handling
1 parent f4ab95c commit da0f91c

7 files changed

Lines changed: 30 additions & 38 deletions

File tree

  • sql/moz-fx-data-shared-prod/google_play_store_derived

sql/moz-fx-data-shared-prod/google_play_store_derived/slow_startup_events_by_startup_type_and_version_v1/query.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,10 @@ def get_slow_start_rates_by_app_and_date_and_version(
8484

8585
try:
8686
response.raise_for_status()
87-
except requests.exceptions.HTTPError:
88-
error_message = f"Request to: {response.url} failed with the following error: {response.json()}"
89-
print(error_message)
90-
91-
raise requests.exceptions.HTTPError(error_message) from None
87+
except requests.exceptions.HTTPError as err:
88+
raise requests.exceptions.HTTPError(
89+
f"Request to: {response.url} failed with status {response.status_code}: {response.text}"
90+
) from err
9291

9392
return response.json()
9493

sql/moz-fx-data-shared-prod/google_play_store_derived/slow_startup_events_by_startup_type_v1/query.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,10 @@ def get_slow_start_rates_by_app_and_date(
8383

8484
try:
8585
response.raise_for_status()
86-
except requests.exceptions.HTTPError:
87-
error_message = f"Request to: {response.url} failed with the following error: {response.json()}"
88-
print(error_message)
89-
90-
raise requests.exceptions.HTTPError(error_message) from None
86+
except requests.exceptions.HTTPError as err:
87+
raise requests.exceptions.HTTPError(
88+
f"Request to: {response.url} failed with status {response.status_code}: {response.text}"
89+
) from err
9190

9291
return response.json()
9392

sql/moz-fx-data-shared-prod/google_play_store_derived/slow_startup_events_by_startup_type_version_and_device_v1/query.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def create_request_payload_using_logical_dag_date(date_to_pull_data_for):
3535
date_to_pull_data_for_month = date_to_pull_data_for.month
3636
date_to_pull_data_for_day = date_to_pull_data_for.day
3737

38-
end_date = date_to_pull_data_for
38+
end_date = date_to_pull_data_for + timedelta(days=1)
3939

4040
day_after_date_to_pull_data_for_yr = end_date.year
4141
day_after_date_to_pull_data_for_month = end_date.month
@@ -89,11 +89,10 @@ def get_slow_start_rates_by_app_and_date(
8989

9090
try:
9191
response.raise_for_status()
92-
except requests.exceptions.HTTPError:
93-
error_message = f"Request to: {response.url} failed with the following error: {response.json()}"
94-
print(error_message)
95-
96-
raise requests.exceptions.HTTPError(error_message) from None
92+
except requests.exceptions.HTTPError as err:
93+
raise requests.exceptions.HTTPError(
94+
f"Request to: {response.url} failed with status {response.status_code}: {response.text}"
95+
) from err
9796

9897
return response.json()
9998

@@ -112,8 +111,7 @@ def main():
112111
logical_dag_date_string = logical_dag_date.strftime("%Y-%m-%d")
113112
print("logical_dag_date_string: ", logical_dag_date_string)
114113

115-
# Get 2 days prior - we always will pull data for the previous day
116-
data_pull_date = logical_dag_date - timedelta(days=1)
114+
data_pull_date = logical_dag_date
117115
data_pull_date_string = data_pull_date.strftime("%Y-%m-%d")
118116
print("data_pull_date")
119117
print(data_pull_date)

sql/moz-fx-data-shared-prod/google_play_store_derived/vitals_anr_rate_v1/query.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,10 @@ def fetch_data(
157157

158158
try:
159159
response.raise_for_status()
160-
except requests.exceptions.HTTPError:
161-
error_message = f"Request to: {response.url} failed with the following error: {response.json()}"
162-
print(error_message)
163-
164-
raise requests.exceptions.HTTPError(error_message) from None
160+
except requests.exceptions.HTTPError as err:
161+
raise requests.exceptions.HTTPError(
162+
f"Request to: {response.url} failed with status {response.status_code}: {response.text}"
163+
) from err
165164

166165
return response.json()
167166

sql/moz-fx-data-shared-prod/google_play_store_derived/vitals_crash_rate_v1/query.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,10 @@ def fetch_data(
156156

157157
try:
158158
response.raise_for_status()
159-
except requests.exceptions.HTTPError:
160-
error_message = f"Request to: {response.url} failed with the following error: {response.json()}"
161-
print(error_message)
162-
163-
raise requests.exceptions.HTTPError(error_message) from None
159+
except requests.exceptions.HTTPError as err:
160+
raise requests.exceptions.HTTPError(
161+
f"Request to: {response.url} failed with status {response.status_code}: {response.text}"
162+
) from err
164163

165164
return response.json()
166165

sql/moz-fx-data-shared-prod/google_play_store_derived/vitals_error_count_v1/query.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,10 @@ def fetch_data(
144144

145145
try:
146146
response.raise_for_status()
147-
except requests.exceptions.HTTPError:
148-
error_message = f"Request to: {response.url} failed with the following error: {response.json()}"
149-
print(error_message)
150-
151-
raise requests.exceptions.HTTPError(error_message) from None
147+
except requests.exceptions.HTTPError as err:
148+
raise requests.exceptions.HTTPError(
149+
f"Request to: {response.url} failed with status {response.status_code}: {response.text}"
150+
) from err
152151

153152
return response.json()
154153

sql/moz-fx-data-shared-prod/google_play_store_derived/vitals_lmk_rate_v1/query.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,10 @@ def fetch_data(
155155

156156
try:
157157
response.raise_for_status()
158-
except requests.exceptions.HTTPError:
159-
error_message = f"Request to: {response.url} failed with the following error: {response.json()}"
160-
print(error_message)
161-
162-
raise requests.exceptions.HTTPError(error_message) from None
158+
except requests.exceptions.HTTPError as err:
159+
raise requests.exceptions.HTTPError(
160+
f"Request to: {response.url} failed with status {response.status_code}: {response.text}"
161+
) from err
163162

164163
return response.json()
165164

0 commit comments

Comments
 (0)