fix(valkey): Make error checking configurable

All tracer.WithError calls first run through a configurable
error check function.

Author: rwynn

Diff for: contrib/valkey-go/option.go

@@ -13,6 +13,7 @@ import (
 type config struct {
 	rawCommand  bool
 	serviceName string
+	errCheck    func(err error) bool
 }
 
 // Option represents an option that can be used to create or wrap a client.
@@ -40,3 +41,11 @@ func WithServiceName(name string) Option {
 		cfg.serviceName = name
 	}
 }
+
+// WithErrorCheck specifies a function fn which determines whether the passed
+// error should be marked as an error.
+func WithErrorCheck(fn func(err error) bool) Option {
+	return func(cfg *config) {
+		cfg.errCheck = fn
+	}
+}

Diff for: contrib/valkey-go/valkey.go

@@ -80,14 +80,14 @@ func (c *client) Do(ctx context.Context, cmd valkey.Completed) valkey.ValkeyResu
 	span, ctx := c.startSpan(ctx, processCommand(&cmd))
 	resp := c.client.Do(ctx, cmd)
 	setClientCacheTags(span, resp)
-	span.Finish(tracer.WithError(resp.Error()))
+	c.finishSpan(span, resp.Error())
 	return resp
 }
 
 func (c *client) DoMulti(ctx context.Context, multi ...valkey.Completed) []valkey.ValkeyResult {
 	span, ctx := c.startSpan(ctx, processCommandMulti(multi))
 	resp := c.client.DoMulti(ctx, multi...)
-	c.finishSpan(span, firstError(resp))
+	c.finishSpan(span, c.firstError(resp))
 	return resp
 }
 
@@ -109,7 +109,7 @@ func (c *client) DoCache(ctx context.Context, cmd valkey.Cacheable, ttl time.Dur
 func (c *client) DoMultiCache(ctx context.Context, multi ...valkey.CacheableTTL) []valkey.ValkeyResult {
 	span, ctx := c.startSpan(ctx, processCommandMultiCache(multi))
 	resp := c.client.DoMultiCache(ctx, multi...)
-	c.finishSpan(span, firstError(resp))
+	c.finishSpan(span, c.firstError(resp))
 	return resp
 }
 
@@ -207,12 +207,27 @@ func (c *client) startSpan(ctx context.Context, cmd command) (tracer.Span, conte
 
 func (c *client) finishSpan(span tracer.Span, err error) {
 	var opts []tracer.FinishOption
-	if err != nil && !valkey.IsValkeyNil(err) {
+	if c.isTracedError(err) {
 		opts = append(opts, tracer.WithError(err))
 	}
 	span.Finish(opts...)
 }
 
+func (c *client) firstError(s []valkey.ValkeyResult) error {
+	for _, result := range s {
+		if err := result.Error(); c.isTracedError(err) {
+			return err
+		}
+	}
+	return nil
+}
+
+func (c *client) isTracedError(err error) bool {
+	return err != nil &&
+		!valkey.IsValkeyNil(err) &&
+		(c.cfg.errCheck == nil || c.cfg.errCheck(err))
+}
+
 type commander interface {
 	Commands() []string
 }
@@ -267,15 +282,6 @@ func multiCommand(cmds []command) command {
 	}
 }
 
-func firstError(s []valkey.ValkeyResult) error {
-	for _, result := range s {
-		if err := result.Error(); err != nil && !valkey.IsValkeyNil(err) {
-			return err
-		}
-	}
-	return nil
-}
-
 func setClientCacheTags(s tracer.Span, result valkey.ValkeyResult) {
 	s.SetTag(ext.ValkeyClientCacheHit, result.IsCacheHit())
 	s.SetTag(ext.ValkeyClientCacheTTL, result.CacheTTL())

Diff for: contrib/valkey-go/valkey_test.go

@@ -6,6 +6,7 @@ package valkey
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"testing"
@@ -260,6 +261,32 @@ func TestNewClient(t *testing.T) {
 			},
 			wantServiceName: "global-service",
 		},
+		{
+			name: "Test SET command with canceled context and custom error check",
+			opts: []Option{
+				WithErrorCheck(func(err error) bool {
+					return !errors.Is(err, context.Canceled)
+				}),
+			},
+			runTest: func(t *testing.T, ctx context.Context, client valkey.Client) {
+				ctx, cancel := context.WithCancel(ctx)
+				cancel()
+				require.Error(t, client.Do(ctx, client.B().Set().Key("test_key").Value("test_value").Build()).Error())
+			},
+			assertSpans: func(t *testing.T, spans []mocktracer.Span) {
+				require.Len(t, spans, 1)
+
+				span := spans[0]
+				assert.Equal(t, "SET", span.Tag(ext.ResourceName))
+				assert.Nil(t, span.Tag(ext.ValkeyRawCommand))
+				assert.Equal(t, false, span.Tag(ext.ValkeyClientCacheHit))
+				assert.Less(t, span.Tag(ext.ValkeyClientCacheTTL), int64(0))
+				assert.Less(t, span.Tag(ext.ValkeyClientCachePXAT), int64(0))
+				assert.Less(t, span.Tag(ext.ValkeyClientCachePTTL), int64(0))
+				assert.Nil(t, span.Tag(ext.Error))
+			},
+			wantServiceName: "global-service",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {