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.

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

Jump to bottom

fix: avoid an inessential http call for the api as batch mode #328

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: avoid an inessential http call for the api as batch mode #328

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b35388
fix: avoid an inessential http call for the `api` as batch mode
smehboub Jan 28, 2023
bb4fdc6
Merge branch 'master' into fix/batch-http-call
lvaylet Nov 22, 2023
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
17 changes: 8 additions & 9 deletions slo_generator/api/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
import os
import pprint

import requests
from flask import jsonify, make_response
from flask import Request, jsonify, make_response

from slo_generator.compute import compute, export
from slo_generator.utils import get_exporters, load_config, setup_logging
Expand All @@ -34,6 +33,7 @@
LOGGER = logging.getLogger(__name__)
TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
API_SIGNATURE_TYPE = os.environ["GOOGLE_FUNCTION_SIGNATURE_TYPE"]
BATCH_REQUEST_PARAMETER = "batch"
setup_logging()


Expand All @@ -53,7 +53,7 @@ def run_compute(request):

# Process request
data = process_req(request)
batch_mode = request.args.get("batch", False)
batch_mode = request.args.get(BATCH_REQUEST_PARAMETER, False)
if batch_mode:
if not API_SIGNATURE_TYPE == "http":
raise ValueError(
Expand Down Expand Up @@ -203,11 +203,6 @@ def process_batch_req(request, data, config):
"requests separately."
)
urls = data.split(";")
service_url = request.base_url
headers = {"User-Agent": "slo-generator"}
if "Authorization" in request.headers:
headers["Authorization"] = request.headers["Authorization"]
service_url = service_url.replace("http:", "https:") # force HTTPS auth
for url in urls:
if "pubsub_batch_handler" in config:
LOGGER.info(f"Sending {url} to pubsub batch handler.")
Expand All @@ -228,4 +223,8 @@ def process_batch_req(request, data, config):
client.publish(topic_path, data=data).result()
else: # http
LOGGER.info(f"Sending {url} to HTTP batch handler.")
requests.post(service_url, headers=headers, data=url, timeout=10)
args = request.args.copy()
args[BATCH_REQUEST_PARAMETER] = False
req = Request.from_values(data=url)
req.args = args
run_compute(req)