fix(*) timestamps and annotations

.travis.yml

@@ -55,6 +55,7 @@ env:
 install:
   - git clone --single-branch https://$GITHUB_TOKEN:@github.com/Kong/kong-ci.git ../kong-ci
   - source ../kong-ci/setup_plugin_env.sh
+  - docker run -d --name zipkin -p 9411:9411 openzipkin/zipkin && while ! curl localhost:9411/health; do sleep 1; done
 
 script:
   - eval $LUACHECK_CMD

kong/plugins/zipkin/reporter.lua

@@ -4,6 +4,7 @@ local cjson = require "cjson".new()
 cjson.encode_number_precision(16)
 
 local floor = math.floor
+local gsub = string.gsub
 
 local zipkin_reporter_methods = {}
 local zipkin_reporter_mt = {
@@ -99,9 +100,15 @@ function zipkin_reporter_methods:report(span)
       annotations = kong.table.new(n_logs, 0)
       for i = 1, n_logs do
         local log = span.logs[i]
+
+        -- Shortens the log strings into annotation values
+        -- for Zipkin. "kong.access.start" becomes "kas"
+        local value = gsub(log.key .. "." .. log.value,
+                           "%.?(%w)[^%.]*",
+                           "%1")
         annotations[i] = {
-          event = log.key .. "." .. log.value,
-          timestamp = log.timestamp,
+          value     = value,
+          timestamp = floor(log.timestamp),
         }
       end
     end
@@ -117,7 +124,7 @@ function zipkin_reporter_methods:report(span)
     parentId = span_context.parent_id and to_hex(span_context.parent_id) or nil,
     id = to_hex(span_context.span_id),
     kind = span_kind_map[span_kind],
-    timestamp = span.timestamp * 1000000,
+    timestamp = floor(span.timestamp * 1000000),
     duration = floor(span.duration * 1000000), -- zipkin wants integer
     -- shared = nil, -- We don't use shared spans (server reuses client generated spanId)
     -- TODO: debug?