trim leading zeros

douyu · Jan 20, 2025 · 9666f8c · 9666f8c
1 parent 3a9e02f
commit 9666f8c
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/pkg/core/xtrace/propagation.go b/pkg/core/xtrace/propagation.go
@@ -17,7 +17,7 @@ const (
 	traceID128bitsWidth = 128 / 4
 	spanIDWidth         = 64 / 4
 
-	// idPaddingChar = "0"
+	idPaddingChar = "0"
 
 	flagsDebug      = 0x02
 	flagsSampled    = 0x01
@@ -54,7 +54,9 @@ func (jaeger Jaeger) Inject(ctx context.Context, carrier propagation.TextMapCarr
 	if !sc.TraceID().IsValid() || !sc.SpanID().IsValid() {
 		return
 	}
-	headers = append(headers, sc.TraceID().String(), sc.SpanID().String(), deprecatedParentSpanID)
+	// trim leading zeros
+	tid := strings.TrimLeft(sc.TraceID().String(), "0")
+	headers = append(headers, tid, sc.SpanID().String(), deprecatedParentSpanID)
 	if debugFromContext(ctx) {
 		headers = append(headers, fmt.Sprintf("%x", flagsDebug|flagsSampled))
 	} else if sc.IsSampled() {
@@ -96,11 +98,11 @@ func extract(ctx context.Context, headerVal string) (context.Context, trace.Span
 		if len(id) > traceID128bitsWidth {
 			return ctx, empty, errInvalidTraceIDLength
 		}
-		// // padding when length is less than 32
-		// if len(id) < traceID128bitsWidth {
-		// 	padCharCount := traceID128bitsWidth - len(id)
-		// 	id = strings.Repeat(idPaddingChar, padCharCount) + id
-		// }
+		// padding when length is less than 32
+		if len(id) < traceID128bitsWidth {
+			padCharCount := traceID128bitsWidth - len(id)
+			id = strings.Repeat(idPaddingChar, padCharCount) + id
+		}
 		scc.TraceID, err = trace.TraceIDFromHex(id)
 		if err != nil {
 			return ctx, empty, errMalformedTraceID
@@ -113,11 +115,11 @@ func extract(ctx context.Context, headerVal string) (context.Context, trace.Span
 		if len(id) > spanIDWidth {
 			return ctx, empty, errInvalidSpanIDLength
 		}
-		// // padding when length is less than 16
-		// if len(id) < spanIDWidth {
-		// 	padCharCount := spanIDWidth - len(id)
-		// 	id = strings.Repeat(idPaddingChar, padCharCount) + id
-		// }
+		// padding when length is less than 16
+		if len(id) < spanIDWidth {
+			padCharCount := spanIDWidth - len(id)
+			id = strings.Repeat(idPaddingChar, padCharCount) + id
+		}
 		scc.SpanID, err = trace.SpanIDFromHex(id)
 		if err != nil {
 			return ctx, empty, errMalformedSpanID