Use hexadecimal ids and lowercase names in zipkin input (#3488)
This commit is contained in:
Chris Goller
committed by
Daniel Nelson
Daniel Nelson
parent
9422cca2cc
commit
afe05fcfef
@@ -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",
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user