add missing workflowtype and activitytype metric tags (#581)

Author: mkolodezny

src/main/java/com/uber/cadence/internal/worker/ActivityPollTaskBase.java

@@ -18,8 +18,11 @@
 package com.uber.cadence.internal.worker;
 
 import com.uber.cadence.PollForActivityTaskResponse;
+import com.uber.cadence.internal.metrics.MetricsTag;
 import com.uber.cadence.internal.metrics.MetricsType;
+import com.uber.m3.tally.Scope;
 import com.uber.m3.util.Duration;
+import com.uber.m3.util.ImmutableMap;
 import org.apache.thrift.TException;
 
 abstract class ActivityPollTaskBase implements Poller.PollTask<PollForActivityTaskResponse> {
@@ -36,10 +39,18 @@ public PollForActivityTaskResponse poll() throws TException {
     if (result == null || result.getTaskToken() == null) {
       return null;
     }
-    options.getMetricsScope().counter(MetricsType.ACTIVITY_POLL_SUCCEED_COUNTER).inc(1);
-    options
-        .getMetricsScope()
-        .timer(MetricsType.ACTIVITY_SCHEDULED_TO_START_LATENCY)
+
+    Scope metricsScope =
+        options
+            .getMetricsScope()
+            .tagged(
+                ImmutableMap.of(
+                    MetricsTag.ACTIVITY_TYPE,
+                    result.getActivityType().getName(),
+                    MetricsTag.WORKFLOW_TYPE,
+                    result.getWorkflowType().getName()));
+    metricsScope.counter(MetricsType.ACTIVITY_POLL_SUCCEED_COUNTER).inc(1);
+    metricsScope.timer(MetricsType.ACTIVITY_SCHEDULED_TO_START_LATENCY)
         .record(
             Duration.ofNanos(
                 result.getStartedTimestamp() - result.getScheduledTimestampOfThisAttempt()));

src/main/java/com/uber/cadence/internal/worker/WorkflowPollTask.java

@@ -22,24 +22,26 @@
 import com.uber.cadence.PollForDecisionTaskResponse;
 import com.uber.cadence.ServiceBusyError;
 import com.uber.cadence.TaskList;
+import com.uber.cadence.internal.metrics.MetricsTag;
 import com.uber.cadence.internal.metrics.MetricsType;
 import com.uber.cadence.serviceclient.IWorkflowService;
 import com.uber.m3.tally.Scope;
 import com.uber.m3.tally.Stopwatch;
 import com.uber.m3.util.Duration;
+import com.uber.m3.util.ImmutableMap;
 import java.util.Objects;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 final class WorkflowPollTask implements Poller.PollTask<PollForDecisionTaskResponse> {
 
+  private static final Logger log = LoggerFactory.getLogger(WorkflowWorker.class);
   private final Scope metricScope;
   private final IWorkflowService service;
   private final String domain;
   private final String taskList;
   private final String identity;
-  private static final Logger log = LoggerFactory.getLogger(WorkflowWorker.class);
 
   WorkflowPollTask(
       IWorkflowService service,
@@ -92,17 +94,20 @@ public PollForDecisionTaskResponse poll() throws TException {
               + ", previousStartedEventId="
               + result.getPreviousStartedEventId()
               + (result.getQuery() != null
-                  ? ", queryType=" + result.getQuery().getQueryType()
-                  : ""));
+              ? ", queryType=" + result.getQuery().getQueryType()
+              : ""));
     }
 
     if (result == null || result.getTaskToken() == null) {
       metricScope.counter(MetricsType.DECISION_POLL_NO_TASK_COUNTER).inc(1);
       return null;
     }
 
-    metricScope.counter(MetricsType.DECISION_POLL_SUCCEED_COUNTER).inc(1);
-    metricScope
+    Scope metricsScope =
+        metricScope
+            .tagged(ImmutableMap.of(MetricsTag.WORKFLOW_TYPE, result.getWorkflowType().getName()));
+    metricsScope.counter(MetricsType.DECISION_POLL_SUCCEED_COUNTER).inc(1);
+    metricsScope
         .timer(MetricsType.DECISION_SCHEDULED_TO_START_LATENCY)
         .record(Duration.ofNanos(result.getStartedTimestamp() - result.getScheduledTimestamp()));
     sw.stop();