change NewTaggedScope()

cadence-workflow · Mar 16, 2018 · d39a0d0 · d39a0d0
1 parent ed72e73
commit d39a0d0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/internal/client.go b/internal/client.go
@@ -23,7 +23,6 @@ package internal
 import (
 	"context"
 	"fmt"
-	"sync"
 	"time"
 
 	"go.uber.org/cadence/encoded"
@@ -327,7 +326,7 @@ func NewClient(service workflowserviceclient.Interface, domain string, options *
 	return &workflowClient{
 		workflowService: metrics.NewWorkflowServiceWrapper(service, metricScope),
 		domain:          domain,
-		metricsScope:    &metrics.TaggedScope{Scope: metricScope, Map: &sync.Map{}},
+		metricsScope:    metrics.NewTaggedScope(metricScope),
 		identity:        identity,
 	}
 }

diff --git a/internal/common/metrics/scope.go b/internal/common/metrics/scope.go
@@ -200,7 +200,7 @@ func (ts *TaggedScope) GetTaggedScope(tagName, tagValue string) tally.Scope {
 		ts.Map = &sync.Map{}
 	}
 
-	key := tagName + tagValue // used to prevent collision of tagValue (map key) for different tagName
+	key := tagName + ":" + tagValue // used to prevent collision of tagValue (map key) for different tagName
 	taggedScope, ok := ts.Load(key)
 	if !ok {
 		ts.Store(key, ts.Scope.Tagged(map[string]string{tagName: tagValue}))
@@ -214,6 +214,9 @@ func (ts *TaggedScope) GetTaggedScope(tagName, tagValue string) tally.Scope {
 }
 
 // NewTaggedScope create a new TaggedScope
-func NewTaggedScope() *TaggedScope {
-	return &TaggedScope{Scope: tally.NoopScope, Map: &sync.Map{}}
+func NewTaggedScope(scope tally.Scope) *TaggedScope {
+	if scope == nil {
+		scope = tally.NoopScope
+	}
+	return &TaggedScope{Scope: scope, Map: &sync.Map{}}
 }
diff --git a/internal/internal_task_handlers.go b/internal/internal_task_handlers.go
@@ -1089,7 +1089,7 @@ func newActivityTaskHandlerWithCustomProvider(
 		identity:         params.Identity,
 		service:          service,
 		logger:           params.Logger,
-		metricsScope:     &metrics.TaggedScope{Scope: params.MetricsScope, Map: &sync.Map{}},
+		metricsScope:     metrics.NewTaggedScope(params.MetricsScope),
 		userContext:      params.UserContext,
 		hostEnv:          env,
 		activityProvider: activityProvider,

diff --git a/internal/internal_workflow_client_test.go b/internal/internal_workflow_client_test.go
@@ -24,7 +24,6 @@ import (
 	"errors"
 	"log"
 	"os"
-	"sync"
 	"testing"
 	"time"
 
@@ -34,7 +33,6 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/suite"
-	"github.com/uber-go/tally"
 	"go.uber.org/cadence/internal/common/metrics"
 )
 
@@ -192,7 +190,7 @@ func (s *workflowRunSuite) SetupTest() {
 	mockCtrl := gomock.NewController(s.T())
 	s.workflowServiceClient = workflowservicetest.NewMockClient(mockCtrl)
 
-	metricsScope := &metrics.TaggedScope{Scope: tally.NoopScope, Map: &sync.Map{}}
+	metricsScope := metrics.NewTaggedScope(nil)
 	s.workflowClient = &workflowClient{
 		workflowService: s.workflowServiceClient,
 		domain:          domain,

diff --git a/internal/internal_workflow_testsuite.go b/internal/internal_workflow_testsuite.go
@@ -174,7 +174,7 @@ func newTestWorkflowEnvironmentImpl(s *WorkflowTestSuite) *testWorkflowEnvironme
 			taskListSpecificActivities: make(map[string]*taskListSpecificActivity),
 
 			logger:           s.logger,
-			metricsScope:     metrics.NewTaggedScope(),
+			metricsScope:     metrics.NewTaggedScope(nil),
 			mockClock:        clock.NewMock(),
 			wallClock:        clock.New(),
 			timers:           make(map[string]*testTimerHandle),
@@ -213,7 +213,7 @@ func newTestWorkflowEnvironmentImpl(s *WorkflowTestSuite) *testWorkflowEnvironme
 		env.logger = logger
 	}
 	if env.metricsScope == nil {
-		env.metricsScope = &metrics.TaggedScope{Scope: s.scope, Map: &sync.Map{}}
+		env.metricsScope = metrics.NewTaggedScope(s.scope)
 	}
 
 	// setup mock service