Revert "Revert "Plumb through workflow type into client (#590)" (#594)" (#595)

This reverts commit ffeb969.

Author: wxing1292

idl/github.com/uber/cadence/shared.thrift

@@ -945,6 +945,8 @@ struct PollForActivityTaskResponse {
   120: optional i32 attempt
   130: optional i64 (js.type = "Long") scheduledTimestampOfThisAttempt
   140: optional binary heartbeatDetails
+  150: optional WorkflowType workflowType
+  160: optional string workflowDomain
 }
 
 struct RecordActivityTaskHeartbeatRequest {

internal/activity.go

@@ -40,6 +40,8 @@ type (
 	// ActivityInfo contains information about currently executing activity.
 	ActivityInfo struct {
 		TaskToken          []byte
+		WorkflowType       *WorkflowType
+		WorkflowDomain     string
 		WorkflowExecution  WorkflowExecution
 		ActivityID         string
 		ActivityType       ActivityType
@@ -161,6 +163,8 @@ func GetActivityInfo(ctx context.Context) ActivityInfo {
 		StartedTimestamp:   env.startedTimestamp,
 		TaskList:           env.taskList,
 		Attempt:            env.attempt,
+		WorkflowType:       env.workflowType,
+		WorkflowDomain:     env.workflowDomain,
 	}
 }
 
@@ -277,6 +281,10 @@ func WithActivityTask(
 		dataConverter:      dataConverter,
 		attempt:            task.GetAttempt(),
 		heartbeatDetails:   task.HeartbeatDetails,
+		workflowType: &WorkflowType{
+			Name: *task.WorkflowType.Name,
+		},
+		workflowDomain: *task.WorkflowDomain,
 	})
 }
 

internal/internal_activity.go

@@ -125,6 +125,8 @@ type (
 		dataConverter      encoded.DataConverter
 		attempt            int32 // starts from 0.
 		heartbeatDetails   []byte
+		workflowType       *WorkflowType
+		workflowDomain     string
 	}
 
 	// context.WithValue need this type instead of basic type string to avoid lint error

internal/internal_task_handlers_test.go

@@ -666,6 +666,10 @@ func (t *TaskHandlersTestSuite) TestActivityExecutionDeadline() {
 			ScheduleToCloseTimeoutSeconds: common.Int32Ptr(d.ScheduleDuration),
 			StartedTimestamp:              common.Int64Ptr(d.StartTS.UnixNano()),
 			StartToCloseTimeoutSeconds:    common.Int32Ptr(d.StartDuration),
+			WorkflowType: &s.WorkflowType{
+				Name: common.StringPtr("wType"),
+			},
+			WorkflowDomain: common.StringPtr("domain"),
 		}
 		td := fmt.Sprintf("testIndex: %v, testDetails: %v", i, d)
 		r, err := activityHandler.Execute(tasklist, pats)

internal/internal_workflow_testsuite.go

@@ -44,10 +44,12 @@ import (
 )
 
 const (
-	defaultTestDomain     = "default-test-domain"
-	defaultTestTaskList   = "default-test-tasklist"
-	defaultTestWorkflowID = "default-test-workflow-id"
-	defaultTestRunID      = "default-test-run-id"
+	defaultTestDomain           = "default-test-domain"
+	defaultTestTaskList         = "default-test-tasklist"
+	defaultTestWorkflowID       = "default-test-workflow-id"
+	defaultTestRunID            = "default-test-run-id"
+	defaultTestWorkflowTypeName = "default-test-workflow-type-name"
+	defaultTestDomainName       = "default-test-domain-name"
 )
 
 type (
@@ -439,6 +441,8 @@ func (env *testWorkflowEnvironmentImpl) executeActivity(
 		defaultTestWorkflowID,
 		defaultTestRunID,
 		"0",
+		defaultTestWorkflowTypeName,
+		defaultTestDomainName,
 		params,
 	)
 
@@ -803,6 +807,8 @@ func (env *testWorkflowEnvironmentImpl) ExecuteActivity(parameters executeActivi
 		defaultTestWorkflowID,
 		defaultTestRunID,
 		activityInfo.activityID,
+		defaultTestWorkflowTypeName,
+		defaultTestDomainName,
 		parameters,
 	)
 
@@ -1365,7 +1371,7 @@ func (env *testWorkflowEnvironmentImpl) newTestActivityTaskHandler(taskList stri
 	return taskHandler
 }
 
-func newTestActivityTask(workflowID, runID, activityID string, params executeActivityParams) *shared.PollForActivityTaskResponse {
+func newTestActivityTask(workflowID, runID, activityID, workflowTypeName, domainName string, params executeActivityParams) *shared.PollForActivityTaskResponse {
 	task := &shared.PollForActivityTaskResponse{
 		WorkflowExecution: &shared.WorkflowExecution{
 			WorkflowId: common.StringPtr(workflowID),
@@ -1380,6 +1386,10 @@ func newTestActivityTask(workflowID, runID, activityID string, params executeAct
 		StartedTimestamp:              common.Int64Ptr(time.Now().UnixNano()),
 		StartToCloseTimeoutSeconds:    common.Int32Ptr(params.StartToCloseTimeoutSeconds),
 		HeartbeatTimeoutSeconds:       common.Int32Ptr(params.HeartbeatTimeoutSeconds),
+		WorkflowType: &shared.WorkflowType{
+			Name: common.StringPtr(workflowTypeName),
+		},
+		WorkflowDomain: common.StringPtr(domainName),
 	}
 	return task
 }