From 113184ddae877abb05733a6dd2a3b0177510a6a1 Mon Sep 17 00:00:00 2001 From: Chris Goller Date: Mon, 20 Nov 2017 16:19:32 -0600 Subject: [PATCH] Use hexadecimal ids and lowercase names in zipkin input (#3488) --- .../stress_test_write/stress_test_write.go | 12 +- plugins/inputs/zipkin/codec/jsonV1/jsonV1.go | 4 +- .../inputs/zipkin/codec/jsonV1/jsonV1_test.go | 16 +- plugins/inputs/zipkin/codec/thrift/thrift.go | 2 +- plugins/inputs/zipkin/convert.go | 22 ++- plugins/inputs/zipkin/convert_test.go | 18 +-- plugins/inputs/zipkin/handler_test.go | 10 +- plugins/inputs/zipkin/zipkin_test.go | 146 +++++++++--------- 8 files changed, 120 insertions(+), 110 deletions(-) diff --git a/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go b/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go index f4bc134f9..ddc0d4918 100644 --- a/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go +++ b/plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go @@ -38,11 +38,11 @@ var ( const usage = `./stress_test_write -batch_size= -max_backlog= -batch_interval= -span_count -zipkin_host=` func init() { - flag.IntVar(&BatchSize, "batch_size", 10000, usage) - flag.IntVar(&MaxBackLog, "max_backlog", 100000, usage) - flag.IntVar(&BatchTimeInterval, "batch_interval", 1, usage) - flag.IntVar(&SpanCount, "span_count", 100000, usage) - flag.StringVar(&ZipkinServerHost, "zipkin_host", "localhost", usage) + flag.IntVar(&BatchSize, "batch_size", 10000, "") + flag.IntVar(&MaxBackLog, "max_backlog", 100000, "") + flag.IntVar(&BatchTimeInterval, "batch_interval", 1, "") + flag.IntVar(&SpanCount, "span_count", 100000, "") + flag.StringVar(&ZipkinServerHost, "zipkin_host", "localhost", "") } func main() { @@ -59,7 +59,7 @@ func main() { } tracer, err := zipkin.NewTracer( - zipkin.NewRecorder(collector, false, "127.0.0.1:0", "trivial")) + zipkin.NewRecorder(collector, false, "127.0.0.1:0", "Trivial")) if err != nil { log.Fatalf("Error: %v\n", err) diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go index 53670dd29..8c229b9f3 100644 --- a/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go +++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1.go @@ -239,7 +239,7 @@ func TraceIDFromString(s string) (string, error) { return fmt.Sprintf("%x%016x", hi, lo), nil } -// IDFromString creates a decimal id from a hexadecimal string +// IDFromString validates the ID and returns it in hexadecimal format. func IDFromString(s string) (string, error) { if len(s) > 16 { return "", fmt.Errorf("ID cannot be longer than 16 hex characters: %s", s) @@ -248,5 +248,5 @@ func IDFromString(s string) (string, error) { if err != nil { return "", err } - return strconv.FormatUint(id, 10), nil + return strconv.FormatUint(id, 16), nil } diff --git a/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go b/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go index fa0d7c2ad..11a0920fb 100644 --- a/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go +++ b/plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go @@ -526,14 +526,14 @@ func Test_span_SpanID(t *testing.T) { wantErr: true, }, { - name: "converts known id correctly", + name: "validates known id correctly", ID: "b26412d1ac16767d", - want: "12854419928166856317", + want: "b26412d1ac16767d", }, { - name: "converts hex string correctly", + name: "validates hex string correctly", ID: "deadbeef", - want: "3735928559", + want: "deadbeef", }, { name: "errors when string isn't hex", @@ -576,9 +576,9 @@ func Test_span_Parent(t *testing.T) { want: "", }, { - name: "converts hex string correctly", + name: "validates hex string correctly", ParentID: "deadbeef", - want: "3735928559", + want: "deadbeef", }, { name: "errors when string isn't hex", @@ -890,9 +890,9 @@ func TestIDFromString(t *testing.T) { wantErr bool }{ { - name: "Convert hex string id", + name: "validates hex string id", s: "6b221d5bc9e6496c", - want: "7719764991332993388", + want: "6b221d5bc9e6496c", }, { name: "error : id too long", diff --git a/plugins/inputs/zipkin/codec/thrift/thrift.go b/plugins/inputs/zipkin/codec/thrift/thrift.go index c2170e87a..b3fc94897 100644 --- a/plugins/inputs/zipkin/codec/thrift/thrift.go +++ b/plugins/inputs/zipkin/codec/thrift/thrift.go @@ -199,5 +199,5 @@ func (s *span) Duration() time.Duration { } func formatID(id int64) string { - return strconv.FormatInt(id, 10) + return strconv.FormatInt(id, 16) } diff --git a/plugins/inputs/zipkin/convert.go b/plugins/inputs/zipkin/convert.go index 940c16a38..ae087645f 100644 --- a/plugins/inputs/zipkin/convert.go +++ b/plugins/inputs/zipkin/convert.go @@ -1,6 +1,8 @@ package zipkin import ( + "strings" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs/zipkin/trace" ) @@ -28,12 +30,13 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error { fields := map[string]interface{}{ "duration_ns": s.Duration.Nanoseconds(), } + tags := map[string]string{ "id": s.ID, "parent_id": s.ParentID, "trace_id": s.TraceID, - "name": s.Name, - "service_name": s.ServiceName, + "name": formatName(s.Name), + "service_name": formatName(s.ServiceName), } l.acc.AddFields("zipkin", fields, tags, s.Timestamp) @@ -42,8 +45,8 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error { "id": s.ID, "parent_id": s.ParentID, "trace_id": s.TraceID, - "name": s.Name, - "service_name": a.ServiceName, + "name": formatName(s.Name), + "service_name": formatName(a.ServiceName), "annotation": a.Value, "endpoint_host": a.Host, } @@ -55,8 +58,8 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error { "id": s.ID, "parent_id": s.ParentID, "trace_id": s.TraceID, - "name": s.Name, - "service_name": b.ServiceName, + "name": formatName(s.Name), + "service_name": formatName(b.ServiceName), "annotation": b.Value, "endpoint_host": b.Host, "annotation_key": b.Key, @@ -71,3 +74,10 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error { func (l *LineProtocolConverter) Error(err error) { l.acc.AddError(err) } + +// formatName formats name and service name +// Zipkin forces span and service names to be lowercase: +// https://github.com/openzipkin/zipkin/pull/805 +func formatName(name string) string { + return strings.ToLower(name) +} diff --git a/plugins/inputs/zipkin/convert_test.go b/plugins/inputs/zipkin/convert_test.go index 959012589..5085deecb 100644 --- a/plugins/inputs/zipkin/convert_test.go +++ b/plugins/inputs/zipkin/convert_test.go @@ -115,7 +115,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { "parent_id": "22964302721410078", "trace_id": "2505404965370368069", "service_name": "trivial", - "name": "Child", + "name": "child", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(), @@ -128,7 +128,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { "id": "8090652509916334619", "parent_id": "22964302721410078", "trace_id": "2505404965370368069", - "name": "Child", + "name": "child", "service_name": "trivial", "annotation": "dHJpdmlhbA==", "endpoint_host": "2130706433:0", @@ -146,7 +146,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { "parent_id": "22964302721410078", "trace_id": "2505404965370368069", "service_name": "trivial", - "name": "Child", + "name": "child", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(), @@ -159,7 +159,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { "id": "103618986556047333", "parent_id": "22964302721410078", "trace_id": "2505404965370368069", - "name": "Child", + "name": "child", "service_name": "trivial", "annotation": "dHJpdmlhbA==", "endpoint_host": "2130706433:0", @@ -177,7 +177,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { "parent_id": "22964302721410078", "trace_id": "2505404965370368069", "service_name": "trivial", - "name": "Parent", + "name": "parent", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), @@ -193,7 +193,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { "id": "22964302721410078", "parent_id": "22964302721410078", "trace_id": "2505404965370368069", - "name": "Parent", + "name": "parent", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), @@ -209,7 +209,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { "id": "22964302721410078", "parent_id": "22964302721410078", "trace_id": "2505404965370368069", - "name": "Parent", + "name": "parent", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), @@ -221,7 +221,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { Tags: map[string]string{ "parent_id": "22964302721410078", "trace_id": "2505404965370368069", - "name": "Parent", + "name": "parent", "service_name": "trivial", "annotation": "A Log", "endpoint_host": "2130706433:0", @@ -241,7 +241,7 @@ func TestLineProtocolConverter_Record(t *testing.T) { "annotation_key": "lc", "id": "22964302721410078", "parent_id": "22964302721410078", - "name": "Parent", + "name": "parent", "endpoint_host": "2130706433:0", }, Fields: map[string]interface{}{ diff --git a/plugins/inputs/zipkin/handler_test.go b/plugins/inputs/zipkin/handler_test.go index 606a8da97..b0176a22e 100644 --- a/plugins/inputs/zipkin/handler_test.go +++ b/plugins/inputs/zipkin/handler_test.go @@ -52,11 +52,11 @@ func TestSpanHandler(t *testing.T) { got := mockRecorder.Data - parentID := strconv.FormatInt(22964302721410078, 10) + parentID := strconv.FormatInt(22964302721410078, 16) want := trace.Trace{ { Name: "Child", - ID: "8090652509916334619", + ID: "7047c59776af8a1b", TraceID: "22c4fc8ab3669045", ParentID: parentID, Timestamp: time.Unix(0, 1498688360851331*int64(time.Microsecond)).UTC(), @@ -74,7 +74,7 @@ func TestSpanHandler(t *testing.T) { }, { Name: "Child", - ID: "103618986556047333", + ID: "17020eb55a8bfe5", TraceID: "22c4fc8ab3669045", ParentID: parentID, Timestamp: time.Unix(0, 1498688360904552*int64(time.Microsecond)).UTC(), @@ -92,9 +92,9 @@ func TestSpanHandler(t *testing.T) { }, { Name: "Parent", - ID: "22964302721410078", + ID: "5195e96239641e", TraceID: "22c4fc8ab3669045", - ParentID: "22964302721410078", + ParentID: parentID, Timestamp: time.Unix(0, 1498688360851318*int64(time.Microsecond)).UTC(), Duration: time.Duration(103680) * time.Microsecond, ServiceName: "trivial", diff --git a/plugins/inputs/zipkin/zipkin_test.go b/plugins/inputs/zipkin/zipkin_test.go index e07eca0cf..b14fb3aca 100644 --- a/plugins/inputs/zipkin/zipkin_test.go +++ b/plugins/inputs/zipkin/zipkin_test.go @@ -30,11 +30,11 @@ func TestZipkinPlugin(t *testing.T) { testutil.Metric{ Measurement: "zipkin", Tags: map[string]string{ - "id": "8090652509916334619", - "parent_id": "22964302721410078", + "id": "7047c59776af8a1b", + "parent_id": "5195e96239641e", "trace_id": "22c4fc8ab3669045", "service_name": "trivial", - "name": "Child", + "name": "child", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(), @@ -44,10 +44,10 @@ func TestZipkinPlugin(t *testing.T) { testutil.Metric{ Measurement: "zipkin", Tags: map[string]string{ - "id": "8090652509916334619", - "parent_id": "22964302721410078", + "id": "7047c59776af8a1b", + "parent_id": "5195e96239641e", "trace_id": "22c4fc8ab3669045", - "name": "Child", + "name": "child", "service_name": "trivial", "annotation": "trivial", //base64: dHJpdmlhbA== "endpoint_host": "127.0.0.1", @@ -61,11 +61,11 @@ func TestZipkinPlugin(t *testing.T) { testutil.Metric{ Measurement: "zipkin", Tags: map[string]string{ - "id": "103618986556047333", - "parent_id": "22964302721410078", + "id": "17020eb55a8bfe5", + "parent_id": "5195e96239641e", "trace_id": "22c4fc8ab3669045", "service_name": "trivial", - "name": "Child", + "name": "child", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(), @@ -75,10 +75,10 @@ func TestZipkinPlugin(t *testing.T) { testutil.Metric{ Measurement: "zipkin", Tags: map[string]string{ - "id": "103618986556047333", - "parent_id": "22964302721410078", + "id": "17020eb55a8bfe5", + "parent_id": "5195e96239641e", "trace_id": "22c4fc8ab3669045", - "name": "Child", + "name": "child", "service_name": "trivial", "annotation": "trivial", //base64: dHJpdmlhbA== "endpoint_host": "127.0.0.1", @@ -92,11 +92,11 @@ func TestZipkinPlugin(t *testing.T) { testutil.Metric{ Measurement: "zipkin", Tags: map[string]string{ - "id": "22964302721410078", - "parent_id": "22964302721410078", + "id": "5195e96239641e", + "parent_id": "5195e96239641e", "trace_id": "22c4fc8ab3669045", "service_name": "trivial", - "name": "Parent", + "name": "parent", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), @@ -109,10 +109,10 @@ func TestZipkinPlugin(t *testing.T) { "service_name": "trivial", "annotation": "Starting child #0", "endpoint_host": "127.0.0.1", - "id": "22964302721410078", - "parent_id": "22964302721410078", + "id": "5195e96239641e", + "parent_id": "5195e96239641e", "trace_id": "22c4fc8ab3669045", - "name": "Parent", + "name": "parent", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), @@ -125,10 +125,10 @@ func TestZipkinPlugin(t *testing.T) { "service_name": "trivial", "annotation": "Starting child #1", "endpoint_host": "127.0.0.1", - "id": "22964302721410078", - "parent_id": "22964302721410078", + "id": "5195e96239641e", + "parent_id": "5195e96239641e", "trace_id": "22c4fc8ab3669045", - "name": "Parent", + "name": "parent", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), @@ -138,13 +138,13 @@ func TestZipkinPlugin(t *testing.T) { testutil.Metric{ Measurement: "zipkin", Tags: map[string]string{ - "parent_id": "22964302721410078", + "parent_id": "5195e96239641e", "trace_id": "22c4fc8ab3669045", - "name": "Parent", + "name": "parent", "service_name": "trivial", "annotation": "A Log", "endpoint_host": "127.0.0.1", - "id": "22964302721410078", + "id": "5195e96239641e", }, Fields: map[string]interface{}{ "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), @@ -158,9 +158,9 @@ func TestZipkinPlugin(t *testing.T) { "service_name": "trivial", "annotation": "trivial", //base64: dHJpdmlhbA== "annotation_key": "lc", - "id": "22964302721410078", - "parent_id": "22964302721410078", - "name": "Parent", + "id": "5195e96239641e", + "parent_id": "5195e96239641e", + "name": "parent", "endpoint_host": "127.0.0.1", }, Fields: map[string]interface{}{ @@ -179,8 +179,8 @@ func TestZipkinPlugin(t *testing.T) { testutil.Metric{ Measurement: "zipkin", Tags: map[string]string{ - "id": "6802735349851856000", - "parent_id": "6802735349851856000", + "id": "5e682bc21ce99c80", + "parent_id": "5e682bc21ce99c80", "trace_id": "5e682bc21ce99c80", "service_name": "go-zipkin-testclient", "name": "main.dud", @@ -195,8 +195,8 @@ func TestZipkinPlugin(t *testing.T) { Tags: map[string]string{ "annotation": "cs", "endpoint_host": "0.0.0.0:9410", - "id": "6802735349851856000", - "parent_id": "6802735349851856000", + "id": "5e682bc21ce99c80", + "parent_id": "5e682bc21ce99c80", "trace_id": "5e682bc21ce99c80", "name": "main.dud", "service_name": "go-zipkin-testclient", @@ -211,8 +211,8 @@ func TestZipkinPlugin(t *testing.T) { Tags: map[string]string{ "annotation": "cr", "endpoint_host": "0.0.0.0:9410", - "id": "6802735349851856000", - "parent_id": "6802735349851856000", + "id": "5e682bc21ce99c80", + "parent_id": "5e682bc21ce99c80", "trace_id": "5e682bc21ce99c80", "name": "main.dud", "service_name": "go-zipkin-testclient", @@ -232,9 +232,9 @@ func TestZipkinPlugin(t *testing.T) { { Measurement: "zipkin", Tags: map[string]string{ - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -247,9 +247,9 @@ func TestZipkinPlugin(t *testing.T) { Tags: map[string]string{ "annotation": "sr", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -263,9 +263,9 @@ func TestZipkinPlugin(t *testing.T) { Tags: map[string]string{ "annotation": "ss", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -280,9 +280,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "Demo2Application", "annotation_key": "mvc.controller.class", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -297,9 +297,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "hi2", "annotation_key": "mvc.controller.method", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -314,9 +314,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "192.168.0.8:test:8010", "annotation_key": "spring.instance_id", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -328,9 +328,9 @@ func TestZipkinPlugin(t *testing.T) { { Measurement: "zipkin", Tags: map[string]string{ - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -344,9 +344,9 @@ func TestZipkinPlugin(t *testing.T) { Tags: map[string]string{ "annotation": "cs", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -360,9 +360,9 @@ func TestZipkinPlugin(t *testing.T) { Tags: map[string]string{ "annotation": "cr", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -377,9 +377,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "localhost", "annotation_key": "http.host", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -394,9 +394,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "GET", "annotation_key": "http.method", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -411,9 +411,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "/hi2", "annotation_key": "http.path", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -428,9 +428,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "http://localhost:8010/hi2", "annotation_key": "http.url", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -445,9 +445,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "192.168.0.8:test:8010", "annotation_key": "spring.instance_id", "endpoint_host": "192.168.0.8:8010", - "id": "12854419928166856317", + "id": "b26412d1ac16767d", "name": "http:/hi2", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -459,9 +459,9 @@ func TestZipkinPlugin(t *testing.T) { { Measurement: "zipkin", Tags: map[string]string{ - "id": "8291962692415852504", + "id": "7312f822d43d0fd8", "name": "http:/hi", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -475,9 +475,9 @@ func TestZipkinPlugin(t *testing.T) { Tags: map[string]string{ "annotation": "sr", "endpoint_host": "192.168.0.8:8010", - "id": "8291962692415852504", + "id": "7312f822d43d0fd8", "name": "http:/hi", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -491,9 +491,9 @@ func TestZipkinPlugin(t *testing.T) { Tags: map[string]string{ "annotation": "ss", "endpoint_host": "192.168.0.8:8010", - "id": "8291962692415852504", + "id": "7312f822d43d0fd8", "name": "http:/hi", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -508,9 +508,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "Demo2Application", "annotation_key": "mvc.controller.class", "endpoint_host": "192.168.0.8:8010", - "id": "8291962692415852504", + "id": "7312f822d43d0fd8", "name": "http:/hi", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -525,9 +525,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "hi", "annotation_key": "mvc.controller.method", "endpoint_host": "192.168.0.8:8010", - "id": "8291962692415852504", + "id": "7312f822d43d0fd8", "name": "http:/hi", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", }, @@ -542,9 +542,9 @@ func TestZipkinPlugin(t *testing.T) { "annotation": "192.168.0.8:test:8010", "annotation_key": "spring.instance_id", "endpoint_host": "192.168.0.8:8010", - "id": "8291962692415852504", + "id": "7312f822d43d0fd8", "name": "http:/hi", - "parent_id": "8291962692415852504", + "parent_id": "7312f822d43d0fd8", "service_name": "test", "trace_id": "7312f822d43d0fd8", },