[skywalking-nginx-lua] branch master updated: Add test for tier 2 LB. and re-format the trace_id and segment_id

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-nginx-lua.git


The following commit(s) were added to refs/heads/master by this push:
     new f8e70ab  Add test for tier 2 LB. and re-format the trace_id and segment_id
f8e70ab is described below

commit f8e70ab7284652de9dc5f8ca22b27d3b90512ebf
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Feb 23 20:36:23 2020 +0800

    Add test for tier 2 LB. and re-format the trace_id and segment_id
---
 examples/nginx.conf            | 18 ++++++++++++++++++
 lib/skywalking/segment.lua     |  4 ++--
 lib/skywalking/segment_ref.lua |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/examples/nginx.conf b/examples/nginx.conf
index c5b8f6f..3400519 100644
--- a/examples/nginx.conf
+++ b/examples/nginx.conf
@@ -54,6 +54,24 @@ http {
                 require("tracer"):startBackendTimer()
             }
 
+            proxy_pass http://127.0.0.1:8080/tier2/lb;
+
+            body_filter_by_lua_block {
+                require("tracer"):finish()
+            }
+
+            log_by_lua_block {
+                require("tracer"):prepareForReport()
+            }
+        }
+
+        location /tier2/lb {
+            default_type text/html;
+
+            rewrite_by_lua_block {
+                require("tracer"):startBackendTimer()
+            }
+
             proxy_pass http://127.0.0.1:8080/backend;
 
             body_filter_by_lua_block {
diff --git a/lib/skywalking/segment.lua b/lib/skywalking/segment.lua
index ea870e4..02b6cfc 100644
--- a/lib/skywalking/segment.lua
+++ b/lib/skywalking/segment.lua
@@ -61,8 +61,8 @@ end
 function Segment:transform()
     local segmentBuilder = SegmentProtocol:new()
     segmentBuilder.serviceId = self.service_id
-    segmentBuilder.globalTraceIds[1] = Util:id2String(self.trace_id)
-    segmentBuilder.traceSegmentId = Util:id2String(self.segment_id)
+    segmentBuilder.globalTraceIds[1] = { idParts = self.trace_id}
+    segmentBuilder.traceSegmentId = { idParts = self.segment_id}
     segmentBuilder.serviceId = self.service_id
     segmentBuilder.serviceInstanceId = self.service_inst_id
 
diff --git a/lib/skywalking/segment_ref.lua b/lib/skywalking/segment_ref.lua
index 93a33bd..b7c7f67 100644
--- a/lib/skywalking/segment_ref.lua
+++ b/lib/skywalking/segment_ref.lua
@@ -142,7 +142,7 @@ end
 -- Return RefProtocol
 function SegmentRef:transform()
     local refBuilder = RefProtocol:new()
-    refBuilder.parentTraceSegmentId = Util:id2String(self.segment_id)
+    refBuilder.parentTraceSegmentId = {idParts = self.segment_id }
     refBuilder.parentSpanId = self.span_id
     refBuilder.parentServiceInstanceId = self.parent_service_instance_id
     refBuilder.networkAddress = self.network_address