Add task category tag to history tasks metrics

Author: Shaddoll

common/metrics/tags.go

@@ -347,6 +347,10 @@ func NamespaceTag(namespace string) Tag {
 	return metricWithUnknown("namespace", namespace)
 }
 
+func TaskCategoryTag(category string) Tag {
+	return metricWithUnknown("task_category", category)
+}
+
 // ReasonTag returns a new reason tag
 func ReasonTag(reason string) Tag {
 	return metricWithUnknown("reason", reason)

common/persistence/data_manager_interfaces.go

@@ -178,6 +178,7 @@ const (
 type HistoryTaskCategory struct {
 	categoryType int
 	categoryID   int
+	categoryName string
 }
 
 func (c *HistoryTaskCategory) Type() int {
@@ -188,6 +189,10 @@ func (c *HistoryTaskCategory) ID() int {
 	return c.categoryID
 }
 
+func (c *HistoryTaskCategory) Name() string {
+	return c.categoryName
+}
+
 const (
 	HistoryTaskCategoryTypeImmediate = iota + 1
 	HistoryTaskCategoryTypeScheduled
@@ -203,14 +208,17 @@ var (
 	HistoryTaskCategoryTransfer = HistoryTaskCategory{
 		categoryType: HistoryTaskCategoryTypeImmediate,
 		categoryID:   HistoryTaskCategoryIDTransfer,
+		categoryName: "transfer",
 	}
 	HistoryTaskCategoryTimer = HistoryTaskCategory{
 		categoryType: HistoryTaskCategoryTypeScheduled,
 		categoryID:   HistoryTaskCategoryIDTimer,
+		categoryName: "timer",
 	}
 	HistoryTaskCategoryReplication = HistoryTaskCategory{
 		categoryType: HistoryTaskCategoryTypeImmediate,
 		categoryID:   HistoryTaskCategoryIDReplication,
+		categoryName: "replication",
 	}
 )
 

common/persistence/metered.go

@@ -438,3 +438,15 @@ func (r GetCurrentExecutionRequest) GetDomainName() string {
 func (r GetCurrentExecutionRequest) GetExtraLogTags() []tag.Tag {
 	return []tag.Tag{tag.WorkflowID(r.WorkflowID)}
 }
+
+func (r GetHistoryTasksRequest) MetricTags() []metrics.Tag {
+	return []metrics.Tag{metrics.TaskCategoryTag(r.TaskCategory.Name())}
+}
+
+func (r RangeCompleteHistoryTaskRequest) MetricTags() []metrics.Tag {
+	return []metrics.Tag{metrics.TaskCategoryTag(r.TaskCategory.Name())}
+}
+
+func (r CompleteHistoryTaskRequest) MetricTags() []metrics.Tag {
+	return []metrics.Tag{metrics.TaskCategoryTag(r.TaskCategory.Name())}
+}

common/persistence/wrappers/metered/base.go

@@ -143,6 +143,23 @@ func (p *base) call(scope int, op func() error, tags ...metrics.Tag) error {
 	return err
 }
 
+func (p *base) callWithoutDomainTag(scope int, op func() error, tags ...metrics.Tag) error {
+	metricsScope := p.metricClient.Scope(scope, tags...)
+	metricsScope.IncCounter(metrics.PersistenceRequests)
+	before := time.Now()
+	err := op()
+	duration := time.Since(before)
+	metricsScope.RecordTimer(metrics.PersistenceLatency, duration)
+
+	if p.enableLatencyHistogramMetrics {
+		metricsScope.RecordHistogramDuration(metrics.PersistenceLatencyHistogram, duration)
+	}
+	if err != nil {
+		p.updateErrorMetric(scope, err, metricsScope)
+	}
+	return err
+}
+
 func (p *base) callWithDomainAndShardScope(scope int, op func() error, domainTag metrics.Tag, shardIDTag metrics.Tag) error {
 	domainMetricsScope := p.metricClient.Scope(scope, domainTag)
 	shardOperationsMetricsScope := p.metricClient.Scope(scope, shardIDTag)

common/persistence/wrappers/metered/execution_generated.go

@@ -71,7 +71,7 @@ func New{{.Interface.Name}}(
                   {{ $extraTags = printf ", getCustomMetricTags(%s)..." $reqName }}
              {{ end -}}
 
-	        err = c.call({{$scopeName}}, op{{$extraTags}})
+	        err = c.callWithoutDomainTag({{$scopeName}}, op{{$extraTags}})
 
 	        return
         }