Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions extra/redisotel/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package redisotel

import (
"context"
"errors"
"fmt"
"net"
"sync"
Expand Down Expand Up @@ -271,9 +272,10 @@ func (mh *metricsHook) DialHook(hook redis.DialHook) redis.DialHook {

dur := time.Since(start)

attrs := make([]attribute.KeyValue, 0, len(mh.attrs)+1)
attrs := make([]attribute.KeyValue, 0, len(mh.attrs)+2)
attrs = append(attrs, mh.attrs...)
attrs = append(attrs, statusAttr(err))
attrs = append(attrs, errorTypeAttribute(err))

mh.createTime.Record(ctx, milliseconds(dur), metric.WithAttributeSet(attribute.NewSet(attrs...)))
return conn, err
Expand All @@ -288,10 +290,11 @@ func (mh *metricsHook) ProcessHook(hook redis.ProcessHook) redis.ProcessHook {

dur := time.Since(start)

attrs := make([]attribute.KeyValue, 0, len(mh.attrs)+2)
attrs := make([]attribute.KeyValue, 0, len(mh.attrs)+3)
attrs = append(attrs, mh.attrs...)
attrs = append(attrs, attribute.String("type", "command"))
attrs = append(attrs, statusAttr(err))
attrs = append(attrs, errorTypeAttribute(err))

mh.useTime.Record(ctx, milliseconds(dur), metric.WithAttributeSet(attribute.NewSet(attrs...)))

Expand All @@ -309,10 +312,11 @@ func (mh *metricsHook) ProcessPipelineHook(

dur := time.Since(start)

attrs := make([]attribute.KeyValue, 0, len(mh.attrs)+2)
attrs := make([]attribute.KeyValue, 0, len(mh.attrs)+3)
attrs = append(attrs, mh.attrs...)
attrs = append(attrs, attribute.String("type", "pipeline"))
attrs = append(attrs, statusAttr(err))
attrs = append(attrs, errorTypeAttribute(err))

mh.useTime.Record(ctx, milliseconds(dur), metric.WithAttributeSet(attribute.NewSet(attrs...)))

Expand All @@ -330,3 +334,16 @@ func statusAttr(err error) attribute.KeyValue {
}
return attribute.String("status", "ok")
}

func errorTypeAttribute(err error) attribute.KeyValue {
switch {
case err == nil:
return attribute.String("error_type", "none")
case errors.Is(err, context.Canceled):
return attribute.String("error_type", "context_canceled")
case errors.Is(err, context.DeadlineExceeded):
return attribute.String("error_type", "context_timeout")
default:
return attribute.String("error_type", "other")
}
}
Loading