Add task stop verification ack to ecs-agent module

aws · Jul 21, 2023 · b230732 · b230732
1 parent 0be8253
commit b230732
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/...nt/acs/session/task_stop_verification_ack → ...n/task_stop_verification_ack_responder.go b/...nt/acs/session/task_stop_verification_ack → ...n/task_stop_verification_ack_responder.go
diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/metrics/constants.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/metrics/constants.go
diff --git a/...nt/acs/session/task_stop_verification_ack → ...n/task_stop_verification_ack_responder.go b/...nt/acs/session/task_stop_verification_ack → ...n/task_stop_verification_ack_responder.go
@@ -63,18 +63,20 @@ func (r *taskStopVerificationACKResponder) handleTaskStopVerificationACK(message
 		return errors.New("Invalid messageID received: " + ackMessageID + " Manifest Message ID: " + manifestMessageID)
 	}
 
+	// Reset the message id so that the message with same message id is not processed twice.
+	r.messageIDAccessor.SetMessageID("")
+
 	// Loop through all tasks in the verified stop list and set the desired status of each one to STOPPED.
 	tasksToStop := message.StopTasks
 	for _, task := range tasksToStop {
 		taskARN := aws.StringValue(task.TaskArn)
-		metricFields := map[string]interface{}{
-			"MessageID": aws.StringValue(message.MessageId),
-			"TaskARN":   taskARN,
+		metricFields := logger.Fields{
+			field.MessageID: aws.StringValue(message.MessageId),
+			field.TaskARN:   taskARN,
 		}
 		r.metricsFactory.New(metrics.TaskStoppedMetricName).WithFields(metricFields).Done(nil)
 
-		// Send request to the task stopper to stop the task this will be executed asynchronously
-		// in the context of the task stopper's message channel.
+		// Send request to the task stopper to stop the task.
 		logger.Info("Sending message to task stopper to stop task", logger.Fields{
 			field.TaskARN: taskARN,
 		})

diff --git a/ecs-agent/metrics/constants.go b/ecs-agent/metrics/constants.go
@@ -26,4 +26,12 @@ const (
 	// AttachResourceResponder
 	attachResourceResponderNamespace = "ResourceAttachment"
 	ResourceValidationMetricName     = attachResourceResponderNamespace + ".Validation"
+
+	// TaskManifestResponder
+	taskManifestResponderNamespace = "TaskManifestResponder"
+	TaskManifestHandlingDuration   = taskManifestResponderNamespace + ".Duration"
+
+	// TaskStopVerificationACKResponder
+	taskStopVerificationACKResponderNamespace = "TaskStopVeificationACKResponder"
+	TaskStoppedMetricName                     = taskStopVerificationACKResponderNamespace + ".TaskStopped"
 )