Skip to content
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

Emits billable action metric for UpdateWorkflowExecutionOptions; fixes action metric for StartWorkflowExecution #7552

Merged
merged 5 commits into from
Apr 1, 2025
+27 −19
Merged

Emits billable action metric for UpdateWorkflowExecutionOptions; fixes action metric for StartWorkflowExecution #7552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2a8aeb
init checkin
mastermanu Apr 1, 2025
b45bb91
more changes
mastermanu Apr 1, 2025
2f08daf
Merge branch 'main' of https://github.com/temporalio/temporal into ma…
mastermanu Apr 1, 2025
6ada91f
fix lint bugs
mastermanu Apr 1, 2025
7f4ebf1
fix lint bugs
mastermanu Apr 1, 2025
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
20 changes: 7 additions & 13 deletions common/rpc/interceptor/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,20 @@ var (
)

var (
respondWorkflowTaskCompleted = "RespondWorkflowTaskCompleted"
pollActivityTaskQueue = "PollActivityTaskQueue"
startWorkflowExecution = "StartWorkflowExecution"
executeMultiOperation = "ExecuteMultiOperation"
queryWorkflow = "QueryWorkflow"
respondWorkflowTaskCompleted = "RespondWorkflowTaskCompleted"
pollActivityTaskQueue = "PollActivityTaskQueue"
startWorkflowExecution = "StartWorkflowExecution"
executeMultiOperation = "ExecuteMultiOperation"
queryWorkflow = "QueryWorkflow"
updateWorkflowExecutionOptions = "UpdateWorkflowExecutionOptions"

grpcActions = map[string]struct{}{
startWorkflowExecution: {},
executeMultiOperation: {},
respondWorkflowTaskCompleted: {},
pollActivityTaskQueue: {},
queryWorkflow: {},
updateWorkflowExecutionOptions: {},
"RecordActivityTaskHeartbeat": {},
"RecordActivityTaskHeartbeatById": {},
"ResetWorkflowExecution": {},
Expand Down Expand Up @@ -255,14 +257,6 @@ func (ti *TelemetryInterceptor) emitActionMetric(
}

switch methodName {
case startWorkflowExecution:
resp, ok := result.(*workflowservice.StartWorkflowExecutionResponse)
if !ok {
return
}
if resp.Started {
metrics.ActionCounter.With(metricsHandler).Record(1, metrics.ActionType("grpc_"+methodName))
}
Comment on lines -258 to -265
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intentional change?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this aligns with the documentation changes that I shared yesterday. we charge startworkflowexecution in cloud even if wf is already started

case executeMultiOperation:
resp, ok := result.(*workflowservice.ExecuteMultiOperationResponse)
if !ok {
Expand Down
26 changes: 20 additions & 6 deletions common/rpc/interceptor/telemetry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
protocolpb "go.temporal.io/api/protocol/v1"
querypb "go.temporal.io/api/query/v1"
"go.temporal.io/api/serviceerror"
workflowpb "go.temporal.io/api/workflow/v1"
"go.temporal.io/api/workflowservice/v1"
"go.temporal.io/server/api/historyservice/v1"
"go.temporal.io/server/common/api"
Expand Down Expand Up @@ -70,15 +71,10 @@ func TestEmitActionMetric(t *testing.T) {
req any
resp any
}{
{
methodName: startWorkflow,
fullName: api.WorkflowServicePrefix + startWorkflow,
resp: &workflowservice.StartWorkflowExecutionResponse{Started: false},
},
{
methodName: startWorkflow,
fullName: api.WorkflowServicePrefix + startWorkflow,
resp: &workflowservice.StartWorkflowExecutionResponse{Started: true},
resp: &workflowservice.StartWorkflowExecutionResponse{},
expectEmitMetrics: true,
},
{
Expand Down Expand Up @@ -216,6 +212,24 @@ func TestEmitActionMetric(t *testing.T) {
},
expectEmitMetrics: true,
},
{
methodName: updateWorkflowExecutionOptions,
fullName: api.WorkflowServicePrefix + updateWorkflowExecutionOptions,
req: &workflowservice.UpdateWorkflowExecutionOptionsRequest{
Namespace: "test-namespace",
WorkflowExecution: &commonpb.WorkflowExecution{
WorkflowId: "test-workflow-id",
RunId: "test-run-id",
},
WorkflowExecutionOptions: &workflowpb.WorkflowExecutionOptions{
VersioningOverride: &workflowpb.VersioningOverride{
Behavior: enumspb.VERSIONING_BEHAVIOR_PINNED,
PinnedVersion: "fake-version",
},
},
},
expectEmitMetrics: true,
},
{
methodName: queryWorkflow,
fullName: api.WorkflowServicePrefix + queryWorkflow,
Expand Down
Loading