Compare commits

...

3 Commits

Author SHA1 Message Date
256e61a437 fixup slice override
Some checks failed
build / test (push) Failing after 7s
build / lint (push) Failing after 7s
codeql / analyze (go) (push) Failing after 10s
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
2024-09-25 15:27:53 +03:00
f9cdd41c94 Merge pull request 'changed MetricPrefix to Labels' (#112) from devstigneev/micro-store-redis:v3 into v3
Some checks failed
build / test (push) Failing after 10s
build / lint (push) Failing after 10s
codeql / analyze (go) (push) Failing after 10s
Reviewed-on: #112
Reviewed-by: Василий Толстов <v.tolstov@unistack.org>
2024-09-23 18:23:27 +03:00
ecad15fe17 changed MetricPrefix to Labels
Some checks failed
automerge / automerge (pull_request) Has been skipped
autoapprove / autoapprove (pull_request) Failing after 5s
dependabot-automerge / automerge (pull_request) Has been skipped
codeql / analyze (go) (pull_request) Has been cancelled
prbuild / test (pull_request) Has been cancelled
prbuild / lint (pull_request) Has been cancelled
2024-09-21 14:01:04 +03:00
3 changed files with 37 additions and 9 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.idea

View File

@@ -27,6 +27,9 @@ var (
DefaultMeterStatsInterval = 5 * time.Second DefaultMeterStatsInterval = 5 * time.Second
// DefaultMeterMetricPrefix holds default metric prefix // DefaultMeterMetricPrefix holds default metric prefix
DefaultMeterMetricPrefix = "micro_store_" DefaultMeterMetricPrefix = "micro_store_"
labelHost = "redis_host"
labelName = "redis_name"
) )
// Options struct holds wrapper options // Options struct holds wrapper options
@@ -36,6 +39,8 @@ type Options struct {
Tracer tracer.Tracer Tracer tracer.Tracer
MeterMetricPrefix string MeterMetricPrefix string
MeterStatsInterval time.Duration MeterStatsInterval time.Duration
RedisHost string
RedisName string
} }
// Option func signature // Option func signature
@@ -56,7 +61,9 @@ func NewOptions(opts ...Option) Options {
} }
options.Meter = options.Meter.Clone( options.Meter = options.Meter.Clone(
meter.MetricPrefix(options.MeterMetricPrefix), meter.Labels(
labelHost, options.RedisHost,
labelName, options.RedisName),
) )
options.Logger = options.Logger.Clone(logger.WithCallerSkipCount(1)) options.Logger = options.Logger.Clone(logger.WithCallerSkipCount(1))

View File

@@ -218,9 +218,11 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
defer cancel() defer cancel()
} }
var rkeys []string
if r.opts.Namespace != "" || options.Namespace != "" { if r.opts.Namespace != "" || options.Namespace != "" {
rkeys = make([]string, len(keys))
for idx, key := range keys { for idx, key := range keys {
keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key) rkeys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
} }
} }
@@ -228,10 +230,18 @@ func (r *Store) MRead(ctx context.Context, keys []string, vals interface{}, opts
ts := time.Now() ts := time.Now()
var rvals []interface{} var rvals []interface{}
var err error var err error
if r.cli.Client != nil { if r.opts.Namespace != "" || options.Namespace != "" {
rvals, err = r.cli.Client.MGet(ctx, keys...).Result() if r.cli.Client != nil {
rvals, err = r.cli.Client.MGet(ctx, rkeys...).Result()
} else {
rvals, err = r.cli.ClusterClient.MGet(ctx, rkeys...).Result()
}
} else { } else {
rvals, err = r.cli.ClusterClient.MGet(ctx, keys...).Result() if r.cli.Client != nil {
rvals, err = r.cli.Client.MGet(ctx, keys...).Result()
} else {
rvals, err = r.cli.ClusterClient.MGet(ctx, keys...).Result()
}
} }
setSpanError(ctx, err) setSpanError(ctx, err)
te := time.Since(ts) te := time.Since(ts)
@@ -308,19 +318,29 @@ func (r *Store) MDelete(ctx context.Context, keys []string, opts ...store.Delete
defer cancel() defer cancel()
} }
var rkeys []string
if r.opts.Namespace != "" || options.Namespace != "" { if r.opts.Namespace != "" || options.Namespace != "" {
rkeys = make([]string, len(keys))
for idx, key := range keys { for idx, key := range keys {
keys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key) rkeys[idx] = r.getKey(r.opts.Namespace, options.Namespace, key)
} }
} }
r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc() r.opts.Meter.Counter(semconv.StoreRequestInflight, "name", options.Name).Inc()
ts := time.Now() ts := time.Now()
var err error var err error
if r.cli.Client != nil { if r.opts.Namespace != "" || options.Namespace != "" {
err = r.cli.Client.Del(ctx, keys...).Err() if r.cli.Client != nil {
err = r.cli.Client.Del(ctx, rkeys...).Err()
} else {
err = r.cli.ClusterClient.Del(ctx, rkeys...).Err()
}
} else { } else {
err = r.cli.ClusterClient.Del(ctx, keys...).Err() if r.cli.Client != nil {
err = r.cli.Client.Del(ctx, keys...).Err()
} else {
err = r.cli.ClusterClient.Del(ctx, keys...).Err()
}
} }
setSpanError(ctx, err) setSpanError(ctx, err)
te := time.Since(ts) te := time.Since(ts)