Skip to content

Fix snuba-api healthcheck bypassing proxy for local requests #4441

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.

Sign up for GitHub

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

Open
oddballfr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix snuba-api healthcheck bypassing proxy for local requests #4441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion snuba/api_healthcheck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,17 @@
URL = os.environ.get("SNUBA_API_HEALTHCHECK_URL") or "http://127.0.0.1:1218/health"
TIMEOUT = float(os.environ.get("SNUBA_API_HEALTHCHECK_TIMEOUT") or 2)

# This is a local, in-container request. urllib's NO_PROXY matching doesn't
# support CIDR ranges (e.g. 127.0.0.0/8), only exact hosts/domain suffixes,
# so a NO_PROXY set up for other tools (curl, wget) can still leave this
# request routed through HTTP(S)_PROXY. Force no proxy explicitly instead
# of relying on NO_PROXY parsing.
_NO_PROXY_OPENER = urllib.request.build_opener(urllib.request.ProxyHandler({}))


def main() -> int:
try:
body = urllib.request.urlopen(URL, timeout=TIMEOUT).read().decode()
body = _NO_PROXY_OPENER.open(URL, timeout=TIMEOUT).read().decode()
except urllib.error.HTTPError as exc:
print(f"snuba api returned HTTP {exc.code} from {URL}", file=sys.stderr)
return 1
Expand Down
Loading