Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix statsd concurrency bug #8885

Merged
merged 5 commits into from
Feb 25, 2021
Merged

Fix statsd concurrency bug #8885

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95ce974
Fix the issue
ivorybilled Feb 19, 2021
e51690d
Remove test I was using for replication
ivorybilled Feb 19, 2021
2cc4e1a
Accidentally removed test.
ivorybilled Feb 19, 2021
a2d74a3
Add lock only where it is necessary.
ivorybilled Feb 22, 2021
829a5ab
eliminate unnecessary space
ivorybilled Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plugins/inputs/statsd/statsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,9 @@ func (s *Statsd) parser() error {
// parseStatsdLine will parse the given statsd line, validating it as it goes.
// If the line is valid, it will be cached for the next call to Gather()
func (s *Statsd) parseStatsdLine(line string) error {
s.Lock()
defer s.Unlock()

lineTags := make(map[string]string)
if s.DataDogExtensions {
recombinedSegments := make([]string, 0)
Expand Down Expand Up @@ -772,9 +775,6 @@ func parseKeyValue(keyvalue string) (string, string) {
// aggregates and caches the current value(s). It does not deal with the
// Delete* options, because those are dealt with in the Gather function.
func (s *Statsd) aggregate(m metric) {
s.Lock()
defer s.Unlock()

switch m.mtype {
case "d":
if s.DataDogExtensions && s.DataDogDistributions {
Expand Down