This is an automated email from the ASF dual-hosted git repository. membphis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push: new b40d3bc change: upgrade `ngx_var` module 0.4 to 0.5. (#1005) b40d3bc is described below commit b40d3bc8f88ec7f91627ff402be509cbc06b3abc Author: Janko <shuaijinc...@gmail.com> AuthorDate: Fri Dec 27 16:53:45 2019 +0800 change: upgrade `ngx_var` module 0.4 to 0.5. (#1005) --- lua/apisix/http/router/radixtree_host_uri.lua | 2 +- lua/apisix/http/router/radixtree_uri.lua | 2 +- lua/apisix/plugins/zipkin.lua | 2 +- rockspec/apisix-master-0.rockspec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/apisix/http/router/radixtree_host_uri.lua b/lua/apisix/http/router/radixtree_host_uri.lua index d4fad18..960b8a0 100644 --- a/lua/apisix/http/router/radixtree_host_uri.lua +++ b/lua/apisix/http/router/radixtree_host_uri.lua @@ -139,7 +139,7 @@ function _M.match(api_ctx) end core.table.clear(match_opts) - match_opts.method = api_ctx.var.method + match_opts.method = api_ctx.var.request_method match_opts.remote_addr = api_ctx.var.remote_addr match_opts.vars = api_ctx.var match_opts.host = api_ctx.var.host diff --git a/lua/apisix/http/router/radixtree_uri.lua b/lua/apisix/http/router/radixtree_uri.lua index 6b364b5..ba40160 100644 --- a/lua/apisix/http/router/radixtree_uri.lua +++ b/lua/apisix/http/router/radixtree_uri.lua @@ -99,7 +99,7 @@ function _M.match(api_ctx) end core.table.clear(match_opts) - match_opts.method = api_ctx.var.method + match_opts.method = api_ctx.var.request_method match_opts.host = api_ctx.var.host match_opts.remote_addr = api_ctx.var.remote_addr match_opts.vars = api_ctx.var diff --git a/lua/apisix/plugins/zipkin.lua b/lua/apisix/plugins/zipkin.lua index 7dce205..4974ca6 100644 --- a/lua/apisix/plugins/zipkin.lua +++ b/lua/apisix/plugins/zipkin.lua @@ -89,7 +89,7 @@ function _M.rewrite(conf, ctx) tags = { component = "apisix", ["span.kind"] = "server", - ["http.method"] = ctx.var.method, + ["http.method"] = ctx.var.request_method, ["http.url"] = ctx.var.request_uri, -- TODO: support ipv6 ["peer.ipv4"] = core.request.get_remote_client_ip(ctx), diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec index 27cb11b..7ef6bef 100644 --- a/rockspec/apisix-master-0.rockspec +++ b/rockspec/apisix-master-0.rockspec @@ -33,7 +33,7 @@ dependencies = { "lua-resty-template = 1.9", "lua-resty-etcd = 0.8", "lua-resty-balancer = 0.02rc5", - "lua-resty-ngxvar = 0.4", + "lua-resty-ngxvar = 0.5", "lua-resty-jit-uuid = 0.0.7", "lua-resty-healthcheck-iresty = 2.0", "lua-resty-jwt = 0.2.0",