Skip to content

Commit

Permalink
fix: Prevent concurrent map writes to c.UnusedFields (#11311)
Browse files Browse the repository at this point in the history
(cherry picked from commit 478edd3)
  • Loading branch information
sspaink authored and Sven Rebhan committed Jul 5, 2022
1 parent 8990a2e commit 34417d6
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"sort"
"strconv"
"strings"
"sync"
"time"

"github.com/coreos/go-semver/semver"
Expand Down Expand Up @@ -65,9 +66,10 @@ var (
// will be logging to, as well as all the plugins that the user has
// specified
type Config struct {
toml *toml.Config
errs []error // config load errors.
UnusedFields map[string]bool
toml *toml.Config
errs []error // config load errors.
UnusedFields map[string]bool
unusedFieldsMutex *sync.Mutex

Tags map[string]string
InputFilters []string
Expand All @@ -91,7 +93,8 @@ type Config struct {
// once the configuration is parsed.
func NewConfig() *Config {
c := &Config{
UnusedFields: map[string]bool{},
UnusedFields: map[string]bool{},
unusedFieldsMutex: &sync.Mutex{},

// Agent defaults:
Agent: &AgentConfig{
Expand Down Expand Up @@ -1846,7 +1849,9 @@ func (c *Config) missingTomlField(_ reflect.Type, key string) error {

// ignore fields that are common to all plugins.
default:
c.unusedFieldsMutex.Lock()
c.UnusedFields[key] = true
c.unusedFieldsMutex.Unlock()
}
return nil
}
Expand Down

0 comments on commit 34417d6

Please sign in to comment.