add meter support
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
parent
2245314c2f
commit
98e1f754e0
2
go.mod
2
go.mod
@ -4,7 +4,7 @@ go 1.20
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/redis/go-redis/v9 v9.2.1
|
github.com/redis/go-redis/v9 v9.2.1
|
||||||
go.unistack.org/micro/v3 v3.10.28
|
go.unistack.org/micro/v3 v3.10.62
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
|
4
go.sum
4
go.sum
@ -8,5 +8,5 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
|
|||||||
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
|
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
|
||||||
github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
|
github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
|
||||||
github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
|
github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
|
||||||
go.unistack.org/micro/v3 v3.10.28 h1:/87lGekrmi0/66pioy+Nh8lVUBBYnVqKoHiNYX5OmMI=
|
go.unistack.org/micro/v3 v3.10.62 h1:PCwLSt3W53UGosH/5qU3kU0iJxK8jlKOm9p4v/Zti5o=
|
||||||
go.unistack.org/micro/v3 v3.10.28/go.mod h1:eUgtvbtiiz6te93m0ZdmoecbitWwjdBmmr84srmEIKA=
|
go.unistack.org/micro/v3 v3.10.62/go.mod h1:erMgt3Bl7vQQ0e9UpQyR5NlLiZ9pKeEJ9+1tfYFaqUg=
|
||||||
|
436
redis.go
436
redis.go
@ -7,13 +7,45 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/redis/go-redis/v9"
|
redis "github.com/redis/go-redis/v9"
|
||||||
|
"go.unistack.org/micro/v3/semconv"
|
||||||
"go.unistack.org/micro/v3/store"
|
"go.unistack.org/micro/v3/store"
|
||||||
|
pool "go.unistack.org/micro/v3/util/xpool"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
DefaultPathSeparator = "/"
|
||||||
|
|
||||||
|
DefaultClusterOptions = &redis.ClusterOptions{
|
||||||
|
Username: "",
|
||||||
|
Password: "", // no password set
|
||||||
|
MaxRetries: 2,
|
||||||
|
MaxRetryBackoff: 256 * time.Millisecond,
|
||||||
|
DialTimeout: 1 * time.Second,
|
||||||
|
ReadTimeout: 1 * time.Second,
|
||||||
|
WriteTimeout: 1 * time.Second,
|
||||||
|
PoolTimeout: 1 * time.Second,
|
||||||
|
MinIdleConns: 10,
|
||||||
|
}
|
||||||
|
|
||||||
|
DefaultOptions = &redis.Options{
|
||||||
|
Username: "",
|
||||||
|
Password: "", // no password set
|
||||||
|
DB: 0, // use default DB
|
||||||
|
MaxRetries: 2,
|
||||||
|
MaxRetryBackoff: 256 * time.Millisecond,
|
||||||
|
DialTimeout: 1 * time.Second,
|
||||||
|
ReadTimeout: 1 * time.Second,
|
||||||
|
WriteTimeout: 1 * time.Second,
|
||||||
|
PoolTimeout: 1 * time.Second,
|
||||||
|
MinIdleConns: 10,
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
type Store struct {
|
type Store struct {
|
||||||
opts store.Options
|
opts store.Options
|
||||||
cli redisClient
|
cli redisClient
|
||||||
|
pool pool.Pool[strings.Builder]
|
||||||
}
|
}
|
||||||
|
|
||||||
type redisClient interface {
|
type redisClient interface {
|
||||||
@ -51,89 +83,122 @@ func (r *Store) Disconnect(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
|
func (r *Store) Exists(ctx context.Context, key string, opts ...store.ExistsOption) error {
|
||||||
if r.opts.Timeout > 0 {
|
options := store.NewExistsOptions(opts...)
|
||||||
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
|
}
|
||||||
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewExistsOptions(opts...)
|
|
||||||
if len(options.Namespace) == 0 {
|
rkey := r.getKey(r.opts.Namespace, options.Namespace, key)
|
||||||
options.Namespace = r.opts.Namespace
|
ctx, sp := r.opts.Tracer.Start(ctx, "cache read "+rkey)
|
||||||
}
|
defer sp.Finish()
|
||||||
if options.Namespace != "" {
|
|
||||||
key = fmt.Sprintf("%s%s", r.opts.Namespace, key)
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
}
|
ts := time.Now()
|
||||||
val, err := r.cli.Exists(ctx, key).Result()
|
val, err := r.cli.Exists(ctx, rkey).Result()
|
||||||
if err != nil {
|
te := time.Since(ts)
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
|
||||||
|
r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
if err == redis.Nil || (err == nil && val == 0) {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
|
} else if err != nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if val == 0 {
|
|
||||||
return store.ErrNotFound
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
|
func (r *Store) Read(ctx context.Context, key string, val interface{}, opts ...store.ReadOption) error {
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
var cancel context.CancelFunc
|
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
|
||||||
defer cancel()
|
|
||||||
}
|
|
||||||
options := store.NewReadOptions(opts...)
|
options := store.NewReadOptions(opts...)
|
||||||
if len(options.Namespace) == 0 {
|
|
||||||
options.Namespace = r.opts.Namespace
|
timeout := r.opts.Timeout
|
||||||
}
|
if options.Timeout > 0 {
|
||||||
if options.Namespace != "" {
|
timeout = options.Timeout
|
||||||
key = fmt.Sprintf("%s%s", options.Namespace, key)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
buf, err := r.cli.Get(ctx, key).Bytes()
|
if timeout > 0 {
|
||||||
if err != nil && err == redis.Nil {
|
var cancel context.CancelFunc
|
||||||
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
|
defer cancel()
|
||||||
|
}
|
||||||
|
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
|
ts := time.Now()
|
||||||
|
buf, err := r.cli.Get(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).Bytes()
|
||||||
|
te := time.Since(ts)
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
|
||||||
|
r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
if err == redis.Nil || (err == nil && buf == nil) {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
return store.ErrNotFound
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if buf == nil {
|
|
||||||
return store.ErrNotFound
|
switch b := val.(type) {
|
||||||
|
case *[]byte:
|
||||||
|
*b = buf
|
||||||
|
case *string:
|
||||||
|
*b = string(buf)
|
||||||
|
default:
|
||||||
|
err = r.opts.Codec.Unmarshal(buf, val)
|
||||||
}
|
}
|
||||||
return r.opts.Codec.Unmarshal(buf, val)
|
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
|
func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts ...store.ReadOption) error {
|
||||||
if len(keys) == 1 {
|
options := store.NewReadOptions(opts...)
|
||||||
vt := reflect.ValueOf(vals)
|
|
||||||
if vt.Kind() == reflect.Ptr {
|
timeout := r.opts.Timeout
|
||||||
vt = reflect.Indirect(vt)
|
if options.Timeout > 0 {
|
||||||
return r.Read(ctx, keys[0], vt.Index(0).Interface(), opts...)
|
timeout = options.Timeout
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewReadOptions(opts...)
|
|
||||||
rkeys := make([]string, 0, len(keys))
|
if r.opts.Namespace != "" || options.Namespace != "" {
|
||||||
if len(options.Namespace) == 0 {
|
for idx, key := range keys {
|
||||||
options.Namespace = r.opts.Namespace
|
keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
|
||||||
}
|
|
||||||
for _, key := range keys {
|
|
||||||
if options.Namespace != "" {
|
|
||||||
rkeys = append(rkeys, fmt.Sprintf("%s%s", options.Namespace, key))
|
|
||||||
} else {
|
|
||||||
rkeys = append(rkeys, key)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rvals, err := r.cli.MGet(ctx, rkeys...).Result()
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
if err != nil && err == redis.Nil {
|
ts := time.Now()
|
||||||
|
rvals, err := r.cli.MGet(ctx, keys...).Result()
|
||||||
|
te := time.Since(ts)
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
|
||||||
|
r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
if err == redis.Nil || (len(rvals) == 0) {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
return store.ErrNotFound
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if len(rvals) == 0 {
|
|
||||||
return store.ErrNotFound
|
|
||||||
}
|
|
||||||
|
|
||||||
vv := reflect.ValueOf(vals)
|
vv := reflect.ValueOf(vals)
|
||||||
vt := reflect.TypeOf(vals)
|
vt := reflect.TypeOf(vals)
|
||||||
@ -163,9 +228,14 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
|
|||||||
// special case for raw data
|
// special case for raw data
|
||||||
if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
|
if vt.Kind() == reflect.Slice && vt.Elem().Kind() == reflect.Uint8 {
|
||||||
itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
|
itm.Set(reflect.MakeSlice(itm.Type(), len(buf), len(buf)))
|
||||||
} else {
|
itm.SetBytes(buf)
|
||||||
itm.Set(reflect.New(vt.Elem()))
|
continue
|
||||||
|
} else if vt.Kind() == reflect.String {
|
||||||
|
itm.SetString(string(buf))
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
itm.Set(reflect.New(vt.Elem()))
|
||||||
if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
|
if err = r.opts.Codec.Unmarshal(buf, itm.Interface()); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -175,65 +245,97 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
|
func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.DeleteOption) error {
|
||||||
if len(keys) == 1 {
|
options := store.NewDeleteOptions(opts...)
|
||||||
return r.Delete(ctx, keys[0], opts...)
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
}
|
}
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewDeleteOptions(opts...)
|
|
||||||
if len(options.Namespace) == 0 {
|
if r.opts.Namespace != "" || options.Namespace != "" {
|
||||||
options.Namespace = r.opts.Namespace
|
for idx, key := range keys {
|
||||||
|
keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if options.Namespace == "" {
|
|
||||||
return r.cli.Del(ctx, keys...).Err()
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
|
ts := time.Now()
|
||||||
|
err := r.cli.Del(ctx, keys...).Err()
|
||||||
|
te := time.Since(ts)
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
|
||||||
|
r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
if err == redis.Nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
|
} else if err != nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
for idx := range keys {
|
|
||||||
keys[idx] = options.Namespace + keys[idx]
|
return nil
|
||||||
}
|
|
||||||
return r.cli.Del(ctx, keys...).Err()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
|
func (r *Store) Delete(ctx context.Context, key string, opts ...store.DeleteOption) error {
|
||||||
if r.opts.Timeout > 0 {
|
options := store.NewDeleteOptions(opts...)
|
||||||
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
|
}
|
||||||
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewDeleteOptions(opts...)
|
|
||||||
if len(options.Namespace) == 0 {
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
options.Namespace = r.opts.Namespace
|
ts := time.Now()
|
||||||
|
err := r.cli.Del(ctx, r.getKey(r.opts.Namespace, options.Namespace, key)).Err()
|
||||||
|
te := time.Since(ts)
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
|
||||||
|
r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
if err == redis.Nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
|
} else if err != nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
if options.Namespace == "" {
|
|
||||||
return r.cli.Del(ctx, key).Err()
|
return nil
|
||||||
}
|
|
||||||
return r.cli.Del(ctx, fmt.Sprintf("%s%s", options.Namespace, key)).Err()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...store.WriteOption) error {
|
func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, opts ...store.WriteOption) error {
|
||||||
if len(keys) == 1 {
|
options := store.NewWriteOptions(opts...)
|
||||||
return r.Write(ctx, keys[0], vals[0], opts...)
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
}
|
}
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
options := store.NewWriteOptions(opts...)
|
|
||||||
kvs := make([]string, 0, len(keys)*2)
|
kvs := make([]string, 0, len(keys)*2)
|
||||||
|
|
||||||
if len(options.Namespace) == 0 {
|
|
||||||
options.Namespace = r.opts.Namespace
|
|
||||||
}
|
|
||||||
|
|
||||||
for idx, key := range keys {
|
for idx, key := range keys {
|
||||||
if options.Namespace != "" {
|
kvs = append(kvs, r.getKey(r.opts.Namespace, options.Namespace, key))
|
||||||
kvs = append(kvs, fmt.Sprintf("%s%s", options.Namespace, key))
|
|
||||||
} else {
|
|
||||||
kvs = append(kvs, key)
|
|
||||||
}
|
|
||||||
|
|
||||||
switch vt := vals[idx].(type) {
|
switch vt := vals[idx].(type) {
|
||||||
case string:
|
case string:
|
||||||
@ -249,18 +351,39 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
|
ts := time.Now()
|
||||||
|
|
||||||
cmds, err := r.cli.Pipelined(ctx, func(pipe redis.Pipeliner) error {
|
cmds, err := r.cli.Pipelined(ctx, func(pipe redis.Pipeliner) error {
|
||||||
for idx := 0; idx < len(kvs); idx += 2 {
|
for idx := 0; idx < len(kvs); idx += 2 {
|
||||||
pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result()
|
if _, err := pipe.Set(ctx, kvs[idx], kvs[idx+1], options.TTL).Result(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
if err != nil {
|
|
||||||
|
te := time.Since(ts)
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
|
||||||
|
r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
if err == redis.Nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
|
} else if err != nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, cmd := range cmds {
|
for _, cmd := range cmds {
|
||||||
if err = cmd.Err(); err != nil {
|
if err = cmd.Err(); err != nil {
|
||||||
|
if err == redis.Nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
|
return store.ErrNotFound
|
||||||
|
}
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -269,15 +392,17 @@ func (r *Store) MWrite(ctx context.Context, keys []string, vals []interface{}, o
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
|
func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...store.WriteOption) error {
|
||||||
if r.opts.Timeout > 0 {
|
options := store.NewWriteOptions(opts...)
|
||||||
var cancel context.CancelFunc
|
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
timeout := r.opts.Timeout
|
||||||
defer cancel()
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
}
|
}
|
||||||
|
|
||||||
options := store.NewWriteOptions(opts...)
|
if timeout > 0 {
|
||||||
if len(options.Namespace) == 0 {
|
var cancel context.CancelFunc
|
||||||
options.Namespace = r.opts.Namespace
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
|
defer cancel()
|
||||||
}
|
}
|
||||||
|
|
||||||
var buf []byte
|
var buf []byte
|
||||||
@ -294,11 +419,24 @@ func (r *Store) Write(ctx context.Context, key string, val interface{}, opts ...
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if options.Namespace != "" {
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
key = fmt.Sprintf("%s%s", options.Namespace, key)
|
ts := time.Now()
|
||||||
|
err := r.cli.Set(ctx, r.getKey(r.opts.Namespace, options.Namespace, key), buf, options.TTL).Err()
|
||||||
|
te := time.Since(ts)
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
|
||||||
|
r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
if err == redis.Nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
|
return store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
|
} else if err != nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
return r.cli.Set(ctx, key, buf, options.TTL).Err()
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
|
func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, error) {
|
||||||
@ -307,29 +445,53 @@ func (r *Store) List(ctx context.Context, opts ...store.ListOption) ([]string, e
|
|||||||
options.Namespace = r.opts.Namespace
|
options.Namespace = r.opts.Namespace
|
||||||
}
|
}
|
||||||
|
|
||||||
rkey := fmt.Sprintf("%s%s*", options.Namespace, options.Prefix)
|
rkey := r.getKey(options.Namespace, "", options.Prefix+"*")
|
||||||
if options.Suffix != "" {
|
if options.Suffix != "" {
|
||||||
rkey += options.Suffix
|
rkey += options.Suffix
|
||||||
}
|
}
|
||||||
if r.opts.Timeout > 0 {
|
|
||||||
|
timeout := r.opts.Timeout
|
||||||
|
if options.Timeout > 0 {
|
||||||
|
timeout = options.Timeout
|
||||||
|
}
|
||||||
|
|
||||||
|
if timeout > 0 {
|
||||||
var cancel context.CancelFunc
|
var cancel context.CancelFunc
|
||||||
ctx, cancel = context.WithTimeout(ctx, r.opts.Timeout)
|
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: add support for prefix/suffix/limit
|
// TODO: add support for prefix/suffix/limit
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Inc()
|
||||||
|
ts := time.Now()
|
||||||
keys, err := r.cli.Keys(ctx, rkey).Result()
|
keys, err := r.cli.Keys(ctx, rkey).Result()
|
||||||
if err != nil {
|
te := time.Since(ts)
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestInflight, "name", options.Name).Dec()
|
||||||
|
r.opts.Meter.Summary(semconv.CacheRequestLatencyMicroseconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
r.opts.Meter.Histogram(semconv.CacheRequestDurationSeconds, "name", options.Name).Update(te.Seconds())
|
||||||
|
if err == redis.Nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "miss").Inc()
|
||||||
|
return nil, store.ErrNotFound
|
||||||
|
} else if err == nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "hit").Inc()
|
||||||
|
} else if err != nil {
|
||||||
|
r.opts.Meter.Counter(semconv.CacheRequestTotal, "name", options.Name, "status", "failure").Inc()
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if options.Namespace == "" {
|
|
||||||
|
prefix := r.opts.Namespace
|
||||||
|
if options.Namespace != "" {
|
||||||
|
prefix = options.Namespace
|
||||||
|
}
|
||||||
|
if prefix == "" {
|
||||||
return keys, nil
|
return keys, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
nkeys := make([]string, 0, len(keys))
|
for idx, key := range keys {
|
||||||
for _, key := range keys {
|
keys[idx] = strings.TrimPrefix(key, prefix)
|
||||||
nkeys = append(nkeys, strings.TrimPrefix(key, options.Namespace))
|
|
||||||
}
|
}
|
||||||
return nkeys, nil
|
|
||||||
|
return keys, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Store) Options() store.Options {
|
func (r *Store) Options() store.Options {
|
||||||
@ -390,36 +552,14 @@ func (r *Store) configure() error {
|
|||||||
if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
|
if redisOptions == nil && redisClusterOptions == nil && len(nodes) == 1 {
|
||||||
redisOptions, err = redis.ParseURL(nodes[0])
|
redisOptions, err = redis.ParseURL(nodes[0])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Backwards compatibility
|
redisOptions = DefaultOptions
|
||||||
redisOptions = &redis.Options{
|
redisOptions.Addr = r.opts.Addrs[0]
|
||||||
Addr: nodes[0],
|
redisOptions.TLSConfig = r.opts.TLSConfig
|
||||||
Username: "",
|
|
||||||
Password: "", // no password set
|
|
||||||
DB: 0, // use default DB
|
|
||||||
MaxRetries: 2,
|
|
||||||
MaxRetryBackoff: 256 * time.Millisecond,
|
|
||||||
DialTimeout: 1 * time.Second,
|
|
||||||
ReadTimeout: 1 * time.Second,
|
|
||||||
WriteTimeout: 1 * time.Second,
|
|
||||||
PoolTimeout: 1 * time.Second,
|
|
||||||
MinIdleConns: 10,
|
|
||||||
TLSConfig: r.opts.TLSConfig,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
|
} else if redisOptions == nil && redisClusterOptions == nil && len(nodes) > 1 {
|
||||||
redisClusterOptions = &redis.ClusterOptions{
|
redisClusterOptions = DefaultClusterOptions
|
||||||
Addrs: nodes,
|
redisClusterOptions.Addrs = r.opts.Addrs
|
||||||
Username: "",
|
redisClusterOptions.TLSConfig = r.opts.TLSConfig
|
||||||
Password: "", // no password set
|
|
||||||
MaxRetries: 2,
|
|
||||||
MaxRetryBackoff: 256 * time.Millisecond,
|
|
||||||
DialTimeout: 1 * time.Second,
|
|
||||||
ReadTimeout: 1 * time.Second,
|
|
||||||
WriteTimeout: 1 * time.Second,
|
|
||||||
PoolTimeout: 1 * time.Second,
|
|
||||||
MinIdleConns: 10,
|
|
||||||
TLSConfig: r.opts.TLSConfig,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if redisOptions != nil {
|
if redisOptions != nil {
|
||||||
@ -430,3 +570,19 @@ func (r *Store) configure() error {
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *Store) getKey(mainNamespace string, opNamespace string, key string) string {
|
||||||
|
b := r.pool.Get()
|
||||||
|
defer r.pool.Put(b)
|
||||||
|
b.Reset()
|
||||||
|
|
||||||
|
if opNamespace == "" {
|
||||||
|
opNamespace = mainNamespace
|
||||||
|
}
|
||||||
|
if opNamespace != "" {
|
||||||
|
b.WriteString(opNamespace)
|
||||||
|
b.WriteString(DefaultPathSeparator)
|
||||||
|
}
|
||||||
|
b.WriteString(key)
|
||||||
|
return b.String()
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user