Skip to content

Commit

Permalink
Rename ID to Id in proto files (#82)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexshtin
alexshtin authored Mar 31, 2020
1 parent 51e1705 commit e829ad7
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 63 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/uber-go/tally v3.3.15+incompatible
github.com/uber/jaeger-client-go v2.22.1+incompatible
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
go.temporal.io/temporal-proto v0.20.2
go.temporal.io/temporal-proto v0.20.4
go.uber.org/atomic v1.6.0
go.uber.org/goleak v1.0.0
go.uber.org/zap v1.14.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMW
github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=
github.com/uber/jaeger-lib v2.2.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U=
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
go.temporal.io/temporal-proto v0.20.2 h1:ll+VJaxyR4xzZWClT+CIcm4fQdzEdcBGf4Yksq4EVxI=
go.temporal.io/temporal-proto v0.20.2/go.mod h1:Lv8L8YBpbp0Z7V5nbvw5UD0j7x0isebhCOIDLkBqn6s=
go.temporal.io/temporal-proto v0.20.4 h1:mjuMZ9UCVBg4rfH8LDDwI76XjIfxurzsf94tOPXhTEs=
go.temporal.io/temporal-proto v0.20.4/go.mod h1:Lv8L8YBpbp0Z7V5nbvw5UD0j7x0isebhCOIDLkBqn6s=
go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/goleak v1.0.0 h1:qsup4IcBdlmsnGfqyLl4Ntn3C2XCCuKAE7DwHpScyUo=
Expand Down
24 changes: 12 additions & 12 deletions internal/common/metrics/service_wrapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ const (
scopeNamePollForActivityTask = TemporalMetricsPrefix + "PollForActivityTask"
scopeNamePollForDecisionTask = TemporalMetricsPrefix + "PollForDecisionTask"
scopeNameRecordActivityTaskHeartbeat = TemporalMetricsPrefix + "RecordActivityTaskHeartbeat"
scopeNameRecordActivityTaskHeartbeatByID = TemporalMetricsPrefix + "RecordActivityTaskHeartbeatByID"
scopeNameRecordActivityTaskHeartbeatByID = TemporalMetricsPrefix + "RecordActivityTaskHeartbeatById"
scopeNameRegisterNamespace = TemporalMetricsPrefix + "RegisterNamespace"
scopeNameRequestCancelWorkflowExecution = TemporalMetricsPrefix + "RequestCancelWorkflowExecution"
scopeNameRespondActivityTaskCanceled = TemporalMetricsPrefix + "RespondActivityTaskCanceled"
scopeNameRespondActivityTaskCompleted = TemporalMetricsPrefix + "RespondActivityTaskCompleted"
scopeNameRespondActivityTaskFailed = TemporalMetricsPrefix + "RespondActivityTaskFailed"
scopeNameRespondActivityTaskCanceledByID = TemporalMetricsPrefix + "RespondActivityTaskCanceledByID"
scopeNameRespondActivityTaskCompletedByID = TemporalMetricsPrefix + "RespondActivityTaskCompletedByID"
scopeNameRespondActivityTaskFailedByID = TemporalMetricsPrefix + "RespondActivityTaskFailedByID"
scopeNameRespondActivityTaskCanceledByID = TemporalMetricsPrefix + "RespondActivityTaskCanceledById"
scopeNameRespondActivityTaskCompletedByID = TemporalMetricsPrefix + "RespondActivityTaskCompletedById"
scopeNameRespondActivityTaskFailedByID = TemporalMetricsPrefix + "RespondActivityTaskFailedById"
scopeNameRespondDecisionTaskCompleted = TemporalMetricsPrefix + "RespondDecisionTaskCompleted"
scopeNameRespondDecisionTaskFailed = TemporalMetricsPrefix + "RespondDecisionTaskFailed"
scopeNameSignalWorkflowExecution = TemporalMetricsPrefix + "SignalWorkflowExecution"
Expand Down Expand Up @@ -216,9 +216,9 @@ func (w *workflowServiceMetricsWrapper) RecordActivityTaskHeartbeat(ctx context.
return result, err
}

func (w *workflowServiceMetricsWrapper) RecordActivityTaskHeartbeatByID(ctx context.Context, request *workflowservice.RecordActivityTaskHeartbeatByIDRequest, opts ...grpc.CallOption) (*workflowservice.RecordActivityTaskHeartbeatByIDResponse, error) {
func (w *workflowServiceMetricsWrapper) RecordActivityTaskHeartbeatById(ctx context.Context, request *workflowservice.RecordActivityTaskHeartbeatByIdRequest, opts ...grpc.CallOption) (*workflowservice.RecordActivityTaskHeartbeatByIdResponse, error) {
scope := w.getOperationScope(scopeNameRecordActivityTaskHeartbeatByID)
result, err := w.service.RecordActivityTaskHeartbeatByID(ctx, request, opts...)
result, err := w.service.RecordActivityTaskHeartbeatById(ctx, request, opts...)
scope.handleError(err)
return result, err
}
Expand Down Expand Up @@ -258,23 +258,23 @@ func (w *workflowServiceMetricsWrapper) RespondActivityTaskFailed(ctx context.Co
return result, err
}

func (w *workflowServiceMetricsWrapper) RespondActivityTaskCanceledByID(ctx context.Context, request *workflowservice.RespondActivityTaskCanceledByIDRequest, opts ...grpc.CallOption) (*workflowservice.RespondActivityTaskCanceledByIDResponse, error) {
func (w *workflowServiceMetricsWrapper) RespondActivityTaskCanceledById(ctx context.Context, request *workflowservice.RespondActivityTaskCanceledByIdRequest, opts ...grpc.CallOption) (*workflowservice.RespondActivityTaskCanceledByIdResponse, error) {
scope := w.getOperationScope(scopeNameRespondActivityTaskCanceledByID)
result, err := w.service.RespondActivityTaskCanceledByID(ctx, request, opts...)
result, err := w.service.RespondActivityTaskCanceledById(ctx, request, opts...)
scope.handleError(err)
return result, err
}

func (w *workflowServiceMetricsWrapper) RespondActivityTaskCompletedByID(ctx context.Context, request *workflowservice.RespondActivityTaskCompletedByIDRequest, opts ...grpc.CallOption) (*workflowservice.RespondActivityTaskCompletedByIDResponse, error) {
func (w *workflowServiceMetricsWrapper) RespondActivityTaskCompletedById(ctx context.Context, request *workflowservice.RespondActivityTaskCompletedByIdRequest, opts ...grpc.CallOption) (*workflowservice.RespondActivityTaskCompletedByIdResponse, error) {
scope := w.getOperationScope(scopeNameRespondActivityTaskCompletedByID)
result, err := w.service.RespondActivityTaskCompletedByID(ctx, request, opts...)
result, err := w.service.RespondActivityTaskCompletedById(ctx, request, opts...)
scope.handleError(err)
return result, err
}

func (w *workflowServiceMetricsWrapper) RespondActivityTaskFailedByID(ctx context.Context, request *workflowservice.RespondActivityTaskFailedByIDRequest, opts ...grpc.CallOption) (*workflowservice.RespondActivityTaskFailedByIDResponse, error) {
func (w *workflowServiceMetricsWrapper) RespondActivityTaskFailedById(ctx context.Context, request *workflowservice.RespondActivityTaskFailedByIdRequest, opts ...grpc.CallOption) (*workflowservice.RespondActivityTaskFailedByIdResponse, error) {
scope := w.getOperationScope(scopeNameRespondActivityTaskFailedByID)
result, err := w.service.RespondActivityTaskFailedByID(ctx, request, opts...)
result, err := w.service.RespondActivityTaskFailedById(ctx, request, opts...)
scope.handleError(err)
return result, err
}
Expand Down
22 changes: 11 additions & 11 deletions internal/common/metrics/service_wrapper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ func Test_Wrapper(t *testing.T) {
{"RespondActivityTaskCanceled", []interface{}{ctx, &workflowservice.RespondActivityTaskCanceledRequest{}}, []interface{}{&workflowservice.RespondActivityTaskCanceledResponse{}, nil}, []string{TemporalRequest}},
{"RespondActivityTaskCompleted", []interface{}{ctx, &workflowservice.RespondActivityTaskCompletedRequest{}}, []interface{}{&workflowservice.RespondActivityTaskCompletedResponse{}, nil}, []string{TemporalRequest}},
{"RespondActivityTaskFailed", []interface{}{ctx, &workflowservice.RespondActivityTaskFailedRequest{}}, []interface{}{&workflowservice.RespondActivityTaskFailedResponse{}, nil}, []string{TemporalRequest}},
{"RespondActivityTaskCanceledByID", []interface{}{ctx, &workflowservice.RespondActivityTaskCanceledByIDRequest{}}, []interface{}{&workflowservice.RespondActivityTaskCanceledByIDResponse{}, nil}, []string{TemporalRequest}},
{"RespondActivityTaskCompletedByID", []interface{}{ctx, &workflowservice.RespondActivityTaskCompletedByIDRequest{}}, []interface{}{&workflowservice.RespondActivityTaskCompletedByIDResponse{}, nil}, []string{TemporalRequest}},
{"RespondActivityTaskFailedByID", []interface{}{ctx, &workflowservice.RespondActivityTaskFailedByIDRequest{}}, []interface{}{&workflowservice.RespondActivityTaskFailedByIDResponse{}, nil}, []string{TemporalRequest}},
{"RespondActivityTaskCanceledById", []interface{}{ctx, &workflowservice.RespondActivityTaskCanceledByIdRequest{}}, []interface{}{&workflowservice.RespondActivityTaskCanceledByIdResponse{}, nil}, []string{TemporalRequest}},
{"RespondActivityTaskCompletedById", []interface{}{ctx, &workflowservice.RespondActivityTaskCompletedByIdRequest{}}, []interface{}{&workflowservice.RespondActivityTaskCompletedByIdResponse{}, nil}, []string{TemporalRequest}},
{"RespondActivityTaskFailedById", []interface{}{ctx, &workflowservice.RespondActivityTaskFailedByIdRequest{}}, []interface{}{&workflowservice.RespondActivityTaskFailedByIdResponse{}, nil}, []string{TemporalRequest}},
{"RespondDecisionTaskCompleted", []interface{}{ctx, &workflowservice.RespondDecisionTaskCompletedRequest{}}, []interface{}{nil, nil}, []string{TemporalRequest}},
{"SignalWorkflowExecution", []interface{}{ctx, &workflowservice.SignalWorkflowExecutionRequest{}}, []interface{}{&workflowservice.SignalWorkflowExecutionResponse{}, nil}, []string{TemporalRequest}},
{"StartWorkflowExecution", []interface{}{ctx, &workflowservice.StartWorkflowExecutionRequest{}}, []interface{}{&workflowservice.StartWorkflowExecutionResponse{}, nil}, []string{TemporalRequest}},
Expand Down Expand Up @@ -137,8 +137,8 @@ func runTest(
mockService.EXPECT().PollForDecisionTask(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RecordActivityTaskHeartbeat":
mockService.EXPECT().RecordActivityTaskHeartbeat(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RecordActivityTaskHeartbeatByID":
mockService.EXPECT().RecordActivityTaskHeartbeatByID(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RecordActivityTaskHeartbeatById":
mockService.EXPECT().RecordActivityTaskHeartbeatById(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RegisterNamespace":
mockService.EXPECT().RegisterNamespace(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RequestCancelWorkflowExecution":
Expand All @@ -149,12 +149,12 @@ func runTest(
mockService.EXPECT().RespondActivityTaskCompleted(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RespondActivityTaskFailed":
mockService.EXPECT().RespondActivityTaskFailed(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RespondActivityTaskCanceledByID":
mockService.EXPECT().RespondActivityTaskCanceledByID(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RespondActivityTaskCompletedByID":
mockService.EXPECT().RespondActivityTaskCompletedByID(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RespondActivityTaskFailedByID":
mockService.EXPECT().RespondActivityTaskFailedByID(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RespondActivityTaskCanceledById":
mockService.EXPECT().RespondActivityTaskCanceledById(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RespondActivityTaskCompletedById":
mockService.EXPECT().RespondActivityTaskCompletedById(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RespondActivityTaskFailedById":
mockService.EXPECT().RespondActivityTaskFailedById(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "RespondDecisionTaskCompleted":
mockService.EXPECT().RespondDecisionTaskCompleted(gomock.Any(), gomock.Any(), gomock.Any()).Return(returns...)
case "SignalWorkflowExecution":
Expand Down
12 changes: 6 additions & 6 deletions internal/internal_task_handlers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1880,22 +1880,22 @@ func recordActivityHeartbeatByID(
namespace, workflowID, runID, activityID string,
details []byte,
) error {
request := &workflowservice.RecordActivityTaskHeartbeatByIDRequest{
request := &workflowservice.RecordActivityTaskHeartbeatByIdRequest{
Namespace: namespace,
WorkflowID: workflowID,
RunID: runID,
ActivityID: activityID,
WorkflowId: workflowID,
RunId: runID,
ActivityId: activityID,
Details: details,
Identity: identity}

var heartbeatResponse *workflowservice.RecordActivityTaskHeartbeatByIDResponse
var heartbeatResponse *workflowservice.RecordActivityTaskHeartbeatByIdResponse
heartbeatErr := backoff.Retry(ctx,
func() error {
tchCtx, cancel := newChannelContext(ctx)
defer cancel()

var err error
heartbeatResponse, err = service.RecordActivityTaskHeartbeatByID(tchCtx, request)
heartbeatResponse, err = service.RecordActivityTaskHeartbeatById(tchCtx, request)
return err
}, createDynamicServiceRetryPolicy(ctx), isServiceTransientError)

Expand Down
42 changes: 21 additions & 21 deletions internal/internal_task_pollers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -940,41 +940,41 @@ func reportActivityCompleteByID(ctx context.Context, service workflowservice.Wor

var reportErr error
switch request := request.(type) {
case *workflowservice.RespondActivityTaskCanceledByIDRequest:
case *workflowservice.RespondActivityTaskCanceledByIdRequest:
reportErr = backoff.Retry(ctx,
func() error {
tchCtx, cancel := newChannelContext(ctx)
defer cancel()

_, err := service.RespondActivityTaskCanceledByID(tchCtx, request)
_, err := service.RespondActivityTaskCanceledById(tchCtx, request)
return err
}, createDynamicServiceRetryPolicy(ctx), isServiceTransientError)
case *workflowservice.RespondActivityTaskFailedByIDRequest:
case *workflowservice.RespondActivityTaskFailedByIdRequest:
reportErr = backoff.Retry(ctx,
func() error {
tchCtx, cancel := newChannelContext(ctx)
defer cancel()

_, err := service.RespondActivityTaskFailedByID(tchCtx, request)
_, err := service.RespondActivityTaskFailedById(tchCtx, request)
return err
}, createDynamicServiceRetryPolicy(ctx), isServiceTransientError)
case *workflowservice.RespondActivityTaskCompletedByIDRequest:
case *workflowservice.RespondActivityTaskCompletedByIdRequest:
reportErr = backoff.Retry(ctx,
func() error {
tchCtx, cancel := newChannelContext(ctx)
defer cancel()

_, err := service.RespondActivityTaskCompletedByID(tchCtx, request)
_, err := service.RespondActivityTaskCompletedById(tchCtx, request)
return err
}, createDynamicServiceRetryPolicy(ctx), isServiceTransientError)
}
if reportErr == nil {
switch request.(type) {
case *workflowservice.RespondActivityTaskCanceledByIDRequest:
case *workflowservice.RespondActivityTaskCanceledByIdRequest:
metricsScope.Counter(metrics.ActivityTaskCanceledByIDCounter).Inc(1)
case *workflowservice.RespondActivityTaskFailedByIDRequest:
case *workflowservice.RespondActivityTaskFailedByIdRequest:
metricsScope.Counter(metrics.ActivityTaskFailedByIDCounter).Inc(1)
case *workflowservice.RespondActivityTaskCompletedByIDRequest:
case *workflowservice.RespondActivityTaskCompletedByIdRequest:
metricsScope.Counter(metrics.ActivityTaskCompletedByIDCounter).Inc(1)
}
}
Expand Down Expand Up @@ -1021,31 +1021,31 @@ func convertActivityResultToRespondRequestByID(identity, namespace, workflowID,
}

if err == nil {
return &workflowservice.RespondActivityTaskCompletedByIDRequest{
return &workflowservice.RespondActivityTaskCompletedByIdRequest{
Namespace: namespace,
WorkflowID: workflowID,
RunID: runID,
ActivityID: activityID,
WorkflowId: workflowID,
RunId: runID,
ActivityId: activityID,
Result: result,
Identity: identity}
}

reason, details := getErrorDetails(err, dataConverter)
if _, ok := err.(*CanceledError); ok || err == context.Canceled {
return &workflowservice.RespondActivityTaskCanceledByIDRequest{
return &workflowservice.RespondActivityTaskCanceledByIdRequest{
Namespace: namespace,
WorkflowID: workflowID,
RunID: runID,
ActivityID: activityID,
WorkflowId: workflowID,
RunId: runID,
ActivityId: activityID,
Details: details,
Identity: identity}
}

return &workflowservice.RespondActivityTaskFailedByIDRequest{
return &workflowservice.RespondActivityTaskFailedByIdRequest{
Namespace: namespace,
WorkflowID: workflowID,
RunID: runID,
ActivityID: activityID,
WorkflowId: workflowID,
RunId: runID,
ActivityId: activityID,
Reason: reason,
Details: details,
Identity: identity}
Expand Down
20 changes: 10 additions & 10 deletions internal/internal_worker_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,16 +645,16 @@ func (s *internalWorkerTestSuite) TestCompleteActivityById() {
mockService := s.service
wfClient := NewServiceClient(mockService, nil, ClientOptions{Namespace: "testNamespace"})
var completedRequest, canceledRequest, failedRequest interface{}
mockService.EXPECT().RespondActivityTaskCompletedByID(gomock.Any(), gomock.Any(), gomock.Any()).Return(&workflowservice.RespondActivityTaskCompletedByIDResponse{}, nil).Do(
func(ctx context.Context, request *workflowservice.RespondActivityTaskCompletedByIDRequest, opts ...grpc.CallOption) {
mockService.EXPECT().RespondActivityTaskCompletedById(gomock.Any(), gomock.Any(), gomock.Any()).Return(&workflowservice.RespondActivityTaskCompletedByIdResponse{}, nil).Do(
func(ctx context.Context, request *workflowservice.RespondActivityTaskCompletedByIdRequest, opts ...grpc.CallOption) {
completedRequest = request
})
mockService.EXPECT().RespondActivityTaskCanceledByID(gomock.Any(), gomock.Any(), gomock.Any()).Return(&workflowservice.RespondActivityTaskCanceledByIDResponse{}, nil).Do(
func(ctx context.Context, request *workflowservice.RespondActivityTaskCanceledByIDRequest, opts ...grpc.CallOption) {
mockService.EXPECT().RespondActivityTaskCanceledById(gomock.Any(), gomock.Any(), gomock.Any()).Return(&workflowservice.RespondActivityTaskCanceledByIdResponse{}, nil).Do(
func(ctx context.Context, request *workflowservice.RespondActivityTaskCanceledByIdRequest, opts ...grpc.CallOption) {
canceledRequest = request
})
mockService.EXPECT().RespondActivityTaskFailedByID(gomock.Any(), gomock.Any(), gomock.Any()).Return(&workflowservice.RespondActivityTaskFailedByIDResponse{}, nil).Do(
func(ctx context.Context, request *workflowservice.RespondActivityTaskFailedByIDRequest, opts ...grpc.CallOption) {
mockService.EXPECT().RespondActivityTaskFailedById(gomock.Any(), gomock.Any(), gomock.Any()).Return(&workflowservice.RespondActivityTaskFailedByIdResponse{}, nil).Do(
func(ctx context.Context, request *workflowservice.RespondActivityTaskFailedByIdRequest, opts ...grpc.CallOption) {
failedRequest = request
})

Expand Down Expand Up @@ -710,10 +710,10 @@ func (s *internalWorkerTestSuite) TestRecordActivityHeartbeat_WithDataConverter(

func (s *internalWorkerTestSuite) TestRecordActivityHeartbeatByID() {
wfClient := NewServiceClient(s.service, nil, ClientOptions{Namespace: "testNamespace"})
var heartbeatRequest *workflowservice.RecordActivityTaskHeartbeatByIDRequest
heartbeatResponse := workflowservice.RecordActivityTaskHeartbeatByIDResponse{CancelRequested: false}
s.service.EXPECT().RecordActivityTaskHeartbeatByID(gomock.Any(), gomock.Any(), gomock.Any()).Return(&heartbeatResponse, nil).
Do(func(ctx context.Context, request *workflowservice.RecordActivityTaskHeartbeatByIDRequest, opts ...grpc.CallOption) {
var heartbeatRequest *workflowservice.RecordActivityTaskHeartbeatByIdRequest
heartbeatResponse := workflowservice.RecordActivityTaskHeartbeatByIdResponse{CancelRequested: false}
s.service.EXPECT().RecordActivityTaskHeartbeatById(gomock.Any(), gomock.Any(), gomock.Any()).Return(&heartbeatResponse, nil).
Do(func(ctx context.Context, request *workflowservice.RecordActivityTaskHeartbeatByIdRequest, opts ...grpc.CallOption) {
heartbeatRequest = request
}).Times(2)

Expand Down

0 comments on commit e829ad7

Please sign in to comment.