From 8a14638d556734fe05c51388aefe65b9c2f48cd4 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 8 Sep 2023 23:54:25 +0200 Subject: [PATCH] chore: fix NPE Signed-off-by: Valery Piashchynski --- go.sum | 2 -- plugin.go | 9 ++------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/go.sum b/go.sum index 9aef3d0..481ef0d 100644 --- a/go.sum +++ b/go.sum @@ -35,8 +35,6 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c= go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/plugin.go b/plugin.go index 19f9df7..12384a9 100644 --- a/plugin.go +++ b/plugin.go @@ -61,10 +61,10 @@ func (p *Plugin) Init(cfg Configurer, log Logger) error { return errors.E(op, err) } p.constructors = make(map[string]kv.Constructor, 5) - p.storages = make(map[string]kv.Storage, 5) - p.log = log.NamedLogger(PluginName) + // NOOP tracer + p.tracer = sdktrace.NewTracerProvider() p.cfgPlugin = cfg return nil @@ -74,11 +74,6 @@ func (p *Plugin) Serve() chan error { errCh := make(chan error, 1) const op = errors.Op("kv_plugin_serve") - if p.tracer == nil { - // NOOP tracer - p.tracer = sdktrace.NewTracerProvider() - } - // key - storage name in the config // value - storage // For this config we should have 3 constructors: memory, boltdb and memcached but 4 KVs: default, boltdb-south, boltdb-north and memcached