span id to hex

CHANGELOG.md

@@ -8,6 +8,7 @@
 * [BUGFIX] Apply `rate()` to bytes/s panel in tenant's dashboard. [#2081](https://github.com/grafana/tempo/pull/2081) (@mapno)
 * [BUGFIX] Correctly coalesce trace level data when combining Parquet traces. [#2095](https://github.com/grafana/tempo/pull/2095) (@joe-elliott)
 * [CHANGE] Update Go to 1.20 [#2079](https://github.com/grafana/tempo/pull/2079) (@scalalang2)
+* [CHANGE] Removing leading zeroes in span id [#2062](https://github.com/grafana/tempo/pull/2062) (@ie-pham)
 
 ## v2.0.0 / 2023-01-31
 

pkg/traceql/engine.go

@@ -126,7 +126,7 @@ func (e *Engine) asTraceSearchMetadata(spanset Spanset) *tempopb.TraceSearchMeta
 
 	for _, span := range spanset.Spans {
 		tempopbSpan := &tempopb.Span{
-			SpanID:            util.TraceIDToHexString(span.ID),
+			SpanID:            util.SpanIDToHexString(span.ID),
 			StartTimeUnixNano: span.StartTimeUnixNanos,
 			DurationNanos:     span.EndtimeUnixNanos - span.StartTimeUnixNanos,
 			Attributes:        nil,

pkg/traceql/engine_test.go

@@ -90,7 +90,7 @@ func TestEngine_Execute(t *testing.T) {
 			SpanSet: &tempopb.SpanSet{
 				Spans: []*tempopb.Span{
 					{
-						SpanID:            "2",
+						SpanID:            "0000000000000002",
 						StartTimeUnixNano: uint64(now.UnixNano()),
 						DurationNanos:     100_000_000,
 						Attributes: []*v1.KeyValue{
@@ -187,7 +187,7 @@ func TestEngine_asTraceSearchMetadata(t *testing.T) {
 			Matched: 2,
 			Spans: []*tempopb.Span{
 				{
-					SpanID:            util.TraceIDToHexString(spanID1),
+					SpanID:            util.SpanIDToHexString(spanID1),
 					Name:              "HTTP GET",
 					StartTimeUnixNano: uint64(now.UnixNano()),
 					DurationNanos:     10_000_000_000,
@@ -235,7 +235,7 @@ func TestEngine_asTraceSearchMetadata(t *testing.T) {
 					},
 				},
 				{
-					SpanID:            util.TraceIDToHexString(spanID2),
+					SpanID:            util.SpanIDToHexString(spanID2),
 					StartTimeUnixNano: uint64(now.Add(2 * time.Second).UnixNano()),
 					DurationNanos:     18_000_000_000,
 					Attributes:        nil,

pkg/util/traceid.go

@@ -51,6 +51,14 @@ func TraceIDToHexString(byteID []byte) string {
 	return id
 }
 
+// SpanIDToHexString converts a span ID to its string representation and WITHOUT removing any leading zeros.
+// If the id is < 16, left pad with 0s
+func SpanIDToHexString(byteID []byte) string {
+	id := hex.EncodeToString(byteID)
+	id = strings.TrimLeft(id, "0")
+	return fmt.Sprintf("%016s", id)
+}
+
 // EqualHexStringTraceIDs compares two trace ID strings and compares the
 // resulting bytes after padding.  Returns true unless there is a reason not
 // to.

pkg/util/traceid_test.go

@@ -89,6 +89,46 @@ func TestTraceIDToHexString(t *testing.T) {
 	}
 }
 
+func TestSpanIDToHexString(t *testing.T) {
+	tc := []struct {
+		byteID []byte
+		spanID string
+	}{
+		{
+			byteID: []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12},
+			spanID: "0000000000000012",
+		},
+		{
+			byteID: []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef},
+			spanID: "1234567890abcdef", // 64 bit
+		},
+		{
+			byteID: []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0xa0},
+			spanID: "00000000000012a0", // trailing zero
+		},
+		{
+			byteID: []byte{0x12, 0xa0},
+			spanID: "00000000000012a0", // less than 64 bytes
+		},
+		{
+			byteID: []byte{0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef, 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef},
+			spanID: "1234567890abcdef1234567890abcdef", // 128 bit
+		},
+		{
+			byteID: []byte{0x00, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef, 0x12, 0x34, 0x56, 0x78, 0x90, 0xab, 0xcd, 0xef},
+			spanID: "34567890abcdef1234567890abcdef", // 128 bit with leading zeroes
+		},
+	}
+
+	for _, tt := range tc {
+		t.Run(tt.spanID, func(t *testing.T) {
+			actual := SpanIDToHexString(tt.byteID)
+
+			assert.Equal(t, tt.spanID, actual)
+		})
+	}
+}
+
 func TestEqualHexStringTraceIDs(t *testing.T) {
 	a := "82f6471b46d25e23418a0a99d4c2cda"
 	b := "082f6471b46d25e23418a0a99d4c2cda"