Merge branch 'master' into 1.1.0

Author: shijiesheng

internal/common/metrics/constants.go

@@ -115,6 +115,6 @@ const (
 	MemoryUsedStack = CadenceMetricsPrefix + "memory-used-stack"
 	NumGoRoutines   = CadenceMetricsPrefix + "num-go-routines"
 
-	ConcurrentTaskQuota   = CadenceMetricsPrefix + "concurrent-task-quota"
-	ConcurrentTaskRunning = CadenceMetricsPrefix + "concurrent-task-running"
+	ConcurrentTaskQuota      = CadenceMetricsPrefix + "concurrent-task-quota"
+	PollerRequestBufferUsage = CadenceMetricsPrefix + "poller-request-buffer-usage"
 )

internal/internal_worker_base.go

@@ -253,7 +253,9 @@ func (bw *baseWorker) runPoller() {
 			return
 		case <-bw.pollerRequestCh:
 			bw.metricsScope.Gauge(metrics.ConcurrentTaskQuota).Update(float64(cap(bw.pollerRequestCh)))
-			bw.metricsScope.Gauge(metrics.ConcurrentTaskRunning).Update(float64(cap(bw.pollerRequestCh) - len(bw.pollerRequestCh)))
+			// This metric is used to monitor how many poll requests have been allocated
+			// and can be used to approximate number of concurrent task running (not pinpoint accurate)
+			bw.metricsScope.Gauge(metrics.PollerRequestBufferUsage).Update(float64(cap(bw.pollerRequestCh) - len(bw.pollerRequestCh)))
 			if bw.sessionTokenBucket != nil {
 				bw.sessionTokenBucket.waitForAvailableToken()
 			}