Rename to not shadow imports

open-telemetry · Sep 30, 2022 · cae41cc · cae41cc
1 parent 0cec45a
commit cae41cc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/sdk/metric/pipeline.go b/sdk/metric/pipeline.go
@@ -82,16 +82,16 @@ type pipeline struct {
 // addSync adds the instrumentSync to pipeline p with scope. This method is not
 // idempotent. Duplicate calls will result in duplicate additions, it is the
 // callers responsibility to ensure this is called with unique values.
-func (p *pipeline) addSync(scope instrumentation.Scope, sync instrumentSync) {
+func (p *pipeline) addSync(scope instrumentation.Scope, iSync instrumentSync) {
 	p.Lock()
 	defer p.Unlock()
 	if p.aggregations == nil {
 		p.aggregations = map[instrumentation.Scope][]instrumentSync{
-			scope: {sync},
+			scope: {iSync},
 		}
 		return
 	}
-	p.aggregations[scope] = append(p.aggregations[scope], sync)
+	p.aggregations[scope] = append(p.aggregations[scope], iSync)
 }
 
 // addCallback registers a callback to be run when `produce()` is called.

diff --git a/sdk/metric/pipeline_test.go b/sdk/metric/pipeline_test.go
@@ -47,9 +47,9 @@ func TestEmptyPipeline(t *testing.T) {
 	assert.Nil(t, output.Resource)
 	assert.Len(t, output.ScopeMetrics, 0)
 
-	sync := instrumentSync{"name", "desc", unit.Dimensionless, testSumAggregator{}}
+	iSync := instrumentSync{"name", "desc", unit.Dimensionless, testSumAggregator{}}
 	assert.NotPanics(t, func() {
-		pipe.addSync(instrumentation.Scope{}, sync)
+		pipe.addSync(instrumentation.Scope{}, iSync)
 	})
 
 	require.NotPanics(t, func() {
@@ -71,9 +71,9 @@ func TestNewPipeline(t *testing.T) {
 	assert.Equal(t, resource.Empty(), output.Resource)
 	assert.Len(t, output.ScopeMetrics, 0)
 
-	sync := instrumentSync{"name", "desc", unit.Dimensionless, testSumAggregator{}}
+	iSync := instrumentSync{"name", "desc", unit.Dimensionless, testSumAggregator{}}
 	assert.NotPanics(t, func() {
-		pipe.addSync(instrumentation.Scope{}, sync)
+		pipe.addSync(instrumentation.Scope{}, iSync)
 	})
 
 	require.NotPanics(t, func() {