From c3ed530f775d85e577ca652cb052a52c078aad26 Mon Sep 17 00:00:00 2001 From: Ramon Nogueira Date: Fri, 25 May 2018 11:33:25 -0700 Subject: [PATCH] Data race in ApplyConfig (#763) Oddly, I could not get the race detector to find this. --- trace/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/trace/config.go b/trace/config.go index f3df9be45..d5473a798 100644 --- a/trace/config.go +++ b/trace/config.go @@ -29,12 +29,12 @@ type Config struct { // // Fields not provided in the given config are going to be preserved. func ApplyConfig(cfg Config) { - c := config.Load().(*Config) + c := *config.Load().(*Config) if cfg.DefaultSampler != nil { c.DefaultSampler = cfg.DefaultSampler } if cfg.IDGenerator != nil { c.IDGenerator = cfg.IDGenerator } - config.Store(c) + config.Store(&c) }