Merge branch 'master' into live

This commit is contained in:
Kevin Morris 2022-03-08 18:35:26 -08:00
commit 87b94ce01f
No known key found for this signature in database
GPG key ID: F7E46DED420788F3

View file

@ -70,9 +70,17 @@ def http_requests_total() -> Callable[[Info], None]:
if not (scope.get("endpoint", None) and scope.get("router", None)):
return None
root_path = scope.get("root_path", "")
app = scope.get("app", {})
if hasattr(app, "root_path"):
app_root_path = getattr(app, "root_path")
if root_path.startswith(app_root_path):
root_path = root_path[len(app_root_path):]
base_scope = {
"type": scope.get("type"),
"path": scope.get("root_path", "") + scope.get("path"),
"path": root_path + scope.get("path"),
"path_params": scope.get("path_params", {}),
"method": scope.get("method")
}