Set server.* attrs in more cases (#95)

* Set `server.*` attrs in more cases

https://opentelemetry.io/docs/specs/semconv/registry/attributes/server/

Signed-off-by: Austin Drenski <[email protected]>

* Keep server attrs separate from user-provided trace attrs

Signed-off-by: Austin Drenski <[email protected]>

* Update valkeyotel/trace.go

Co-authored-by: Copilot <[email protected]>
Signed-off-by: Rueian <[email protected]>

---------

Signed-off-by: Austin Drenski <[email protected]>
Signed-off-by: Rueian <[email protected]>
Co-authored-by: Rueian <[email protected]>
Co-authored-by: Copilot <[email protected]>

Author: 3 people

valkeyotel/metrics.go

@@ -85,6 +85,10 @@ func NewClient(clientOption valkey.ClientOption, opts ...Option) (valkey.Client,
 		return nil, err
 	}
 
+	if len(clientOption.InitAddress) == 1 {
+		oclient.sAttrs = serverAttrs(clientOption.InitAddress[0])
+	}
+
 	if clientOption.DialCtxFn == nil {
 		clientOption.DialCtxFn = defaultDialFn
 		if clientOption.DialFn != nil {
@@ -136,6 +140,7 @@ func NewClient(clientOption valkey.ClientOption, opts ...Option) (valkey.Client,
 
 func newClient(opts ...Option) (*otelclient, error) {
 	cli := &otelclient{
+		sAttrs: trace.WithAttributes(),
 		tAttrs: trace.WithAttributes(),
 	}
 	for _, opt := range opts {
@@ -235,7 +240,7 @@ func defaultDialFn(ctx context.Context, dst string, dialer *net.Dialer, cfg *tls
 	return dialer.DialContext(ctx, "tcp", dst)
 }
 
-func serverAttrs(dst string) trace.SpanStartOption {
+func serverAttrs(dst string) trace.SpanStartEventOption {
 	if addr, port, err := net.SplitHostPort(dst); err == nil {
 		if port, err := strconv.Atoi(port); err == nil {
 			return trace.WithAttributes(attribute.String("server.address", addr), attribute.Int("server.port", port))

valkeyotel/trace.go

@@ -163,6 +163,7 @@ type otelclient struct {
 	meter           metric.Meter
 	cscMiss         metric.Int64Counter
 	cscHits         metric.Int64Counter
+	sAttrs          trace.SpanStartEventOption
 	tAttrs          trace.SpanStartEventOption
 	dbStmtFunc      StatementFunc
 	addOpts         []metric.AddOption
@@ -269,6 +270,7 @@ func (o *otelclient) Dedicated(fn func(valkey.DedicatedClient) error) (err error
 	return o.client.Dedicated(func(client valkey.DedicatedClient) error {
 		return fn(&dedicated{
 			client:         client,
+			sAttrs:         o.sAttrs,
 			tAttrs:         o.tAttrs,
 			tracer:         o.tracer,
 			dbStmtFunc:     o.dbStmtFunc,
@@ -281,6 +283,7 @@ func (o *otelclient) Dedicate() (valkey.DedicatedClient, func()) {
 	client, cancel := o.client.Dedicate()
 	return &dedicated{
 		client:         client,
+		sAttrs:         o.sAttrs,
 		tAttrs:         o.tAttrs,
 		tracer:         o.tracer,
 		dbStmtFunc:     o.dbStmtFunc,
@@ -312,6 +315,7 @@ func (o *otelclient) Nodes() map[string]valkey.Client {
 			cscHits:         o.cscHits,
 			addOpts:         o.addOpts,
 			recordOpts:      o.recordOpts,
+			sAttrs:          serverAttrs(addr),
 			tAttrs:          o.tAttrs,
 			histogramOption: o.histogramOption,
 			dbStmtFunc:      o.dbStmtFunc,
@@ -350,6 +354,7 @@ var _ valkey.DedicatedClient = (*dedicated)(nil)
 type dedicated struct {
 	client     valkey.DedicatedClient
 	tracer     trace.Tracer
+	sAttrs     trace.SpanStartEventOption
 	tAttrs     trace.SpanStartEventOption
 	dbStmtFunc StatementFunc
 	commandMetrics
@@ -489,23 +494,23 @@ func multiCacheableFirst(multi []valkey.CacheableTTL) string {
 }
 
 func (o *otelclient) start(ctx context.Context, op string, size int) (context.Context, trace.Span) {
-	return startSpan(o.tracer, ctx, op, size, o.tAttrs)
+	return startSpan(o.tracer, ctx, op, size, o.sAttrs, o.tAttrs)
 }
 
 func (o *otelclient) end(span trace.Span, err error) {
 	endSpan(span, err)
 }
 
 func (d *dedicated) start(ctx context.Context, op string, size int) (context.Context, trace.Span) {
-	return startSpan(d.tracer, ctx, op, size, d.tAttrs)
+	return startSpan(d.tracer, ctx, op, size, d.sAttrs, d.tAttrs)
 }
 
 func (d *dedicated) end(span trace.Span, err error) {
 	endSpan(span, err)
 }
 
-func startSpan(tracer trace.Tracer, ctx context.Context, op string, size int, attrs trace.SpanStartEventOption) (context.Context, trace.Span) {
-	return tracer.Start(ctx, op, kind, attr(op, size), attrs)
+func startSpan(tracer trace.Tracer, ctx context.Context, op string, size int, sAttrs trace.SpanStartEventOption, tAttrs trace.SpanStartEventOption) (context.Context, trace.Span) {
+	return tracer.Start(ctx, op, kind, attr(op, size), sAttrs, tAttrs)
 }
 
 func endSpan(span trace.Span, err error) {

valkeyotel/trace_test.go

@@ -297,13 +297,8 @@ func validateTrace(t *testing.T, exp *tracetest.InMemoryExporter, op string, cod
 	if name := exp.GetSpans().Snapshots()[0].Name(); name != op {
 		t.Fatalf("unexpected span name %v", name)
 	}
-	if operation := exp.GetSpans().Snapshots()[0].Attributes()[1].Value.AsString(); operation != op {
-		t.Fatalf("unexpected span name %v", operation)
-	}
-	customAttr := exp.GetSpans().Snapshots()[0].Attributes()[3]
-	if string(customAttr.Key) != "any" || customAttr.Value.AsString() != "label" {
-		t.Fatalf("unexpected custom attr %v", customAttr)
-	}
+	validateSpanHasAttribute(t, exp.GetSpans().Snapshots()[0], attribute.String("db.operation", op))
+	validateSpanHasAttribute(t, exp.GetSpans().Snapshots()[0], attribute.String("any", "label"))
 	if c := exp.GetSpans().Snapshots()[0].Status().Code; c != code {
 		t.Fatalf("unexpected span status code %v", c)
 	}