Do not strip leading 0s from traceIds and spanIds if the span source …

…is jaeger (elastic#4671) (elastic#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 <[email protected]>
axw · Feb 18, 2021 · 05f5a8a · 05f5a8a
1 parent fd7458b
commit 05f5a8a
Show file tree

Hide file tree

Showing 23 changed files with 108 additions and 140 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -16,7 +16,7 @@
                 "name": "host-abc"
             },
             "parent": {
-                "id": "58585858"
+                "id": "0000000058585858"
             },
             "processor": {
                 "event": "span",
@@ -35,15 +35,15 @@
                 "duration": {
                     "us": 79000000
                 },
-                "id": "41414646",
+                "id": "0000000041414646",
                 "name": "",
                 "type": "custom"
             },
             "timestamp": {
                 "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
@@ -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
@@ -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
@@ -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
@@ -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"
             }
         }
     ]