Bring back shard id tag (#262)

Author: madhuravi

common/metrics/defs.go

@@ -64,11 +64,14 @@ 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

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

service/history/shardContext.go

@@ -442,6 +442,9 @@ func acquireShard(shardID int, shardManager persistence.ShardManager, historyMgr
 	shardInfo := response.ShardInfo
 	updatedShardInfo := copyShardInfo(shardInfo)
 	updatedShardInfo.Owner = owner
+	tags := map[string]string{
+		metrics.ShardTagName: metrics.AllShardsTagValue,
+	}
 	context := &shardContextImpl{
 		shardID:          shardID,
 		shardManager:     shardManager,
@@ -450,7 +453,7 @@ func acquireShard(shardID int, shardManager persistence.ShardManager, historyMgr
 		shardInfo:        updatedShardInfo,
 		rangeSize:        defaultRangeSize,
 		closeCh:          closeCh,
-		metricsClient:    metricsClient,
+		metricsClient:    metricsClient.Tagged(tags),
 	}
 	context.logger = logger.WithFields(bark.Fields{
 		logging.TagHistoryShardID: shardID,