CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Handle duplicate registration of protocol-buffer files gracefully. (#10188)

This commit is contained in:
Sven Rebhan 2021-12-10 22:25:24 +01:00 committed by GitHub
parent 1b9572085b
commit aa642a4046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/parsers/xpath/protocolbuffer_document.go
View File

@ -1,6 +1,7 @@
package xpath package xpath
import ( import (
"errors"
"fmt" "fmt"
"sort" "sort"
"strings" "strings"
@ -55,6 +56,13 @@ func (d *protobufDocument) Init() error {
if err != nil { if err != nil {
return fmt.Errorf("creating file descriptor from proto failed: %v", err) return fmt.Errorf("creating file descriptor from proto failed: %v", err)
} }
if _, err := protoregistry.GlobalFiles.FindFileByPath(fileDesc.Path()); !errors.Is(err, protoregistry.NotFound) {
if err != nil {
return fmt.Errorf("searching for file %q in registry failed: %v", fileDesc.Path(), err)
}
d.Log.Warnf("Protocol buffer with path %q already registered. Skipping...", fileDesc.Path())
continue
}
if err := protoregistry.GlobalFiles.RegisterFile(fileDesc); err != nil { if err := protoregistry.GlobalFiles.RegisterFile(fileDesc); err != nil {
return fmt.Errorf("registering file descriptor %q failed: %v", fileDesc.Package(), err) return fmt.Errorf("registering file descriptor %q failed: %v", fileDesc.Package(), err)
} }