Skip to content

Add default metric tags to the metric scope #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 23, 2020
Merged

Add default metric tags to the metric scope #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de11ebb
Add default metric tags to the metric scope
vitarb Oct 21, 2020
527da8b
Add default tags in the Grpc interceptor
vitarb Oct 22, 2020
beaac9a
Add a cache for metric tags
vitarb Oct 22, 2020
04296ba
Add a comment
vitarb Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...al-sdk/src/main/java/io/temporal/internal/external/GenericWorkflowClientExternalImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/io/temporal/internal/external/ManualActivityCompletionClientFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
32 changes: 0 additions & 32 deletions temporal-sdk/src/main/java/io/temporal/internal/metrics/MetricsTag.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion temporal-sdk/src/main/java/io/temporal/internal/replay/ReplayWorkflowTaskHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion temporal-sdk/src/main/java/io/temporal/internal/sync/POJOActivityTaskHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions temporal-sdk/src/main/java/io/temporal/internal/sync/WorkflowClientInternal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion temporal-sdk/src/main/java/io/temporal/internal/worker/ActivityWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion temporal-sdk/src/main/java/io/temporal/internal/worker/LocalActivityWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion temporal-sdk/src/main/java/io/temporal/internal/worker/WorkflowWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion temporal-sdk/src/main/java/io/temporal/worker/Worker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 2 additions & 5 deletions temporal-sdk/src/main/java/io/temporal/worker/WorkerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion ...sdk/src/test/java/io/temporal/internal/replay/ReplayWorkflowRunTaskHandlerCacheTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion temporal-sdk/src/test/java/io/temporal/internal/sync/DeterministicRunnerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions temporal-sdk/src/test/java/io/temporal/worker/StickyWorkerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
Loading