Remove shard id metrics tags

CONTRIBUTING.md

@@ -7,9 +7,11 @@ This doc is intended for contributors to `cadence` server (hopefully that's you!
 ## Development Environment
 
 * Go. Install on OS X with `brew install go`.
-* `thrift`. Install on OS X with `brew install thrift`)
+* `thrift`. Install on OS X with `brew install thrift`
 * `thrift-gen`. Install with `go get github.com/uber/tchannel-go/thrift/thrift-gen`
 
+Note: `thrift` should be >= 0.10.0. Run `brew upgrade thrift` if you're on an older version.
+
 ## Checking out the code
 
 Make sure the repository is cloned to the correct location:
@@ -41,7 +43,7 @@ commit messages. Read it, follow it, learn it, love it.
 
 ## Building
 
-You can compile the `cadence` service and helper tools without running test: 
+You can compile the `cadence` service and helper tools without running test:
 
 ```bash
 make bins
@@ -57,7 +59,7 @@ brew install cassandra
 
 # start cassandra
 /usr/local/bin/cassandra
-``` 
+```
 
 Run all the tests:
 

common/metrics/defs.go

@@ -64,14 +64,11 @@ const (
 const (
 	HostnameTagName  = "hostname"
 	OperationTagName = "operation"
-	// ShardTagName is temporary until we can get all metric data removed for the service
-	ShardTagName = "shard"
 )
 
 // This package should hold all the metrics and tags for cadence
 const (
 	UnknownDirectoryTagValue = "Unknown"
-	AllShardsTagValue        = "ALL"
 )
 
 // Common service base metrics

service/history/execMgrFactory.go

@@ -56,12 +56,5 @@ func (factory *executionMgrFactory) CreateExecutionManager(shardID int) (persist
 		shardID,
 		factory.logger)
 
-	if err != nil {
-		return nil, err
-	}
-
-	tags := map[string]string{
-		metrics.ShardTagName: metrics.AllShardsTagValue,
-	}
-	return persistence.NewWorkflowExecutionPersistenceClient(mgr, factory.metricsClient.Tagged(tags)), nil
+	return persistence.NewWorkflowExecutionPersistenceClient(mgr, factory.metricsClient), err
 }

service/history/shardContext.go

@@ -427,7 +427,7 @@ func (s *shardContextImpl) allocateTimerIDsLocked(timerTasks []persistence.Task)
 // TODO: This method has too many parameters.  Clean it up.  Maybe create a struct to pass in as parameter.
 func acquireShard(shardID int, shardManager persistence.ShardManager, historyMgr persistence.HistoryManager,
 	executionMgr persistence.ExecutionManager, owner string, closeCh chan<- int, logger bark.Logger,
-	reporter metrics.Client) (ShardContext, error) {
+	metricsClient metrics.Client) (ShardContext, error) {
 	response, err0 := shardManager.GetShard(&persistence.GetShardRequest{ShardID: shardID})
 	if err0 != nil {
 		return nil, err0
@@ -444,14 +444,11 @@ func acquireShard(shardID int, shardManager persistence.ShardManager, historyMgr
 		shardInfo:        updatedShardInfo,
 		rangeSize:        defaultRangeSize,
 		closeCh:          closeCh,
+		metricsClient:    metricsClient,
 	}
 	context.logger = logger.WithFields(bark.Fields{
 		logging.TagHistoryShardID: shardID,
 	})
-	tags := map[string]string{
-		metrics.ShardTagName: metrics.AllShardsTagValue,
-	}
-	context.metricsClient = reporter.Tagged(tags)
 
 	err1 := context.renewRangeLocked(true)
 	if err1 != nil {