Remove commitLock

open-telemetry · May 18, 2020 · a96606b · a96606b
1 parent c2aeb72
commit a96606b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/sdk/metric/controller/push/push.go b/sdk/metric/controller/push/push.go
@@ -33,7 +33,6 @@ const DefaultPushPeriod = 10 * time.Second
 // Controller organizes a periodic push of metric data.
 type Controller struct {
 	lock         sync.Mutex
-	collectLock  sync.Mutex
 	accumulator  *sdk.Accumulator
 	resource     *resource.Resource
 	uniq         metric.MeterImpl
@@ -157,8 +156,8 @@ func (c *Controller) tick() {
 	// TODO: either remove the context argument from Export() or
 	// configure a timeout here?
 	ctx := context.Background()
-	c.collectLock.Lock()
-	defer c.collectLock.Unlock()
+	c.integrator.Lock()
+	defer c.integrator.Unlock()
 
 	c.accumulator.Collect(ctx)
 

diff --git a/sdk/metric/integrator/simple/simple.go b/sdk/metric/integrator/simple/simple.go
@@ -28,8 +28,8 @@ import (
 type (
 	Integrator struct {
 		export.AggregationSelector
-		batch    batch
 		stateful bool
+		batch
 	}
 
 	batchKey struct {