Fix unmarshalling in OTEL badger (#2488)

pavolloffay · web-flow · commit 5b9598dd7cf1 · 2020-09-17T18:14:57.000+02:00
* Fix unmarshalling in OTEL badger

Signed-off-by: Pavol Loffay &lt;ploffay@redhat.com&gt;

* Remove space

Signed-off-by: Pavol Loffay &lt;ploffay@redhat.com&gt;
diff --git 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,7 @@ 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:

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ import (`
`25`	`25`	`"sort"`
`26`	`26`
`27`	`27`	`"github.com/dgraph-io/badger"`
`28`		`- "github.com/golang/protobuf/proto"`
`29`	`28`
`30`	`29`	`"github.com/jaegertracing/jaeger/model"`
`31`	`30`	`"github.com/jaegertracing/jaeger/storage/spanstore"`
`@@ -101,7 +100,7 @@ func decodeValue(val []byte, encodeType byte) (*model.Span, error) {`
`101`	`100`	`return nil, err`
`102`	`101`	`}`
`103`	`102`	`case protoEncoding:`
`104`		`- if err := proto.Unmarshal(val, &sp); err != nil {`
	`103`	`+ if err := sp.Unmarshal(val); err != nil {`
`105`	`104`	`return nil, err`
`106`	`105`	`}`
`107`	`106`	`default:`