Skip to content

Commit

Permalink
Merge commit 'refs/pull/36/head' of https://github.com/Kong/kong-plug…
Browse files Browse the repository at this point in the history
  • Loading branch information
james-callahan committed Jan 8, 2019
2 parents d1f5c45 + 2d6f503 commit 4257229
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
UNRELEASED

- Fix logging failure when DNS is not resolved


0.1.1 - 2018-10-26

- Add `run_on` field to the plugin's config
Expand Down
4 changes: 3 additions & 1 deletion kong/plugins/zipkin/opentracing.lua
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,9 @@ function OpenTracingHandler:log(conf)
span:finish((try.balancer_start + try.balancer_latency) / 1000)
end
proxy_span:set_tag("peer.hostname", balancer_data.hostname) -- could be nil
proxy_span:set_tag(ip_tag(balancer_data.ip), balancer_data.ip)
if balancer_data.ip ~= nil then
proxy_span:set_tag(ip_tag(balancer_data.ip), balancer_data.ip)
end
proxy_span:set_tag("peer.port", balancer_data.port)
end

Expand Down

0 comments on commit 4257229

Please sign in to comment.