Fixed traceparent header for tracing grpc requests + * Added method ID() into spans.Span interface

Author: asmyasnikov

CHANGELOG.md

@@ -1,3 +1,6 @@
+* Small broken change: added method `ID()` into `spans.Span` interface (need to implement in adapter) 
+* Fixed traceparent header for tracing grpc requests
+
 ## v3.90.0
 * Fixed closing of child driver with shared balancer
 

spans/driver.go

@@ -8,10 +8,24 @@ import (
 	"sync/atomic"
 
 	"github.com/ydb-platform/ydb-go-sdk/v3/internal/kv"
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xstring"
 	"github.com/ydb-platform/ydb-go-sdk/v3/meta"
 	"github.com/ydb-platform/ydb-go-sdk/v3/trace"
 )
 
+func traceparent(traceID string, spanID string) string {
+	b := xstring.Buffer()
+	defer b.Free()
+
+	b.WriteString("00-")
+	b.WriteString(traceID)
+	b.WriteByte('-')
+	b.WriteString(spanID)
+	b.WriteString("-0")
+
+	return b.String()
+}
+
 // driver makes driver with publishing traces
 func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
 	return trace.Driver{
@@ -56,9 +70,7 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
 			if adapter.Details()&trace.DriverConnEvents == 0 {
 				return nil
 			}
-			if traceID, valid := adapter.SpanFromContext(*info.Context).TraceID(); valid {
-				*info.Context = meta.WithTraceParent(*info.Context, traceID)
-			}
+
 			start := childSpanWithReplaceCtx(
 				adapter,
 				info.Context,
@@ -67,6 +79,12 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
 				kv.String("method", string(info.Method)),
 			)
 
+			if id, valid := start.ID(); valid {
+				if traceID, valid := start.TraceID(); valid {
+					*info.Context = meta.WithTraceParent(*info.Context, traceparent(traceID, id))
+				}
+			}
+
 			return func(info trace.DriverConnInvokeDoneInfo) {
 				fields := []KeyValue{
 					kv.String("opID", info.OpID),
@@ -101,8 +119,10 @@ func driver(adapter Adapter) trace.Driver { //nolint:gocyclo,funlen
 				kv.String("method", string(info.Method)),
 			)
 
-			if traceID, valid := start.TraceID(); valid {
-				*info.Context = meta.WithTraceParent(*info.Context, traceID)
+			if id, valid := start.ID(); valid {
+				if traceID, valid := start.TraceID(); valid {
+					*info.Context = meta.WithTraceParent(*info.Context, traceparent(traceID, id))
+				}
 			}
 
 			return func(info trace.DriverConnNewStreamDoneInfo) {

spans/driver_test.go

@@ -0,0 +1,71 @@
+package spans
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/ydb-platform/ydb-go-sdk/v3/internal/xstring"
+)
+
+func traceparentFmt(traceID string, spanID string) string {
+	return fmt.Sprintf("00-%s-%s-0", traceID, spanID)
+}
+
+func BenchmarkTraceparentFmt(b *testing.B) {
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		traceparent := traceparentFmt("8e3790822789a6917883e08d0eeb783e", "729d847ca290963e")
+		require.Equal(b, "00-8e3790822789a6917883e08d0eeb783e-729d847ca290963e-0", traceparent)
+	}
+}
+
+func traceparentBuilder(traceID string, spanID string) string {
+	var b strings.Builder
+	b.WriteString("00-")
+	b.WriteString(traceID)
+	b.WriteByte('-')
+	b.WriteString(spanID)
+	b.WriteString("-0")
+
+	return b.String()
+}
+
+func BenchmarkTraceparentBuilder(b *testing.B) {
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		traceparent := traceparentBuilder("8e3790822789a6917883e08d0eeb783e", "729d847ca290963e")
+		require.Equal(b, "00-8e3790822789a6917883e08d0eeb783e-729d847ca290963e-0", traceparent)
+	}
+}
+
+func traceparentBuffer(traceID string, spanID string) string {
+	b := xstring.Buffer()
+	defer b.Free()
+
+	b.WriteString("00-")
+	b.WriteString(traceID)
+	b.WriteByte('-')
+	b.WriteString(spanID)
+	b.WriteString("-0")
+
+	return b.String()
+}
+
+func BenchmarkTraceparentBuffer(b *testing.B) {
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		traceparent := traceparentBuffer("8e3790822789a6917883e08d0eeb783e", "729d847ca290963e")
+		require.Equal(b, "00-8e3790822789a6917883e08d0eeb783e-729d847ca290963e-0", traceparent)
+	}
+}
+
+func BenchmarkTraceparent(b *testing.B) {
+	b.ReportAllocs()
+	for i := 0; i < b.N; i++ {
+		traceparent := traceparent("8e3790822789a6917883e08d0eeb783e", "729d847ca290963e")
+		require.Equal(b, "00-8e3790822789a6917883e08d0eeb783e-729d847ca290963e-0", traceparent)
+	}
+}

spans/spans.go

@@ -15,6 +15,7 @@ type (
 	//
 	// Experimental: https://github.com/ydb-platform/ydb-go-sdk/blob/master/VERSIONING.md#experimental
 	Span interface {
+		ID() (_ string, valid bool)
 		TraceID() (_ string, valid bool)
 
 		Link(link Span, attributes ...KeyValue)