Fix decode plugin with protobuf decoder (#721)

kirillov6 · web-flow · commit 1da9776adb7a · 2024-12-12T16:01:34.000+05:00
diff --git a/plugin/action/decode/decode.go b/plugin/action/decode/decode.go
@@ -543,10 +543,11 @@ func (p *Plugin) decodeNginxError(root *insaneJSON.Root, node *insaneJSON.Node)
 }
 
 func (p *Plugin) decodeProtobuf(root *insaneJSON.Root, node *insaneJSON.Node, buf []byte) {
-	t := insaneJSON.Spawn()
-	defer insaneJSON.Release(t)
-
-	err := p.decoder.DecodeToJson(t, node.AsBytes())
+	jsonRaw, err := p.decoder.Decode(node.AsBytes())
+	if p.checkError(err, node) {
+		return
+	}
+	t, err := root.DecodeBytesAdditional(jsonRaw.([]byte))
 	if p.checkError(err, node) {
 		return
 	}
@@ -565,7 +566,7 @@ func (p *Plugin) decodeProtobuf(root *insaneJSON.Root, node *insaneJSON.Node, bu
 		node.Suicide()
 	}
 
-	root.MergeWith(t.Node)
+	root.MergeWith(t)
 }
 
 func (p *Plugin) addFieldPrefix(root *insaneJSON.Root, key string, val []byte) {

Original file line number	Diff line number	Diff line change
`@@ -543,10 +543,11 @@ func (p Plugin) decodeNginxError(root insaneJSON.Root, node *insaneJSON.Node)`
`543`	`543`	`}`
`544`	`544`
`545`	`545`	`func (p Plugin) decodeProtobuf(root insaneJSON.Root, node *insaneJSON.Node, buf []byte) {`
`546`		`- t := insaneJSON.Spawn()`
`547`		`- defer insaneJSON.Release(t)`
`548`		`-`
`549`		`- err := p.decoder.DecodeToJson(t, node.AsBytes())`
	`546`	`+ jsonRaw, err := p.decoder.Decode(node.AsBytes())`
	`547`	`+ if p.checkError(err, node) {`
	`548`	`+ return`
	`549`	`+ }`
	`550`	`+ t, err := root.DecodeBytesAdditional(jsonRaw.([]byte))`
`550`	`551`	`if p.checkError(err, node) {`
`551`	`552`	`return`
`552`	`553`	`}`
`@@ -565,7 +566,7 @@ func (p Plugin) decodeProtobuf(root insaneJSON.Root, node *insaneJSON.Node, bu`
`565`	`566`	`node.Suicide()`
`566`	`567`	`}`
`567`	`568`
`568`		`- root.MergeWith(t.Node)`
	`569`	`+ root.MergeWith(t)`
`569`	`570`	`}`
`570`	`571`
`571`	`572`	`func (p Plugin) addFieldPrefix(root insaneJSON.Root, key string, val []byte) {`