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

fix(zipkin): avoid getting a nil value in log phase(#10590) #10666

Merged
merged 2 commits into from
Dec 22, 2023
Merged

fix(zipkin): avoid getting a nil value in log phase(#10590) #10666

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d613f2
fix(zipkin): avoid getting a nil value in log phase(#10590)
Dec 19, 2023
5895771
fix(zipkin): add a new test case(#10590)
Dec 21, 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
14 changes: 9 additions & 5 deletions apisix/plugins/zipkin.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,15 @@ end


function _M.log(conf, ctx)
if ctx.zipkin then
core.tablepool.release("zipkin_ctx", ctx.zipkin)
ctx.zipkin = nil
end

if not ctx.opentracing_sample then
return
end

local opentracing = ctx.opentracing

local log_end_time = opentracing.tracer:time()
Expand All @@ -302,11 +311,6 @@ function _M.log(conf, ctx)
opentracing.request_span:set_tag("http.status_code", upstream_status)

opentracing.request_span:finish(log_end_time)

if ctx.zipkin then
core.tablepool.release("zipkin_ctx", ctx.zipkin)
ctx.zipkin = nil
end
end

return _M
10 changes: 10 additions & 0 deletions t/plugin/zipkin.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,3 +467,13 @@ GET /t
--- response_body
1
0



=== TEST 23: no error in log phase while b3 header invalid
--- request
GET /echo
--- more_headers
b3: abc
--- no_error_log
[error]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

u can insert a new line at here to help the ci works

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, thk

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Vacant2333
my new test cast as following:

=== TEST 23: no error in log phase while b3 header invalid
--- request
GET /echo
--- more_headers
b3: 80f198ee56343ba864fe8b2a57d3eff7
--- response_headers
x-b3-sampled:
--- error_code: 400
--- grep_error_log eval
qr/attempt to index local 'opentracing' \(a nil value\)
--- grep_error_log_out

i want to assert that there is no corresponding error in the log, what should I do?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

u may need to try this https://apisix.apache.org/docs/apisix/internal/testing-framework/#executing-shell-commands, im not sure if it will works🤣, i didnt find some testcase need to do like u want

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i want to assert that there is no corresponding error in the log, what should I do?

You can use no_error_log https://github.com/apache/apisix/blob/master/docs/en/latest/plugin-develop.md?plain=1#L549

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i want to assert that there is no corresponding error in the log, what should I do?

You can use no_error_log https://github.com/apache/apisix/blob/master/docs/en/latest/plugin-develop.md?plain=1#L549

there is a error in rewrite phase, but no error in log phase.