Merge remote-tracking branch 'upstream/master' into add-metrics

ofekshenawa · ofekshenawa · commit 168f9180dd90 · 2025-12-04T16:14:45.000+02:00
diff --git a/extra/redisotel/metrics.go b/extra/redisotel/metrics.go
@@ -330,6 +330,9 @@ func milliseconds(d time.Duration) float64 {
 
 func statusAttr(err error) attribute.KeyValue {
 	if err != nil {
+		if  err == redis.Nil {
+			return attribute.String("status", "nil")
+		}
 		return attribute.String("status", "error")
 	}
 	return attribute.String("status", "ok")

Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,9 @@ func milliseconds(d time.Duration) float64 {`
`330`	`330`
`331`	`331`	`func statusAttr(err error) attribute.KeyValue {`
`332`	`332`	`if err != nil {`
	`333`	`+ if err == redis.Nil {`
	`334`	`+ return attribute.String("status", "nil")`
	`335`	`+ }`
`333`	`336`	`return attribute.String("status", "error")`
`334`	`337`	`}`
`335`	`338`	`return attribute.String("status", "ok")`