dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use hexadecimal ids and lowercase names in zipkin input (#3488)

This commit is contained in:
Chris Goller 2017-11-20 16:19:32 -06:00 committed by Daniel Nelson
parent f9b808572f
commit 113184ddae
8 changed files with 120 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/inputs/zipkin/cmd/stress_test_write/stress_test_write.go
View File

@ -38,11 +38,11 @@ var (
const usage = `./stress_test_write -batch_size=<batch_size> -max_backlog=<max_span_buffer_backlog> -batch_interval=<batch_interval_in_seconds> -span_count<number_of_spans_to_write> -zipkin_host=<zipkin_service_hostname>` const usage = `./stress_test_write -batch_size=<batch_size> -max_backlog=<max_span_buffer_backlog> -batch_interval=<batch_interval_in_seconds> -span_count<number_of_spans_to_write> -zipkin_host=<zipkin_service_hostname>`
func init() { func init() {
flag.IntVar(&BatchSize, "batch_size", 10000, usage) flag.IntVar(&BatchSize, "batch_size", 10000, "")
flag.IntVar(&MaxBackLog, "max_backlog", 100000, usage) flag.IntVar(&MaxBackLog, "max_backlog", 100000, "")
flag.IntVar(&BatchTimeInterval, "batch_interval", 1, usage) flag.IntVar(&BatchTimeInterval, "batch_interval", 1, "")
flag.IntVar(&SpanCount, "span_count", 100000, usage) flag.IntVar(&SpanCount, "span_count", 100000, "")
flag.StringVar(&ZipkinServerHost, "zipkin_host", "localhost", usage) flag.StringVar(&ZipkinServerHost, "zipkin_host", "localhost", "")
} }
func main() { func main() {
@ -59,7 +59,7 @@ func main() {
} }
tracer, err := zipkin.NewTracer( 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 { if err != nil {
log.Fatalf("Error: %v\n", err) log.Fatalf("Error: %v\n", err)

4
plugins/inputs/zipkin/codec/jsonV1/jsonV1.go
View File

@ -239,7 +239,7 @@ func TraceIDFromString(s string) (string, error) {
return fmt.Sprintf("%x%016x", hi, lo), nil 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) { func IDFromString(s string) (string, error) {
if len(s) > 16 { if len(s) > 16 {
return "", fmt.Errorf("ID cannot be longer than 16 hex characters: %s", s) 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 { if err != nil {
return "", err return "", err
} }
return strconv.FormatUint(id, 10), nil return strconv.FormatUint(id, 16), nil
} }

16
plugins/inputs/zipkin/codec/jsonV1/jsonV1_test.go
View File

@ -526,14 +526,14 @@ func Test_span_SpanID(t *testing.T) {
wantErr: true, wantErr: true,
}, },
{ {
name: "converts known id correctly", name: "validates known id correctly",
ID: "b26412d1ac16767d", ID: "b26412d1ac16767d",
want: "12854419928166856317", want: "b26412d1ac16767d",
}, },
{ {
name: "converts hex string correctly", name: "validates hex string correctly",
ID: "deadbeef", ID: "deadbeef",
want: "3735928559", want: "deadbeef",
}, },
{ {
name: "errors when string isn't hex", name: "errors when string isn't hex",
@ -576,9 +576,9 @@ func Test_span_Parent(t *testing.T) {
want: "", want: "",
}, },
{ {
name: "converts hex string correctly", name: "validates hex string correctly",
ParentID: "deadbeef", ParentID: "deadbeef",
want: "3735928559", want: "deadbeef",
}, },
{ {
name: "errors when string isn't hex", name: "errors when string isn't hex",
@ -890,9 +890,9 @@ func TestIDFromString(t *testing.T) {
wantErr bool wantErr bool
}{ }{
{ {
name: "Convert hex string id", name: "validates hex string id",
s: "6b221d5bc9e6496c", s: "6b221d5bc9e6496c",
want: "7719764991332993388", want: "6b221d5bc9e6496c",
}, },
{ {
name: "error : id too long", name: "error : id too long",

2
plugins/inputs/zipkin/codec/thrift/thrift.go
View File

@ -199,5 +199,5 @@ func (s *span) Duration() time.Duration {
} }
func formatID(id int64) string { func formatID(id int64) string {
return strconv.FormatInt(id, 10) return strconv.FormatInt(id, 16)
} }

22
plugins/inputs/zipkin/convert.go
View File

@ -1,6 +1,8 @@
package zipkin package zipkin
import ( import (
"strings"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs/zipkin/trace" "github.com/influxdata/telegraf/plugins/inputs/zipkin/trace"
) )
@ -28,12 +30,13 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error {
fields := map[string]interface{}{ fields := map[string]interface{}{
"duration_ns": s.Duration.Nanoseconds(), "duration_ns": s.Duration.Nanoseconds(),
} }
tags := map[string]string{ tags := map[string]string{
"id": s.ID, "id": s.ID,
"parent_id": s.ParentID, "parent_id": s.ParentID,
"trace_id": s.TraceID, "trace_id": s.TraceID,
"name": s.Name, "name": formatName(s.Name),
"service_name": s.ServiceName, "service_name": formatName(s.ServiceName),
} }
l.acc.AddFields("zipkin", fields, tags, s.Timestamp) l.acc.AddFields("zipkin", fields, tags, s.Timestamp)
@ -42,8 +45,8 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error {
"id": s.ID, "id": s.ID,
"parent_id": s.ParentID, "parent_id": s.ParentID,
"trace_id": s.TraceID, "trace_id": s.TraceID,
"name": s.Name, "name": formatName(s.Name),
"service_name": a.ServiceName, "service_name": formatName(a.ServiceName),
"annotation": a.Value, "annotation": a.Value,
"endpoint_host": a.Host, "endpoint_host": a.Host,
} }
@ -55,8 +58,8 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error {
"id": s.ID, "id": s.ID,
"parent_id": s.ParentID, "parent_id": s.ParentID,
"trace_id": s.TraceID, "trace_id": s.TraceID,
"name": s.Name, "name": formatName(s.Name),
"service_name": b.ServiceName, "service_name": formatName(b.ServiceName),
"annotation": b.Value, "annotation": b.Value,
"endpoint_host": b.Host, "endpoint_host": b.Host,
"annotation_key": b.Key, "annotation_key": b.Key,
@ -71,3 +74,10 @@ func (l *LineProtocolConverter) Record(t trace.Trace) error {
func (l *LineProtocolConverter) Error(err error) { func (l *LineProtocolConverter) Error(err error) {
l.acc.AddError(err) 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)
}

18
plugins/inputs/zipkin/convert_test.go
View File

@ -115,7 +115,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"trace_id": "2505404965370368069", "trace_id": "2505404965370368069",
"service_name": "trivial", "service_name": "trivial",
"name": "Child", "name": "child",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(),
@ -128,7 +128,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
"id": "8090652509916334619", "id": "8090652509916334619",
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"trace_id": "2505404965370368069", "trace_id": "2505404965370368069",
"name": "Child", "name": "child",
"service_name": "trivial", "service_name": "trivial",
"annotation": "dHJpdmlhbA==", "annotation": "dHJpdmlhbA==",
"endpoint_host": "2130706433:0", "endpoint_host": "2130706433:0",
@ -146,7 +146,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"trace_id": "2505404965370368069", "trace_id": "2505404965370368069",
"service_name": "trivial", "service_name": "trivial",
"name": "Child", "name": "child",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(),
@ -159,7 +159,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
"id": "103618986556047333", "id": "103618986556047333",
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"trace_id": "2505404965370368069", "trace_id": "2505404965370368069",
"name": "Child", "name": "child",
"service_name": "trivial", "service_name": "trivial",
"annotation": "dHJpdmlhbA==", "annotation": "dHJpdmlhbA==",
"endpoint_host": "2130706433:0", "endpoint_host": "2130706433:0",
@ -177,7 +177,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"trace_id": "2505404965370368069", "trace_id": "2505404965370368069",
"service_name": "trivial", "service_name": "trivial",
"name": "Parent", "name": "parent",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@ -193,7 +193,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
"id": "22964302721410078", "id": "22964302721410078",
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"trace_id": "2505404965370368069", "trace_id": "2505404965370368069",
"name": "Parent", "name": "parent",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@ -209,7 +209,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
"id": "22964302721410078", "id": "22964302721410078",
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"trace_id": "2505404965370368069", "trace_id": "2505404965370368069",
"name": "Parent", "name": "parent",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@ -221,7 +221,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"trace_id": "2505404965370368069", "trace_id": "2505404965370368069",
"name": "Parent", "name": "parent",
"service_name": "trivial", "service_name": "trivial",
"annotation": "A Log", "annotation": "A Log",
"endpoint_host": "2130706433:0", "endpoint_host": "2130706433:0",
@ -241,7 +241,7 @@ func TestLineProtocolConverter_Record(t *testing.T) {
"annotation_key": "lc", "annotation_key": "lc",
"id": "22964302721410078", "id": "22964302721410078",
"parent_id": "22964302721410078", "parent_id": "22964302721410078",
"name": "Parent", "name": "parent",
"endpoint_host": "2130706433:0", "endpoint_host": "2130706433:0",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{

10
plugins/inputs/zipkin/handler_test.go
View File

@ -52,11 +52,11 @@ func TestSpanHandler(t *testing.T) {
got := mockRecorder.Data got := mockRecorder.Data
parentID := strconv.FormatInt(22964302721410078, 10) parentID := strconv.FormatInt(22964302721410078, 16)
want := trace.Trace{ want := trace.Trace{
{ {
Name: "Child", Name: "Child",
ID: "8090652509916334619", ID: "7047c59776af8a1b",
TraceID: "22c4fc8ab3669045", TraceID: "22c4fc8ab3669045",
ParentID: parentID, ParentID: parentID,
Timestamp: time.Unix(0, 1498688360851331*int64(time.Microsecond)).UTC(), Timestamp: time.Unix(0, 1498688360851331*int64(time.Microsecond)).UTC(),
@ -74,7 +74,7 @@ func TestSpanHandler(t *testing.T) {
}, },
{ {
Name: "Child", Name: "Child",
ID: "103618986556047333", ID: "17020eb55a8bfe5",
TraceID: "22c4fc8ab3669045", TraceID: "22c4fc8ab3669045",
ParentID: parentID, ParentID: parentID,
Timestamp: time.Unix(0, 1498688360904552*int64(time.Microsecond)).UTC(), Timestamp: time.Unix(0, 1498688360904552*int64(time.Microsecond)).UTC(),
@ -92,9 +92,9 @@ func TestSpanHandler(t *testing.T) {
}, },
{ {
Name: "Parent", Name: "Parent",
ID: "22964302721410078", ID: "5195e96239641e",
TraceID: "22c4fc8ab3669045", TraceID: "22c4fc8ab3669045",
ParentID: "22964302721410078", ParentID: parentID,
Timestamp: time.Unix(0, 1498688360851318*int64(time.Microsecond)).UTC(), Timestamp: time.Unix(0, 1498688360851318*int64(time.Microsecond)).UTC(),
Duration: time.Duration(103680) * time.Microsecond, Duration: time.Duration(103680) * time.Microsecond,
ServiceName: "trivial", ServiceName: "trivial",

146
plugins/inputs/zipkin/zipkin_test.go
View File

@ -30,11 +30,11 @@ func TestZipkinPlugin(t *testing.T) {
testutil.Metric{ testutil.Metric{
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "8090652509916334619", "id": "7047c59776af8a1b",
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"trace_id": "22c4fc8ab3669045", "trace_id": "22c4fc8ab3669045",
"service_name": "trivial", "service_name": "trivial",
"name": "Child", "name": "child",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(53106) * time.Microsecond).Nanoseconds(),
@ -44,10 +44,10 @@ func TestZipkinPlugin(t *testing.T) {
testutil.Metric{ testutil.Metric{
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "8090652509916334619", "id": "7047c59776af8a1b",
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"trace_id": "22c4fc8ab3669045", "trace_id": "22c4fc8ab3669045",
"name": "Child", "name": "child",
"service_name": "trivial", "service_name": "trivial",
"annotation": "trivial", //base64: dHJpdmlhbA== "annotation": "trivial", //base64: dHJpdmlhbA==
"endpoint_host": "127.0.0.1", "endpoint_host": "127.0.0.1",
@ -61,11 +61,11 @@ func TestZipkinPlugin(t *testing.T) {
testutil.Metric{ testutil.Metric{
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "103618986556047333", "id": "17020eb55a8bfe5",
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"trace_id": "22c4fc8ab3669045", "trace_id": "22c4fc8ab3669045",
"service_name": "trivial", "service_name": "trivial",
"name": "Child", "name": "child",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(50410) * time.Microsecond).Nanoseconds(),
@ -75,10 +75,10 @@ func TestZipkinPlugin(t *testing.T) {
testutil.Metric{ testutil.Metric{
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "103618986556047333", "id": "17020eb55a8bfe5",
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"trace_id": "22c4fc8ab3669045", "trace_id": "22c4fc8ab3669045",
"name": "Child", "name": "child",
"service_name": "trivial", "service_name": "trivial",
"annotation": "trivial", //base64: dHJpdmlhbA== "annotation": "trivial", //base64: dHJpdmlhbA==
"endpoint_host": "127.0.0.1", "endpoint_host": "127.0.0.1",
@ -92,11 +92,11 @@ func TestZipkinPlugin(t *testing.T) {
testutil.Metric{ testutil.Metric{
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "22964302721410078", "id": "5195e96239641e",
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"trace_id": "22c4fc8ab3669045", "trace_id": "22c4fc8ab3669045",
"service_name": "trivial", "service_name": "trivial",
"name": "Parent", "name": "parent",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@ -109,10 +109,10 @@ func TestZipkinPlugin(t *testing.T) {
"service_name": "trivial", "service_name": "trivial",
"annotation": "Starting child #0", "annotation": "Starting child #0",
"endpoint_host": "127.0.0.1", "endpoint_host": "127.0.0.1",
"id": "22964302721410078", "id": "5195e96239641e",
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"trace_id": "22c4fc8ab3669045", "trace_id": "22c4fc8ab3669045",
"name": "Parent", "name": "parent",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@ -125,10 +125,10 @@ func TestZipkinPlugin(t *testing.T) {
"service_name": "trivial", "service_name": "trivial",
"annotation": "Starting child #1", "annotation": "Starting child #1",
"endpoint_host": "127.0.0.1", "endpoint_host": "127.0.0.1",
"id": "22964302721410078", "id": "5195e96239641e",
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"trace_id": "22c4fc8ab3669045", "trace_id": "22c4fc8ab3669045",
"name": "Parent", "name": "parent",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@ -138,13 +138,13 @@ func TestZipkinPlugin(t *testing.T) {
testutil.Metric{ testutil.Metric{
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"trace_id": "22c4fc8ab3669045", "trace_id": "22c4fc8ab3669045",
"name": "Parent", "name": "parent",
"service_name": "trivial", "service_name": "trivial",
"annotation": "A Log", "annotation": "A Log",
"endpoint_host": "127.0.0.1", "endpoint_host": "127.0.0.1",
"id": "22964302721410078", "id": "5195e96239641e",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
"duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(), "duration_ns": (time.Duration(103680) * time.Microsecond).Nanoseconds(),
@ -158,9 +158,9 @@ func TestZipkinPlugin(t *testing.T) {
"service_name": "trivial", "service_name": "trivial",
"annotation": "trivial", //base64: dHJpdmlhbA== "annotation": "trivial", //base64: dHJpdmlhbA==
"annotation_key": "lc", "annotation_key": "lc",
"id": "22964302721410078", "id": "5195e96239641e",
"parent_id": "22964302721410078", "parent_id": "5195e96239641e",
"name": "Parent", "name": "parent",
"endpoint_host": "127.0.0.1", "endpoint_host": "127.0.0.1",
}, },
Fields: map[string]interface{}{ Fields: map[string]interface{}{
@ -179,8 +179,8 @@ func TestZipkinPlugin(t *testing.T) {
testutil.Metric{ testutil.Metric{
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "6802735349851856000", "id": "5e682bc21ce99c80",
"parent_id": "6802735349851856000", "parent_id": "5e682bc21ce99c80",
"trace_id": "5e682bc21ce99c80", "trace_id": "5e682bc21ce99c80",
"service_name": "go-zipkin-testclient", "service_name": "go-zipkin-testclient",
"name": "main.dud", "name": "main.dud",
@ -195,8 +195,8 @@ func TestZipkinPlugin(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"annotation": "cs", "annotation": "cs",
"endpoint_host": "0.0.0.0:9410", "endpoint_host": "0.0.0.0:9410",
"id": "6802735349851856000", "id": "5e682bc21ce99c80",
"parent_id": "6802735349851856000", "parent_id": "5e682bc21ce99c80",
"trace_id": "5e682bc21ce99c80", "trace_id": "5e682bc21ce99c80",
"name": "main.dud", "name": "main.dud",
"service_name": "go-zipkin-testclient", "service_name": "go-zipkin-testclient",
@ -211,8 +211,8 @@ func TestZipkinPlugin(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"annotation": "cr", "annotation": "cr",
"endpoint_host": "0.0.0.0:9410", "endpoint_host": "0.0.0.0:9410",
"id": "6802735349851856000", "id": "5e682bc21ce99c80",
"parent_id": "6802735349851856000", "parent_id": "5e682bc21ce99c80",
"trace_id": "5e682bc21ce99c80", "trace_id": "5e682bc21ce99c80",
"name": "main.dud", "name": "main.dud",
"service_name": "go-zipkin-testclient", "service_name": "go-zipkin-testclient",
@ -232,9 +232,9 @@ func TestZipkinPlugin(t *testing.T) {
{ {
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -247,9 +247,9 @@ func TestZipkinPlugin(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"annotation": "sr", "annotation": "sr",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -263,9 +263,9 @@ func TestZipkinPlugin(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"annotation": "ss", "annotation": "ss",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -280,9 +280,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "Demo2Application", "annotation": "Demo2Application",
"annotation_key": "mvc.controller.class", "annotation_key": "mvc.controller.class",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -297,9 +297,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "hi2", "annotation": "hi2",
"annotation_key": "mvc.controller.method", "annotation_key": "mvc.controller.method",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -314,9 +314,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "192.168.0.8:test:8010", "annotation": "192.168.0.8:test:8010",
"annotation_key": "spring.instance_id", "annotation_key": "spring.instance_id",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -328,9 +328,9 @@ func TestZipkinPlugin(t *testing.T) {
{ {
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -344,9 +344,9 @@ func TestZipkinPlugin(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"annotation": "cs", "annotation": "cs",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -360,9 +360,9 @@ func TestZipkinPlugin(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"annotation": "cr", "annotation": "cr",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -377,9 +377,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "localhost", "annotation": "localhost",
"annotation_key": "http.host", "annotation_key": "http.host",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -394,9 +394,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "GET", "annotation": "GET",
"annotation_key": "http.method", "annotation_key": "http.method",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -411,9 +411,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "/hi2", "annotation": "/hi2",
"annotation_key": "http.path", "annotation_key": "http.path",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -428,9 +428,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "http://localhost:8010/hi2", "annotation": "http://localhost:8010/hi2",
"annotation_key": "http.url", "annotation_key": "http.url",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -445,9 +445,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "192.168.0.8:test:8010", "annotation": "192.168.0.8:test:8010",
"annotation_key": "spring.instance_id", "annotation_key": "spring.instance_id",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "12854419928166856317", "id": "b26412d1ac16767d",
"name": "http:/hi2", "name": "http:/hi2",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -459,9 +459,9 @@ func TestZipkinPlugin(t *testing.T) {
{ {
Measurement: "zipkin", Measurement: "zipkin",
Tags: map[string]string{ Tags: map[string]string{
"id": "8291962692415852504", "id": "7312f822d43d0fd8",
"name": "http:/hi", "name": "http:/hi",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -475,9 +475,9 @@ func TestZipkinPlugin(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"annotation": "sr", "annotation": "sr",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "8291962692415852504", "id": "7312f822d43d0fd8",
"name": "http:/hi", "name": "http:/hi",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -491,9 +491,9 @@ func TestZipkinPlugin(t *testing.T) {
Tags: map[string]string{ Tags: map[string]string{
"annotation": "ss", "annotation": "ss",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "8291962692415852504", "id": "7312f822d43d0fd8",
"name": "http:/hi", "name": "http:/hi",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -508,9 +508,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "Demo2Application", "annotation": "Demo2Application",
"annotation_key": "mvc.controller.class", "annotation_key": "mvc.controller.class",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "8291962692415852504", "id": "7312f822d43d0fd8",
"name": "http:/hi", "name": "http:/hi",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -525,9 +525,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "hi", "annotation": "hi",
"annotation_key": "mvc.controller.method", "annotation_key": "mvc.controller.method",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "8291962692415852504", "id": "7312f822d43d0fd8",
"name": "http:/hi", "name": "http:/hi",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },
@ -542,9 +542,9 @@ func TestZipkinPlugin(t *testing.T) {
"annotation": "192.168.0.8:test:8010", "annotation": "192.168.0.8:test:8010",
"annotation_key": "spring.instance_id", "annotation_key": "spring.instance_id",
"endpoint_host": "192.168.0.8:8010", "endpoint_host": "192.168.0.8:8010",
"id": "8291962692415852504", "id": "7312f822d43d0fd8",
"name": "http:/hi", "name": "http:/hi",
"parent_id": "8291962692415852504", "parent_id": "7312f822d43d0fd8",
"service_name": "test", "service_name": "test",
"trace_id": "7312f822d43d0fd8", "trace_id": "7312f822d43d0fd8",
}, },