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

[backport -> release/3.6.x] fix(request-debugging): add missing router section of the timing output #12649

Merged
merged 1 commit into from
Feb 29, 2024

Conversation

team-gateway-bot
Copy link
Collaborator

Automated backport to release/3.6.x, triggered by a label in #12234.

Original description

## Blocked by #12580

Summary

We have already added calls of the hook to measure the time consumed by the router.

kong/kong/runloop/handler.lua

Lines 1152 to 1162 in f7e6eee

if has_timing then
req_dyn_hook_run_hooks(ctx, "timing", "before:router")
end
-- routing request
local router = get_updated_router()
local match_t = router:exec(ctx)
if has_timing then
req_dyn_hook_run_hooks(ctx, "timing", "after:router")
end

But forgot to setup the hook function, this PR setups the hook function for the router.

And also fix some tests that might cause flakiness.

Checklist

Issue reference

KAG-3438

@team-gateway-bot team-gateway-bot added cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee size/S labels Feb 27, 2024
@ADD-SP ADD-SP marked this pull request as draft February 27, 2024 05:48
@ADD-SP ADD-SP marked this pull request as ready for review February 27, 2024 06:08
@ADD-SP ADD-SP requested a review from bungle February 28, 2024 01:18
@ADD-SP ADD-SP merged commit 46af830 into release/3.6.x Feb 29, 2024
34 checks passed
@ADD-SP ADD-SP deleted the backport-12234-to-release/3.6.x branch February 29, 2024 01:25
@team-gateway-bot
Copy link
Collaborator Author

Cherry-pick failed for release/3.6.x: couldn't find remote ref release/3.6.x.
Please ensure that this Github repo has a branch named release/3.6.x.

@team-gateway-bot
Copy link
Collaborator Author

Cherry-pick failed for release/3.6.x, because it was unable to create a new branch.

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream release/3.6.x
git worktree add -d .worktree/cherry-pick-12649-to-release/3.6.x-to-upstream upstream/release/3.6.x
cd .worktree/cherry-pick-12649-to-release/3.6.x-to-upstream
git checkout -b cherry-pick-12649-to-release/3.6.x-to-upstream
ancref=$(git merge-base 9005436af615fd519c89eb404fec46c1799b1596 9bc2faa1ffea93f97459f277fa33626c0c5d9010)
git cherry-pick -x $ancref..9bc2faa1ffea93f97459f277fa33626c0c5d9010

@ADD-SP ADD-SP removed the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Feb 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants