From 05f5a8a1e6b6c85ebe4db0e48c4d19236c355f8f Mon Sep 17 00:00:00 2001 From: Andrew Wilkins Date: Fri, 19 Feb 2021 00:23:45 +0800 Subject: [PATCH] Do not strip leading 0s from traceIds and spanIds if the span source is jaeger (#4671) (#4801) * Do not strip leading 0s from traceIds and spanIds if the span source is Jaeger. Jager is in the process of doing the same. * Added Jaeger trace/span id formatting change to changelog # Conflicts: # changelogs/head.asciidoc Co-authored-by: Tobias Stadler --- processor/otel/consumer.go | 44 +++---------------- processor/otel/consumer_test.go | 4 +- .../jaeger_sampling_rate.approved.json | 4 +- .../metadata_jaeger-no-language.approved.json | 4 +- .../metadata_jaeger-version.approved.json | 4 +- .../metadata_jaeger.approved.json | 4 +- .../span_jaeger_custom.approved.json | 6 +-- .../span_jaeger_db.approved.json | 6 +-- .../span_jaeger_http.approved.json | 30 ++++++------- ...span_jaeger_http_status_code.approved.json | 6 +-- ...an_jaeger_https_default_port.approved.json | 6 +-- .../span_jaeger_messaging.approved.json | 6 +-- ...pan_jaeger_subtype_component.approved.json | 6 +-- .../transaction_jaeger_full.approved.json | 40 ++++++++--------- ...action_jaeger_type_messaging.approved.json | 2 +- ...nsaction_jaeger_type_request.approved.json | 2 +- ...n_jaeger_type_request_result.approved.json | 2 +- testdata/jaeger/batch_0.approved.json | 8 ++-- testdata/jaeger/batch_1.approved.json | 38 ++++++++-------- tests/system/jaeger_batch_0.approved.json | 8 ++-- ...ger_batch_0_auth_tag_removed.approved.json | 8 ++-- ...jaeger_batch_0_authorization.approved.json | 8 ++-- tests/system/jaeger_span.approved.json | 2 +- 23 files changed, 108 insertions(+), 140 deletions(-) diff --git a/processor/otel/consumer.go b/processor/otel/consumer.go index cab2918600c..46fa9a607cd 100644 --- a/processor/otel/consumer.go +++ b/processor/otel/consumer.go @@ -19,7 +19,6 @@ package otel import ( "context" - "encoding/binary" "fmt" "net" "net/url" @@ -93,21 +92,14 @@ func (c *Consumer) convertSpan(otelSpan pdata.Span, metadata model.Metadata, out root := !otelSpan.ParentSpanID().IsValid() - var parentID, spanID, traceID string - if strings.HasPrefix(metadata.Service.Agent.Name, "Jaeger") { - if !root { - parentID = formatJaegerSpanID(otelSpan.ParentSpanID()) - } - traceID = formatJaegerTraceID(otelSpan.TraceID()) - spanID = formatJaegerSpanID(otelSpan.SpanID()) - } else { - if !root { - parentID = otelSpan.ParentSpanID().HexString() - } - traceID = otelSpan.TraceID().HexString() - spanID = otelSpan.SpanID().HexString() + var parentID string + if !root { + parentID = otelSpan.ParentSpanID().HexString() } + traceID := otelSpan.TraceID().HexString() + spanID := otelSpan.SpanID().HexString() + startTime := pdata.UnixNanoToTime(otelSpan.StartTime()) endTime := pdata.UnixNanoToTime(otelSpan.EndTime()) var durationMillis float64 @@ -629,30 +621,6 @@ func truncate(s string) string { return s } -// formatJaegerTraceID returns the traceID as string in Jaeger format (hexadecimal without leading zeros) -func formatJaegerTraceID(traceID pdata.TraceID) string { - if !traceID.IsValid() { - return "" - } - bytes := traceID.Bytes() - jaegerTraceIDHigh := binary.BigEndian.Uint64(bytes[:8]) - jaegerTraceIDLow := binary.BigEndian.Uint64(bytes[8:]) - if jaegerTraceIDHigh == 0 { - return fmt.Sprintf("%x", jaegerTraceIDLow) - } - return fmt.Sprintf("%x%016x", jaegerTraceIDHigh, jaegerTraceIDLow) -} - -// formatJaegerSpanID returns the spanID as string in Jaeger format (hexadecimal without leading zeros) -func formatJaegerSpanID(spanID pdata.SpanID) string { - if !spanID.IsValid() { - return "" - } - bytes := spanID.Bytes() - jaegerSpanID := binary.BigEndian.Uint64(bytes[:]) - return fmt.Sprintf("%x", jaegerSpanID) -} - func schemeDefaultPort(scheme string) int { switch scheme { case "http": diff --git a/processor/otel/consumer_test.go b/processor/otel/consumer_test.go index d742712529b..d64b613c971 100644 --- a/processor/otel/consumer_test.go +++ b/processor/otel/consumer_test.go @@ -178,8 +178,8 @@ func TestConsumer_JaegerTraceID(t *testing.T) { require.NoError(t, (&Consumer{Reporter: reporter}).ConsumeTraces(context.Background(), traces)) require.Len(t, transformables, 2) - assert.Equal(t, "46467830", transformables[0].(*model.Transaction).TraceID) - assert.Equal(t, "464678300000000046467830", transformables[1].(*model.Transaction).TraceID) + assert.Equal(t, "00000000000000000000000046467830", transformables[0].(*model.Transaction).TraceID) + assert.Equal(t, "00000000464678300000000046467830", transformables[1].(*model.Transaction).TraceID) } func TestConsumer_JaegerTransaction(t *testing.T) { diff --git a/processor/otel/test_approved/jaeger_sampling_rate.approved.json b/processor/otel/test_approved/jaeger_sampling_rate.approved.json index 98962f4ac04..ba3c06f4fa0 100644 --- a/processor/otel/test_approved/jaeger_sampling_rate.approved.json +++ b/processor/otel/test_approved/jaeger_sampling_rate.approved.json @@ -102,7 +102,7 @@ "name": "host-abc" }, "parent": { - "id": "1" + "id": "0000000000000001" }, "processor": { "event": "span", @@ -128,7 +128,7 @@ "us": 1576500418000768 }, "trace": { - "id": "10000000000000001" + "id": "00000000000000010000000000000001" } } ] diff --git a/processor/otel/test_approved/metadata_jaeger-no-language.approved.json b/processor/otel/test_approved/metadata_jaeger-no-language.approved.json index 07902047cdc..966a2ffbbc3 100644 --- a/processor/otel/test_approved/metadata_jaeger-no-language.approved.json +++ b/processor/otel/test_approved/metadata_jaeger-no-language.approved.json @@ -25,13 +25,13 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { "duration": { "us": 0 }, - "id": "41414646", + "id": "0000000041414646", "result": "Success", "sampled": true, "type": "custom" diff --git a/processor/otel/test_approved/metadata_jaeger-version.approved.json b/processor/otel/test_approved/metadata_jaeger-version.approved.json index 34fcfb1bd2d..f04dd014c9e 100644 --- a/processor/otel/test_approved/metadata_jaeger-version.approved.json +++ b/processor/otel/test_approved/metadata_jaeger-version.approved.json @@ -25,13 +25,13 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { "duration": { "us": 0 }, - "id": "41414646", + "id": "0000000041414646", "result": "Success", "sampled": true, "type": "custom" diff --git a/processor/otel/test_approved/metadata_jaeger.approved.json b/processor/otel/test_approved/metadata_jaeger.approved.json index c6adb4545a6..2e288ea1ab2 100644 --- a/processor/otel/test_approved/metadata_jaeger.approved.json +++ b/processor/otel/test_approved/metadata_jaeger.approved.json @@ -38,13 +38,13 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { "duration": { "us": 0 }, - "id": "41414646", + "id": "0000000041414646", "result": "Success", "sampled": true, "type": "custom" diff --git a/processor/otel/test_approved/span_jaeger_custom.approved.json b/processor/otel/test_approved/span_jaeger_custom.approved.json index 269f2ff4145..5288a2b88ca 100644 --- a/processor/otel/test_approved/span_jaeger_custom.approved.json +++ b/processor/otel/test_approved/span_jaeger_custom.approved.json @@ -16,7 +16,7 @@ "name": "host-abc" }, "parent": { - "id": "58585858" + "id": "0000000058585858" }, "processor": { "event": "span", @@ -35,7 +35,7 @@ "duration": { "us": 79000000 }, - "id": "41414646", + "id": "0000000041414646", "name": "", "type": "custom" }, @@ -43,7 +43,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" } } ] diff --git a/processor/otel/test_approved/span_jaeger_db.approved.json b/processor/otel/test_approved/span_jaeger_db.approved.json index b1f430ee901..6c1a5f48212 100644 --- a/processor/otel/test_approved/span_jaeger_db.approved.json +++ b/processor/otel/test_approved/span_jaeger_db.approved.json @@ -23,7 +23,7 @@ "component": "foo" }, "parent": { - "id": "58585858" + "id": "0000000058585858" }, "processor": { "event": "span", @@ -57,7 +57,7 @@ "duration": { "us": 79000000 }, - "id": "41414646", + "id": "0000000041414646", "name": "", "subtype": "mysql", "type": "db" @@ -66,7 +66,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" } } ] diff --git a/processor/otel/test_approved/span_jaeger_http.approved.json b/processor/otel/test_approved/span_jaeger_http.approved.json index 2250280c6e2..6ce3d7864a3 100644 --- a/processor/otel/test_approved/span_jaeger_http.approved.json +++ b/processor/otel/test_approved/span_jaeger_http.approved.json @@ -27,7 +27,7 @@ "string_a_b": "some note" }, "parent": { - "id": "58585858" + "id": "0000000058585858" }, "processor": { "event": "span", @@ -62,7 +62,7 @@ "original": "http://foo.bar.com?a=12" } }, - "id": "41414646", + "id": "0000000041414646", "name": "HTTP GET", "subtype": "http", "type": "external" @@ -71,7 +71,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" } }, { @@ -106,7 +106,7 @@ } }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -125,7 +125,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "url": { "domain": "foo.bar.com", @@ -162,7 +162,7 @@ } }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -181,7 +181,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "url": { "domain": "foo.bar.com", @@ -220,7 +220,7 @@ } }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -239,7 +239,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "url": { "domain": "foo.bar.com", @@ -278,7 +278,7 @@ } }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -297,7 +297,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "url": { "domain": "foo.bar.com", @@ -336,7 +336,7 @@ } }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -355,7 +355,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "url": { "domain": "foo.bar.com", @@ -392,7 +392,7 @@ } }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -411,7 +411,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "url": { "domain": "foo.bar.com", diff --git a/processor/otel/test_approved/span_jaeger_http_status_code.approved.json b/processor/otel/test_approved/span_jaeger_http_status_code.approved.json index 7c13ba7dc46..9e41b864067 100644 --- a/processor/otel/test_approved/span_jaeger_http_status_code.approved.json +++ b/processor/otel/test_approved/span_jaeger_http_status_code.approved.json @@ -20,7 +20,7 @@ "name": "host-abc" }, "parent": { - "id": "58585858" + "id": "0000000058585858" }, "processor": { "event": "span", @@ -55,7 +55,7 @@ "original": "http://foo.bar.com?a=12" } }, - "id": "41414646", + "id": "0000000041414646", "name": "HTTP GET", "subtype": "http", "type": "external" @@ -64,7 +64,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" } } ] diff --git a/processor/otel/test_approved/span_jaeger_https_default_port.approved.json b/processor/otel/test_approved/span_jaeger_https_default_port.approved.json index 0c349033049..77127b6392b 100644 --- a/processor/otel/test_approved/span_jaeger_https_default_port.approved.json +++ b/processor/otel/test_approved/span_jaeger_https_default_port.approved.json @@ -20,7 +20,7 @@ "name": "host-abc" }, "parent": { - "id": "58585858" + "id": "0000000058585858" }, "processor": { "event": "span", @@ -51,7 +51,7 @@ "original": "https://foo.bar.com:443?a=12" } }, - "id": "41414646", + "id": "0000000041414646", "name": "HTTPS GET", "subtype": "http", "type": "external" @@ -60,7 +60,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" } } ] diff --git a/processor/otel/test_approved/span_jaeger_messaging.approved.json b/processor/otel/test_approved/span_jaeger_messaging.approved.json index 799ae7483a1..1c1a27dee3e 100644 --- a/processor/otel/test_approved/span_jaeger_messaging.approved.json +++ b/processor/otel/test_approved/span_jaeger_messaging.approved.json @@ -20,7 +20,7 @@ "name": "host-abc" }, "parent": { - "id": "58585858" + "id": "0000000058585858" }, "processor": { "event": "span", @@ -39,7 +39,7 @@ "duration": { "us": 79000000 }, - "id": "41414646", + "id": "0000000041414646", "message": { "queue": { "name": "queue-abc" @@ -52,7 +52,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" } } ] diff --git a/processor/otel/test_approved/span_jaeger_subtype_component.approved.json b/processor/otel/test_approved/span_jaeger_subtype_component.approved.json index db6fcbd3f01..48bd6ecef37 100644 --- a/processor/otel/test_approved/span_jaeger_subtype_component.approved.json +++ b/processor/otel/test_approved/span_jaeger_subtype_component.approved.json @@ -19,7 +19,7 @@ "component": "whatever" }, "parent": { - "id": "58585858" + "id": "0000000058585858" }, "processor": { "event": "span", @@ -38,7 +38,7 @@ "duration": { "us": 79000000 }, - "id": "41414646", + "id": "0000000041414646", "name": "", "subtype": "whatever", "type": "custom" @@ -47,7 +47,7 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" } } ] diff --git a/processor/otel/test_approved/transaction_jaeger_full.approved.json b/processor/otel/test_approved/transaction_jaeger_full.approved.json index 5fdbec70420..8fb1dfdac67 100644 --- a/processor/otel/test_approved/transaction_jaeger_full.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_full.approved.json @@ -49,13 +49,13 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { "duration": { "us": 79000000 }, - "id": "41414646", + "id": "0000000041414646", "name": "HTTP GET", "result": "HTTP 4xx", "sampled": true, @@ -102,7 +102,7 @@ "version": "1.1" }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -122,10 +122,10 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { - "id": "41414646", + "id": "0000000041414646", "type": "http_request" }, "url": { @@ -164,7 +164,7 @@ "version": "1.1" }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -184,10 +184,10 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { - "id": "41414646", + "id": "0000000041414646", "type": "http_request" }, "url": { @@ -228,7 +228,7 @@ "version": "1.1" }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -248,10 +248,10 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { - "id": "41414646", + "id": "0000000041414646", "type": "http_request" }, "url": { @@ -292,7 +292,7 @@ "version": "1.1" }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -312,10 +312,10 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { - "id": "41414646", + "id": "0000000041414646", "type": "http_request" }, "url": { @@ -356,7 +356,7 @@ "version": "1.1" }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -376,10 +376,10 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { - "id": "41414646", + "id": "0000000041414646", "type": "http_request" }, "url": { @@ -418,7 +418,7 @@ "version": "1.1" }, "parent": { - "id": "41414646" + "id": "0000000041414646" }, "processor": { "event": "error", @@ -438,10 +438,10 @@ "us": 1576500418000768 }, "trace": { - "id": "46467830" + "id": "00000000000000000000000046467830" }, "transaction": { - "id": "41414646", + "id": "0000000041414646", "type": "http_request" }, "url": { diff --git a/processor/otel/test_approved/transaction_jaeger_type_messaging.approved.json b/processor/otel/test_approved/transaction_jaeger_type_messaging.approved.json index d9ca4da167d..1fe49b9bcd4 100644 --- a/processor/otel/test_approved/transaction_jaeger_type_messaging.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_type_messaging.approved.json @@ -16,7 +16,7 @@ "name": "host-abc" }, "parent": { - "id": "61626364" + "id": "0000000061626364" }, "processor": { "event": "transaction", diff --git a/processor/otel/test_approved/transaction_jaeger_type_request.approved.json b/processor/otel/test_approved/transaction_jaeger_type_request.approved.json index b8ea71c8f77..a7384f462ca 100644 --- a/processor/otel/test_approved/transaction_jaeger_type_request.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_type_request.approved.json @@ -24,7 +24,7 @@ "http_protocol": "HTTP" }, "parent": { - "id": "61626364" + "id": "0000000061626364" }, "processor": { "event": "transaction", diff --git a/processor/otel/test_approved/transaction_jaeger_type_request_result.approved.json b/processor/otel/test_approved/transaction_jaeger_type_request_result.approved.json index cc9d4b28eed..f0307e59e43 100644 --- a/processor/otel/test_approved/transaction_jaeger_type_request_result.approved.json +++ b/processor/otel/test_approved/transaction_jaeger_type_request_result.approved.json @@ -21,7 +21,7 @@ } }, "parent": { - "id": "61626364" + "id": "0000000061626364" }, "processor": { "event": "transaction", diff --git a/testdata/jaeger/batch_0.approved.json b/testdata/jaeger/batch_0.approved.json index e30bc33d761..45221240edf 100644 --- a/testdata/jaeger/batch_0.approved.json +++ b/testdata/jaeger/batch_0.approved.json @@ -40,7 +40,7 @@ "us": 1576827704953864 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "duration": { @@ -96,7 +96,7 @@ "us": 1576827705007552 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", @@ -146,7 +146,7 @@ "us": 1576827705089431 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", @@ -196,7 +196,7 @@ "us": 1576827705172530 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", diff --git a/testdata/jaeger/batch_1.approved.json b/testdata/jaeger/batch_1.approved.json index a3ed2194171..b9926744680 100644 --- a/testdata/jaeger/batch_1.approved.json +++ b/testdata/jaeger/batch_1.approved.json @@ -46,7 +46,7 @@ "us": 1576827704954062 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -95,7 +95,7 @@ "us": 1576827704973809 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -144,7 +144,7 @@ "us": 1576827705007578 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -193,7 +193,7 @@ "us": 1576827705016845 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -242,7 +242,7 @@ "us": 1576827705029415 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -291,7 +291,7 @@ "us": 1576827705040082 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -340,7 +340,7 @@ "us": 1576827705054046 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -389,7 +389,7 @@ "us": 1576827705089459 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -438,7 +438,7 @@ "us": 1576827705101278 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -487,7 +487,7 @@ "us": 1576827705113531 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -536,7 +536,7 @@ "us": 1576827705125567 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -577,7 +577,7 @@ "duration": { "us": 39602 }, - "id": "242ee3774d9eab1", + "id": "0242ee3774d9eab1", "name": "GetDriver", "type": "custom" }, @@ -585,7 +585,7 @@ "us": 1576827705132896 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -634,7 +634,7 @@ "us": 1576827705172618 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -683,7 +683,7 @@ "us": 1576827705186670 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -729,7 +729,7 @@ "us": 1576827705006847 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -775,7 +775,7 @@ "us": 1576827705089372 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } }, { @@ -802,7 +802,7 @@ "name": "host01" }, "parent": { - "id": "242ee3774d9eab1" + "id": "0242ee3774d9eab1" }, "processor": { "event": "error", @@ -821,7 +821,7 @@ "us": 1576827705172347 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" } } ] diff --git a/tests/system/jaeger_batch_0.approved.json b/tests/system/jaeger_batch_0.approved.json index 61912285546..55a263fc3e3 100644 --- a/tests/system/jaeger_batch_0.approved.json +++ b/tests/system/jaeger_batch_0.approved.json @@ -51,7 +51,7 @@ "us": 1576827704953864 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "duration": { @@ -121,7 +121,7 @@ "us": 1576827705007552 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", @@ -185,7 +185,7 @@ "us": 1576827705089431 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", @@ -249,7 +249,7 @@ "us": 1576827705172530 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", diff --git a/tests/system/jaeger_batch_0_auth_tag_removed.approved.json b/tests/system/jaeger_batch_0_auth_tag_removed.approved.json index a56146f4f8b..44c08a2204e 100644 --- a/tests/system/jaeger_batch_0_auth_tag_removed.approved.json +++ b/tests/system/jaeger_batch_0_auth_tag_removed.approved.json @@ -51,7 +51,7 @@ "us": 1576827704953864 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "duration": { @@ -121,7 +121,7 @@ "us": 1576827705007552 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", @@ -185,7 +185,7 @@ "us": 1576827705089431 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", @@ -249,7 +249,7 @@ "us": 1576827705172530 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", diff --git a/tests/system/jaeger_batch_0_authorization.approved.json b/tests/system/jaeger_batch_0_authorization.approved.json index ea84aa0deb3..781bc75aeb6 100644 --- a/tests/system/jaeger_batch_0_authorization.approved.json +++ b/tests/system/jaeger_batch_0_authorization.approved.json @@ -51,7 +51,7 @@ "us": 1576827704953864 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "duration": { @@ -121,7 +121,7 @@ "us": 1576827705007552 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", @@ -185,7 +185,7 @@ "us": 1576827705089431 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", @@ -249,7 +249,7 @@ "us": 1576827705172530 }, "trace": { - "id": "7be2fd98d0973be3" + "id": "00000000000000007be2fd98d0973be3" }, "transaction": { "id": "7be2fd98d0973be3", diff --git a/tests/system/jaeger_span.approved.json b/tests/system/jaeger_span.approved.json index 1a9d52985f8..d1bbb9aaa8e 100644 --- a/tests/system/jaeger_span.approved.json +++ b/tests/system/jaeger_span.approved.json @@ -47,7 +47,7 @@ "us": 1578451731616515 }, "trace": { - "id": "5025e08c7fef6542" + "id": "00000000000000005025e08c7fef6542" }, "transaction": { "duration": {