Skip to content
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

Fix image proxy get error handling #3455

Merged
merged 3 commits into from Dec 5, 2023

Conversation

sarayourfriend
Copy link
Contributor

@sarayourfriend sarayourfriend commented Dec 5, 2023

Fixes

Fixes #3454 by @sarayourfriend

Also fixes #3276 because I really need to stop fixing this every time I spin the app up locally after a week of not running it.

Description

Replaces the error handling code specific to requests exceptions with aiohttp handling. Just something I missed in code and we missed in reviewing #3388.

Testing Instructions

Review the code changes and confirm I've covered the cases. I had to make a change to one of the error keys but I'll explain it in a comment on that line in the PR.

Tests and CI should pass, of course!

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • [N/A] I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@sarayourfriend sarayourfriend requested a review from a team as a code owner December 5, 2023 01:22
@github-actions github-actions bot added 🧱 stack: api Related to the Django API 🧱 stack: catalog Related to the catalog and Airflow DAGs 🧱 stack: ingestion server Related to the ingestion/data refresh server labels Dec 5, 2023
@openverse-bot openverse-bot added 🟨 priority: medium Not blocking but should be addressed soon 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository labels Dec 5, 2023
tallies_incr(
f"thumbnail_http_error:{domain}:{month}:{code}:{exc.response.text}"
)
tallies_incr(f"thumbnail_http_error:{domain}:{month}:{status}")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The response text is ambiguous from aiohttp (I wasn't entirely sure what it was and whether it matched wherever requests as using). I removed it because I figure we really care more about the status code, and if we need specific details about the error itself, we can look at the logs for the exc.message or review the captured exception in sentry (if relevant).

@@ -33,9 +33,9 @@ def test_health_check_calls__check_db(api_client):

def test_health_check_es_timed_out(api_client):
mock_health_response(timed_out=True)
pook.on()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and the other changes in this test module are cleanup. Using pook.on and pook.off like this means that if api_client.get results in an exception (which is a test failure), then pook would never get turned off. It's exactly what a context manager is for anyway.

@@ -21,7 +21,7 @@ x-airflow-common: &airflow-common
- CATALOG_PY_VERSION
- CATALOG_AIRFLOW_VERSION
volumes:
- ./catalog:/opt/airflow/catalog
- ./catalog:/opt/airflow/catalog:z
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These changes are for #3276

@sarayourfriend sarayourfriend removed 🧱 stack: ingestion server Related to the ingestion/data refresh server 🧱 stack: catalog Related to the catalog and Airflow DAGs labels Dec 5, 2023
@sarayourfriend sarayourfriend changed the title Fix/image proxy get error handling Fix image proxy get error handling Dec 5, 2023
@sarayourfriend sarayourfriend force-pushed the fix/image-proxy-get-error-handling branch from 03e1839 to 8267170 Compare December 5, 2023 06:17
Copy link
Contributor

@obulat obulat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes work well. Nice cleaning up of the code and tests!

Copy link
Contributor

@stacimc stacimc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@sarayourfriend sarayourfriend merged commit 9b90382 into main Dec 5, 2023
46 checks passed
@sarayourfriend sarayourfriend deleted the fix/image-proxy-get-error-handling branch December 5, 2023 20:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟨 priority: medium Not blocking but should be addressed soon 🧱 stack: api Related to the Django API
Projects
Archived in project
4 participants