Skip to content
This repository has been archived by the owner on Jul 31, 2023. It is now read-only.

Commit

Permalink
Fix data race when registering views multiple times
Browse files Browse the repository at this point in the history
Fixed by moving view canonicalization into worker.
  • Loading branch information
Ramon Nogueira committed Dec 20, 2018
1 parent 25040cf commit 950a67f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
12 changes: 12 additions & 0 deletions stats/view/view_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,18 @@ func TestViewRegister_negativeBucketBounds(t *testing.T) {
}
}

func TestViewRegister_zeroBucketBounds(t *testing.T) {
m := stats.Int64("TestViewRegister_negativeBucketBounds", "", "")
v := &View{
Measure: m,
Aggregation: Distribution(0, 2),
}
err := Register(v)
if err != nil {
t.Errorf("Expected no error, got %v", err)
}
}

func TestViewRegister_sortBuckets(t *testing.T) {
m := stats.Int64("TestViewRegister_sortBuckets", "", "")
v := &View{
Expand Down
5 changes: 0 additions & 5 deletions stats/view/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@ func Find(name string) (v *View) {
// Register begins collecting data for the given views.
// Once a view is registered, it reports data to the registered exporters.
func Register(views ...*View) error {
for _, v := range views {
if err := v.canonicalize(); err != nil {
return err
}
}
req := &registerViewReq{
views: views,
err: make(chan error),
Expand Down
6 changes: 6 additions & 0 deletions stats/view/worker_commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ type registerViewReq struct {
}

func (cmd *registerViewReq) handleCommand(w *worker) {
for _, v := range cmd.views {
if err := v.canonicalize(); err != nil {
cmd.err <- err
return
}
}
var errstr []string
for _, view := range cmd.views {
vi, err := w.tryRegisterView(view)
Expand Down

0 comments on commit 950a67f

Please sign in to comment.