From 6fdebe975f65be604521f1954363ba052650bcf6 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Thu, 17 Sep 2020 17:12:02 +0200 Subject: [PATCH 1/2] Fix unmarshalling in OTEL badger Signed-off-by: Pavol Loffay --- plugin/storage/badger/spanstore/reader.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/storage/badger/spanstore/reader.go b/plugin/storage/badger/spanstore/reader.go index b89020382b5..273bd348352 100644 --- a/plugin/storage/badger/spanstore/reader.go +++ b/plugin/storage/badger/spanstore/reader.go @@ -25,7 +25,6 @@ import ( "sort" "github.com/dgraph-io/badger" - "github.com/golang/protobuf/proto" "github.com/jaegertracing/jaeger/model" "github.com/jaegertracing/jaeger/storage/spanstore" @@ -101,7 +100,8 @@ func decodeValue(val []byte, encodeType byte) (*model.Span, error) { return nil, err } case protoEncoding: - if err := proto.Unmarshal(val, &sp); err != nil { + + if err := sp.Unmarshal(val); err != nil { return nil, err } default: From 585a57e0022d2f958c14a6a64a3031c170c09f08 Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Thu, 17 Sep 2020 17:13:29 +0200 Subject: [PATCH 2/2] Remove space Signed-off-by: Pavol Loffay --- plugin/storage/badger/spanstore/reader.go | 1 - 1 file changed, 1 deletion(-) diff --git a/plugin/storage/badger/spanstore/reader.go b/plugin/storage/badger/spanstore/reader.go index 273bd348352..134da6e44c2 100644 --- a/plugin/storage/badger/spanstore/reader.go +++ b/plugin/storage/badger/spanstore/reader.go @@ -100,7 +100,6 @@ func decodeValue(val []byte, encodeType byte) (*model.Span, error) { return nil, err } case protoEncoding: - if err := sp.Unmarshal(val); err != nil { return nil, err }