Collect volume metrics for EBS-backed tasks

agent/acs/session/payload_responder_test.go

@@ -722,7 +722,7 @@ func TestHandlePayloadMessageAddedEBSToTask(t *testing.T) {
 							Value: aws.String(taskresourcevolume.TestFileSystem),
 						},
 					},
-					AttachmentType: aws.String(apiresource.AmazonElasticBlockStorage),
+					AttachmentType: aws.String(apiresource.EBSTaskAttach),
 				},
 			},
 		},

agent/api/task/task.go

@@ -3435,6 +3435,22 @@ func (task *Task) IsServiceConnectEnabled() bool {
 // Is EBS Task Attach enabled returns true if this task has EBS volume configuration in its ACS payload.
 // TODO as more daemons come online, we'll want a generic handler these bool checks and payload handling
 func (task *Task) IsEBSTaskAttachEnabled() bool {
+	task.lock.RLock()
+	defer task.lock.RUnlock()
+	return task.isEBSTaskAttachEnabledUnsafe()
+}
+
+func (task *Task) isEBSTaskAttachEnabledUnsafe() bool {
+	logger.Debug("Checking if there are any ebs volume configs")
+	for _, tv := range task.Volumes {
+		switch tv.Volume.(type) {
+		case *taskresourcevolume.EBSTaskVolumeConfig:
+			logger.Debug("found ebs volume config")
+			return true
+		default:
+			continue
+		}
+	}
 	return false
 }
 

agent/api/task/task_attachment_handler.go

@@ -83,7 +83,7 @@ func handleTaskAttachments(acsTask *ecsacs.Task, task *Task) error {
 			switch aws.StringValue(attachment.AttachmentType) {
 			case serviceConnectAttachmentType:
 				serviceConnectAttachment = attachment
-			case apiresource.AmazonElasticBlockStorage:
+			case apiresource.EBSTaskAttach:
 				ebsVolumeAttachments = append(ebsVolumeAttachments, attachment)
 			default:
 				logger.Debug("Received an attachment type", logger.Fields{
@@ -117,7 +117,7 @@ func handleTaskAttachments(acsTask *ecsacs.Task, task *Task) error {
 				}
 				taskVolume := TaskVolume{
 					Name:   ebs.VolumeName,
-					Type:   apiresource.AmazonElasticBlockStorage,
+					Type:   apiresource.EBSTaskAttach,
 					Volume: ebs,
 				}
 				task.Volumes = append(task.Volumes, taskVolume)

agent/api/task/task_attachment_handler_test.go

@@ -271,7 +271,7 @@ func TestHandleTaskAttachmentWithEBSVolumeAttachment(t *testing.T) {
 								Value: stringToPointer(tc.testFileSystem),
 							},
 						},
-						AttachmentType: stringToPointer(apiresource.AmazonElasticBlockStorage),
+						AttachmentType: stringToPointer(apiresource.EBSTaskAttach),
 					},
 				},
 			}

agent/api/task/task_test.go

@@ -4688,7 +4688,7 @@ func TestTaskWithEBSVolumeAttachment(t *testing.T) {
 						Value: strptr(taskresourcevolume.TestFileSystem),
 					},
 				},
-				AttachmentType: strptr(apiresource.AmazonElasticBlockStorage),
+				AttachmentType: strptr(apiresource.EBSTaskAttach),
 			},
 		},
 	}

agent/api/task/taskvolume.go

@@ -76,7 +76,7 @@ func (tv *TaskVolume) UnmarshalJSON(b []byte) error {
 		return tv.unmarshalEFSVolume(intermediate["efsVolumeConfiguration"])
 	case FSxWindowsFileServerVolumeType:
 		return tv.unmarshalFSxWindowsFileServerVolume(intermediate["fsxWindowsFileServerVolumeConfiguration"])
-	case apiresource.AmazonElasticBlockStorage:
+	case apiresource.EBSTaskAttach:
 		return tv.unmarshalEBSVolume(intermediate["ebsVolumeConfiguration"])
 	default:
 		return errors.Errorf("unrecognized volume type: %q", tv.Type)
@@ -103,7 +103,7 @@ func (tv *TaskVolume) MarshalJSON() ([]byte, error) {
 		result["efsVolumeConfiguration"] = tv.Volume
 	case FSxWindowsFileServerVolumeType:
 		result["fsxWindowsFileServerVolumeConfiguration"] = tv.Volume
-	case apiresource.AmazonElasticBlockStorage:
+	case apiresource.EBSTaskAttach:
 		result["ebsVolumeConfiguration"] = tv.Volume
 	default:
 		return nil, errors.Errorf("unrecognized volume type: %q", tv.Type)

agent/api/task/taskvolume_test.go

@@ -195,7 +195,7 @@ func TestMarshalEBSVolumes(t *testing.T) {
 		Volumes: []TaskVolume{
 			{
 				Name: "1",
-				Type: apiresource.AmazonElasticBlockStorage,
+				Type: apiresource.EBSTaskAttach,
 				Volume: &taskresourcevolume.EBSTaskVolumeConfig{
 					VolumeId:             "vol-12345",
 					VolumeName:           "test-volume",
@@ -230,7 +230,7 @@ func TestMarshalEBSVolumes(t *testing.T) {
 				"dockerVolumeName": ""
 			},
 			"name": "1",
-			"type": "AmazonElasticBlockStorage"
+			"type": "amazonebs"
 		  }
 		],
 		"DesiredStatus": "NONE",
@@ -275,7 +275,7 @@ func TestUnmarshalEBSVolumes(t *testing.T) {
 				"dockerVolumeName": ""
 			},
 			"name": "1",
-			"type": "AmazonElasticBlockStorage"
+			"type": "amazonebs"
 		  }
 		],
 		"DesiredStatus": "NONE",
@@ -306,7 +306,7 @@ func TestUnmarshalEBSVolumes(t *testing.T) {
 	require.NoError(t, err, "Could not unmarshal task")
 
 	require.Len(t, task.Volumes, 1)
-	assert.Equal(t, apiresource.AmazonElasticBlockStorage, task.Volumes[0].Type)
+	assert.Equal(t, apiresource.EBSTaskAttach, task.Volumes[0].Type)
 	assert.Equal(t, "1", task.Volumes[0].Name)
 	ebsConfig, ok := task.Volumes[0].Volume.(*taskresourcevolume.EBSTaskVolumeConfig)
 	require.True(t, ok)

agent/ebs/watcher.go

@@ -63,6 +63,7 @@ func (w *EBSWatcher) Start() {
 			pendingEBS := w.agentState.GetAllPendingEBSAttachmentsWithKey()
 			if len(pendingEBS) > 0 {
 				foundVolumes := apiebs.ScanEBSVolumes(pendingEBS, w.discoveryClient)
+				w.overrideDeviceName(foundVolumes)
 				w.NotifyFound(foundVolumes)
 			}
 		case <-w.ctx.Done():
@@ -83,13 +84,13 @@ func (w *EBSWatcher) Stop() {
 // 1. Check whether we already have this attachment in state and if so it's a noop.
 // 2. Otherwise add the attachment to state, start its ack timer, and save to the agent state.
 func (w *EBSWatcher) HandleResourceAttachment(ebs *apiebs.ResourceAttachment) error {
-	attachmentType := ebs.GetAttachmentProperties(apiebs.ResourceTypeName)
-	if attachmentType != apiebs.ElasticBlockStorage {
+	attachmentType := ebs.GetAttachmentType()
+	if attachmentType != apiebs.EBSTaskAttach {
 		log.Warnf("Resource type not Elastic Block Storage. Skip handling resource attachment with type: %v.", attachmentType)
 		return nil
 	}
 
-	volumeId := ebs.GetAttachmentProperties(apiebs.VolumeIdName)
+	volumeId := ebs.GetAttachmentProperties(apiebs.VolumeIdKey)
 	ebsAttachment, ok := w.agentState.GetEBSByVolumeId(volumeId)
 	if ok {
 		log.Infof("EBS Volume attachment already exists. Skip handling EBS attachment %v.", ebs.EBSToString())
@@ -106,9 +107,20 @@ func (w *EBSWatcher) HandleResourceAttachment(ebs *apiebs.ResourceAttachment) er
 	return nil
 }
 
+func (w *EBSWatcher) overrideDeviceName(foundVolumes map[string]string) {
+	for volumeId, deviceName := range foundVolumes {
+		ebs, ok := w.agentState.GetEBSByVolumeId(volumeId)
+		if !ok {
+			log.Warnf("Unable to find EBS volume with volume ID: %s", volumeId)
+			continue
+		}
+		ebs.SetDeviceName(deviceName)
+	}
+}
+
 // NotifyFound will go through the list of found EBS volumes from the scanning process and mark them as found.
-func (w *EBSWatcher) NotifyFound(foundVolumes []string) {
-	for _, volumeId := range foundVolumes {
+func (w *EBSWatcher) NotifyFound(foundVolumes map[string]string) {
+	for volumeId := range foundVolumes {
 		w.notifyFoundEBS(volumeId)
 	}
 }
@@ -151,7 +163,7 @@ func (w *EBSWatcher) removeEBSAttachment(volumeID string) {
 
 // addEBSAttachmentToState adds an EBS attachment to state, and start its ack timer
 func (w *EBSWatcher) addEBSAttachmentToState(ebs *apiebs.ResourceAttachment) error {
-	volumeId := ebs.AttachmentProperties[apiebs.VolumeIdName]
+	volumeId := ebs.AttachmentProperties[apiebs.VolumeIdKey]
 	err := ebs.StartTimer(func() {
 		w.handleEBSAckTimeout(volumeId)
 	})