Return activity timeouts along with PollForActivityTask response (#167)

* Return activity timeouts along with PollForActivityTask response

* Also include scheduledTimestamp and startedTimestamp with the response

Author: samarabbas

.gen/go/shared/shared.go

@@ -555,12 +555,17 @@ struct PollForActivityTaskRequest {
 }
 
 struct PollForActivityTaskResponse {
-  10: optional binary taskToken
-  20: optional WorkflowExecution workflowExecution
-  30: optional string activityId
-  40: optional ActivityType activityType
-  50: optional binary input
-  60: optional i64 (js.type = "Long") startedEventId
+  10:  optional binary taskToken
+  20:  optional WorkflowExecution workflowExecution
+  30:  optional string activityId
+  40:  optional ActivityType activityType
+  50:  optional binary input
+  60:  optional i64 (js.type = "Long") startedEventId
+  70:  optional i64 (js.type = "Long") scheduledTimestamp
+  80:  optional i32 scheduleToCloseTimeoutSeconds
+  90:  optional i64 (js.type = "Long") startedTimestamp
+  100: optional i32 startToCloseTimeoutSeconds
+  110: optional i32 heartbeatTimeoutSeconds
 }
 
 struct RecordActivityTaskHeartbeatRequest {

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

@@ -361,6 +361,11 @@ func (e *matchingEngineImpl) createPollForActivityTaskResponse(context *taskCont
 	response.Input = attributes.GetInput()
 	response.StartedEventId = common.Int64Ptr(startedEvent.GetEventId())
 	response.WorkflowExecution = workflowExecutionPtr(context.workflowExecution)
+	response.ScheduledTimestamp = common.Int64Ptr(scheduledEvent.GetTimestamp())
+	response.ScheduleToCloseTimeoutSeconds = common.Int32Ptr(attributes.GetScheduleToCloseTimeoutSeconds())
+	response.StartedTimestamp = common.Int64Ptr(startedEvent.GetTimestamp())
+	response.StartToCloseTimeoutSeconds = common.Int32Ptr(attributes.GetStartToCloseTimeoutSeconds())
+	response.HeartbeatTimeoutSeconds = common.Int32Ptr(attributes.GetHeartbeatTimeoutSeconds())
 
 	token := &common.TaskToken{
 		DomainID:   task.DomainID,

service/matching/matchingEngine.go

@@ -297,10 +297,13 @@ func (s *matchingEngineSuite) TestAddThenConsumeActivities() {
 			return &gohistory.RecordActivityTaskStartedResponse{
 				ScheduledEvent: newActivityTaskScheduledEvent(*taskRequest.ScheduleId, 0,
 					&workflow.ScheduleActivityTaskDecisionAttributes{
-						ActivityId:   &activityID,
-						TaskList:     &workflow.TaskList{Name: taskList.Name},
-						ActivityType: activityType,
-						Input:        activityInput,
+						ActivityId:                    &activityID,
+						TaskList:                      &workflow.TaskList{Name: taskList.Name},
+						ActivityType:                  activityType,
+						Input:                         activityInput,
+						ScheduleToCloseTimeoutSeconds: common.Int32Ptr(100),
+						StartToCloseTimeoutSeconds:    common.Int32Ptr(50),
+						HeartbeatTimeoutSeconds:       common.Int32Ptr(10),
 					}),
 				StartedEvent: newActivityTaskStartedEvent(startedID, 0, &workflow.PollForActivityTaskRequest{
 					TaskList: &workflow.TaskList{Name: taskList.Name},
@@ -329,6 +332,11 @@ func (s *matchingEngineSuite) TestAddThenConsumeActivities() {
 		s.EqualValues(activityInput, result.Input)
 		s.EqualValues(startedID, *result.StartedEventId)
 		s.EqualValues(workflowExecution, *result.WorkflowExecution)
+		s.Equal(true, validateTimeRange(time.Unix(0, result.GetScheduledTimestamp()), time.Minute))
+		s.Equal(int32(100), result.GetScheduleToCloseTimeoutSeconds())
+		s.Equal(true, validateTimeRange(time.Unix(0, result.GetStartedTimestamp()), time.Minute))
+		s.Equal(int32(50), result.GetStartToCloseTimeoutSeconds())
+		s.Equal(int32(10), result.GetHeartbeatTimeoutSeconds())
 		token := &common.TaskToken{
 			DomainID:   domainID,
 			WorkflowID: workflowID,
@@ -1320,3 +1328,13 @@ func (m *testTaskManager) String() string {
 	}
 	return result
 }
+
+func validateTimeRange(t time.Time, expectedDuration time.Duration) bool {
+	currentTime := time.Now()
+	diff := time.Duration(currentTime.UnixNano() - t.UnixNano())
+	if diff > expectedDuration {
+		log.Infof("Current time: %v, Application time: %v, Differenrce: %v", currentTime, t, diff)
+		return false
+	}
+	return true
+}