Add default metric tags to the metric scope (#230)

vitarb · web-flow · commit 8fba0454392a · 2020-10-22T19:16:39.000-07:00
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/external/GenericWorkflowClientExternalImpl.java b/temporal-sdk/src/main/java/io/temporal/internal/external/GenericWorkflowClientExternalImpl.java
@@ -36,7 +36,7 @@
 import io.temporal.api.workflowservice.v1.TerminateWorkflowExecutionRequest;
 import io.temporal.internal.common.GrpcRetryer;
 import io.temporal.internal.common.SignalWithStartWorkflowExecutionParameters;
-import io.temporal.internal.metrics.MetricsTag;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import java.util.Map;
 import java.util.Optional;
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/external/ManualActivityCompletionClientFactoryImpl.java b/temporal-sdk/src/main/java/io/temporal/internal/external/ManualActivityCompletionClientFactoryImpl.java
@@ -23,7 +23,7 @@
 import com.uber.m3.util.ImmutableMap;
 import io.temporal.api.common.v1.WorkflowExecution;
 import io.temporal.common.converter.DataConverter;
-import io.temporal.internal.metrics.MetricsTag;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import java.util.Map;
 import java.util.Objects;
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/metrics/MetricsTag.java b/temporal-sdk/src/main/java/io/temporal/internal/metrics/MetricsTag.java
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowTaskHandler.java b/temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowTaskHandler.java
@@ -44,12 +44,12 @@
 import io.temporal.failure.FailureConverter;
 import io.temporal.internal.common.ProtobufTimeUtils;
 import io.temporal.internal.common.WorkflowExecutionUtils;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.metrics.MetricsType;
 import io.temporal.internal.worker.LocalActivityWorker;
 import io.temporal.internal.worker.SingleWorkerOptions;
 import io.temporal.internal.worker.WorkflowExecutionException;
 import io.temporal.internal.worker.WorkflowTaskHandler;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.workflow.Functions;
 import java.io.PrintWriter;
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/sync/POJOActivityTaskHandler.java b/temporal-sdk/src/main/java/io/temporal/internal/sync/POJOActivityTaskHandler.java
@@ -39,10 +39,10 @@
 import io.temporal.failure.TemporalFailure;
 import io.temporal.failure.TimeoutFailure;
 import io.temporal.internal.common.CheckedExceptionWrapper;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.metrics.MetricsType;
 import io.temporal.internal.replay.FailureWrapperException;
 import io.temporal.internal.worker.ActivityTaskHandler;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.testing.SimulatedTimeoutFailure;
 import java.lang.reflect.InvocationTargetException;
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowClientInternal.java b/temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowClientInternal.java
@@ -19,12 +19,9 @@
 
 package io.temporal.internal.sync;
 
-import static io.temporal.internal.metrics.MetricsTag.NAMESPACE;
-
 import com.google.common.base.Strings;
 import com.google.common.reflect.TypeToken;
 import com.uber.m3.tally.Scope;
-import com.uber.m3.util.ImmutableMap;
 import io.temporal.api.common.v1.WorkflowExecution;
 import io.temporal.client.ActivityCompletionClient;
 import io.temporal.client.BatchRequest;
@@ -38,6 +35,7 @@
 import io.temporal.internal.external.ManualActivityCompletionClientFactory;
 import io.temporal.internal.external.ManualActivityCompletionClientFactoryImpl;
 import io.temporal.internal.sync.WorkflowInvocationHandler.InvocationType;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.workflow.Functions;
 import io.temporal.workflow.QueryMethod;
@@ -83,7 +81,7 @@ private WorkflowClientInternal(
         workflowServiceStubs
             .getOptions()
             .getMetricsScope()
-            .tagged(new ImmutableMap.Builder<String, String>(1).put(NAMESPACE, namespace).build());
+            .tagged(MetricsTag.defaultTags(namespace));
     this.genericClient =
         new GenericWorkflowClientExternalImpl(
             workflowServiceStubs, options.getNamespace(), options.getIdentity(), metricsScope);
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/worker/ActivityWorker.java b/temporal-sdk/src/main/java/io/temporal/internal/worker/ActivityWorker.java
@@ -38,10 +38,10 @@
 import io.temporal.internal.common.ProtobufTimeUtils;
 import io.temporal.internal.common.RpcRetryOptions;
 import io.temporal.internal.logging.LoggerTag;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.metrics.MetricsType;
 import io.temporal.internal.replay.FailureWrapperException;
 import io.temporal.internal.worker.ActivityTaskHandler.Result;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/worker/LocalActivityWorker.java b/temporal-sdk/src/main/java/io/temporal/internal/worker/LocalActivityWorker.java
@@ -27,9 +27,9 @@
 import io.temporal.api.workflowservice.v1.PollActivityTaskQueueResponse;
 import io.temporal.common.RetryOptions;
 import io.temporal.internal.common.ProtobufTimeUtils;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.metrics.MetricsType;
 import io.temporal.internal.replay.ExecuteLocalActivityParameters;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.workflow.Functions;
 import java.time.Duration;
 import java.util.Map;
diff --git a/temporal-sdk/src/main/java/io/temporal/internal/worker/WorkflowWorker.java b/temporal-sdk/src/main/java/io/temporal/internal/worker/WorkflowWorker.java
@@ -45,8 +45,8 @@
 import io.temporal.internal.common.WorkflowExecutionHistory;
 import io.temporal.internal.common.WorkflowExecutionUtils;
 import io.temporal.internal.logging.LoggerTag;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.metrics.MetricsType;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.workflow.Functions;
 import java.util.List;
diff --git a/temporal-sdk/src/main/java/io/temporal/worker/Worker.java b/temporal-sdk/src/main/java/io/temporal/worker/Worker.java
@@ -30,14 +30,14 @@
 import io.temporal.common.converter.DataConverter;
 import io.temporal.internal.common.InternalUtils;
 import io.temporal.internal.common.WorkflowExecutionHistory;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.replay.WorkflowExecutorCache;
 import io.temporal.internal.sync.SyncActivityWorker;
 import io.temporal.internal.sync.SyncWorkflowWorker;
 import io.temporal.internal.sync.WorkflowInternal;
 import io.temporal.internal.worker.PollerOptions;
 import io.temporal.internal.worker.SingleWorkerOptions;
 import io.temporal.internal.worker.Suspendable;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.workflow.Functions.Func;
 import io.temporal.workflow.WorkflowMethod;
diff --git a/temporal-sdk/src/main/java/io/temporal/worker/WorkerFactory.java b/temporal-sdk/src/main/java/io/temporal/worker/WorkerFactory.java
@@ -28,12 +28,12 @@
 import io.temporal.client.WorkflowClient;
 import io.temporal.common.converter.DataConverter;
 import io.temporal.internal.common.InternalUtils;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.replay.WorkflowExecutorCache;
 import io.temporal.internal.worker.PollWorkflowTaskDispatcher;
 import io.temporal.internal.worker.Poller;
 import io.temporal.internal.worker.PollerOptions;
 import io.temporal.internal.worker.WorkflowPollTaskFactory;
+import io.temporal.serviceclient.MetricsTag;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -106,10 +106,7 @@ private WorkerFactory(WorkflowClient workflowClient, WorkerFactoryOptions factor
             .getWorkflowServiceStubs()
             .getOptions()
             .getMetricsScope()
-            .tagged(
-                new ImmutableMap.Builder<String, String>(1)
-                    .put(MetricsTag.NAMESPACE, workflowClient.getOptions().getNamespace())
-                    .build());
+            .tagged(MetricsTag.defaultTags(workflowClient.getOptions().getNamespace()));
 
     this.cache =
         new WorkflowExecutorCache(
diff --git a/temporal-sdk/src/test/java/io/temporal/internal/replay/ReplayWorkflowRunTaskHandlerCacheTests.java b/temporal-sdk/src/test/java/io/temporal/internal/replay/ReplayWorkflowRunTaskHandlerCacheTests.java
@@ -38,11 +38,11 @@
 import io.temporal.api.query.v1.WorkflowQuery;
 import io.temporal.api.workflowservice.v1.PollWorkflowTaskQueueResponse;
 import io.temporal.common.reporter.TestStatsReporter;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.metrics.MetricsType;
 import io.temporal.internal.testservice.TestWorkflowService;
 import io.temporal.internal.worker.SingleWorkerOptions;
 import io.temporal.internal.worker.WorkflowExecutionException;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.testUtils.HistoryUtils;
 import io.temporal.worker.WorkflowImplementationOptions;
diff --git a/temporal-sdk/src/test/java/io/temporal/internal/sync/DeterministicRunnerTest.java b/temporal-sdk/src/test/java/io/temporal/internal/sync/DeterministicRunnerTest.java
@@ -37,12 +37,12 @@
 import io.temporal.common.RetryOptions;
 import io.temporal.common.converter.DataConverter;
 import io.temporal.failure.CanceledFailure;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.metrics.MetricsType;
 import io.temporal.internal.replay.ReplayWorkflowContext;
 import io.temporal.internal.replay.WorkflowExecutorCache;
 import io.temporal.internal.replay.WorkflowRunTaskHandler;
 import io.temporal.internal.replay.WorkflowTaskResult;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.testUtils.HistoryUtils;
 import io.temporal.workflow.Async;
 import io.temporal.workflow.CancellationScope;
diff --git a/temporal-sdk/src/test/java/io/temporal/worker/StickyWorkerTest.java b/temporal-sdk/src/test/java/io/temporal/worker/StickyWorkerTest.java
@@ -33,9 +33,9 @@
 import io.temporal.client.WorkflowClientOptions;
 import io.temporal.client.WorkflowOptions;
 import io.temporal.common.reporter.TestStatsReporter;
-import io.temporal.internal.metrics.MetricsTag;
 import io.temporal.internal.metrics.MetricsType;
 import io.temporal.internal.replay.WorkflowExecutorCache;
+import io.temporal.serviceclient.MetricsTag;
 import io.temporal.serviceclient.WorkflowServiceStubs;
 import io.temporal.serviceclient.WorkflowServiceStubsOptions;
 import io.temporal.testing.TestEnvironmentOptions;
@@ -158,8 +158,8 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedSignals() throws Exception
 
     // Verify the workflow succeeded without having to recover from a failure
     Map<String, String> tags =
-        new ImmutableMap.Builder<String, String>(2)
-            .put(MetricsTag.NAMESPACE, NAMESPACE)
+        new ImmutableMap.Builder<String, String>(9)
+            .putAll(MetricsTag.defaultTags(NAMESPACE))
             .put(MetricsTag.TASK_QUEUE, taskQueueName)
             .put(MetricsTag.WORKFLOW_TYPE, "GreetingSignalWorkflow")
             .build();
@@ -258,8 +258,8 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedActivities() throws Except
 
     // Verify the workflow succeeded without having to recover from a failure
     Map<String, String> tags =
-        new ImmutableMap.Builder<String, String>(2)
-            .put(MetricsTag.NAMESPACE, NAMESPACE)
+        new ImmutableMap.Builder<String, String>(9)
+            .putAll(MetricsTag.defaultTags(NAMESPACE))
             .put(MetricsTag.TASK_QUEUE, taskQueueName)
             .put(MetricsTag.WORKFLOW_TYPE, "ActivitiesWorkflow")
             .build();
@@ -299,8 +299,8 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedChildWorkflows() throws Ex
 
     // Verify the workflow succeeded without having to recover from a failure
     Map<String, String> tags =
-        new ImmutableMap.Builder<String, String>(2)
-            .put(MetricsTag.NAMESPACE, NAMESPACE)
+        new ImmutableMap.Builder<String, String>(9)
+            .putAll(MetricsTag.defaultTags(NAMESPACE))
             .put(MetricsTag.TASK_QUEUE, taskQueueName)
             .put(MetricsTag.WORKFLOW_TYPE, "GreetingParentWorkflow")
             .build();
@@ -348,8 +348,8 @@ public void whenStickyIsEnabledThenTheWorkflowIsCachedMutableSideEffect() throws
 
     // Verify the workflow succeeded without having to recover from a failure
     Map<String, String> tags =
-        new ImmutableMap.Builder<String, String>(2)
-            .put(MetricsTag.NAMESPACE, NAMESPACE)
+        new ImmutableMap.Builder<String, String>(9)
+            .putAll(MetricsTag.defaultTags(NAMESPACE))
             .put(MetricsTag.TASK_QUEUE, taskQueueName)
             .put(MetricsTag.WORKFLOW_TYPE, "TestMutableSideEffectWorkflow")
             .build();
diff --git a/temporal-sdk/src/test/java/io/temporal/workflow/MetricsTest.java b/temporal-sdk/src/test/java/io/temporal/workflow/MetricsTest.java
diff --git a/temporal-serviceclient/src/main/java/io/temporal/serviceclient/GrpcMetricsInterceptor.java b/temporal-serviceclient/src/main/java/io/temporal/serviceclient/GrpcMetricsInterceptor.java
diff --git a/temporal-serviceclient/src/main/java/io/temporal/serviceclient/MetricsTag.java b/temporal-serviceclient/src/main/java/io/temporal/serviceclient/MetricsTag.java
