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

[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
Merged

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

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions changelog/unreleased/kong/fix-missing-router-section-of-request-debugging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
message: Fix the missing router section for the output of the request-debugging
type: bugfix
scope: Core
8 changes: 8 additions & 0 deletions kong/timing/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,14 @@ function _M.register_hooks()
_M.leave_context() -- leave plugin_id
_M.leave_context() -- leave plugin_name
end)

req_dyn_hook.hook("timing", "before:router", function()
_M.enter_context("router")
end)

req_dyn_hook.hook("timing", "after:router", function()
_M.leave_context() -- leave router
end)
end


Expand Down
4 changes: 4 additions & 0 deletions spec/02-integration/21-request-debug/01-request-debug_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,13 +535,15 @@ describe(desc, function()
assert.truthy(header_output.child.rewrite)
assert.truthy(header_output.child.access)
assert.truthy(header_output.child.access.child.dns) -- upstream is resolved in access phase
assert.truthy(header_output.child.access.child.router) -- router is executed in access phase
assert(header_output.child.access.child.dns.child.localhost.child.resolve.cache_hit ~= nil, "dns cache hit should be recorded")
assert.truthy(header_output.child.balancer)
assert.truthy(header_output.child.header_filter)

assert.truthy(log_output.child.rewrite)
assert.truthy(log_output.child.access)
assert.truthy(log_output.child.access.child.dns) -- upstream is resolved in access phase
assert.truthy(log_output.child.access.child.router) -- router is executed in access phase
assert(log_output.child.access.child.dns.child.localhost.child.resolve.cache_hit ~= nil, "dns cache hit should be recorded")
assert.truthy(log_output.child.balancer)
assert.truthy(log_output.child.header_filter)
Expand Down Expand Up @@ -573,11 +575,13 @@ describe(desc, function()
assert.truthy(header_output.child.rewrite)
assert.truthy(header_output.child.access)
assert.truthy(header_output.child.access.child.dns) -- upstream is resolved in access phase
assert.truthy(header_output.child.access.child.router) -- router is executed in access phase
assert.truthy(header_output.child.response)

assert.truthy(log_output.child.rewrite)
assert.truthy(log_output.child.access)
assert.truthy(log_output.child.access.child.dns) -- upstream is resolved in access phase
assert.truthy(header_output.child.access.child.router) -- router is executed in access phase
assert.truthy(log_output.child.body_filter)
assert.truthy(log_output.child.log)

Expand Down
Loading