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

@@ -6,13 +6,19 @@
 package valkey
 
 import (
+	"github.com/valkey-io/valkey-go"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal"
 	"gopkg.in/DataDog/dd-trace-go.v1/internal/namingschema"
 )
 
 type config struct {
 	rawCommand  bool
 	serviceName string
+	errCheck    func(err error) bool
+}
+
+var defaultErrCheck = func(err error) bool {
+	return err != nil && !valkey.IsValkeyNil(err)
 }
 
 // Option represents an option that can be used to create or wrap a client.
@@ -23,6 +29,7 @@ func defaultConfig() *config {
 		// Do not include the raw command by default since it could contain sensitive data.
 		rawCommand:  internal.BoolEnv("DD_TRACE_VALKEY_RAW_COMMAND", false),
 		serviceName: namingschema.ServiceName(defaultServiceName),
+		errCheck:    defaultErrCheck,
 	}
 }
 
@@ -40,3 +47,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

@@ -60,6 +60,9 @@ func NewClient(clientOption valkey.ClientOption, opts ...Option) (valkey.Client,
 	for _, fn := range opts {
 		fn(cfg)
 	}
+	if cfg.errCheck == nil {
+		cfg.errCheck = defaultErrCheck
+	}
 	tClient := &client{
 		client:  valkeyClient,
 		cfg:     cfg,
@@ -80,14 +83,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, firstError(c.cfg.errCheck, resp))
 	return resp
 }
 
@@ -109,7 +112,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, firstError(c.cfg.errCheck, resp))
 	return resp
 }
 
@@ -207,7 +210,7 @@ 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.cfg.errCheck(err) {
 		opts = append(opts, tracer.WithError(err))
 	}
 	span.Finish(opts...)
@@ -267,9 +270,9 @@ func multiCommand(cmds []command) command {
 	}
 }
 
-func firstError(s []valkey.ValkeyResult) error {
+func firstError(errCheck func(error) bool, s []valkey.ValkeyResult) error {
 	for _, result := range s {
-		if err := result.Error(); err != nil && !valkey.IsValkeyNil(err) {
+		if err := result.Error(); errCheck(err) {
 			return err
 		}
 	}