fix unit test

Author: Yiyuanzzz

agent/stats/engine.go

@@ -587,7 +587,7 @@ func (engine *DockerStatsEngine) GetInstanceMetrics(includeServiceConnectStats b
 		if includeServiceConnectStats {
 			if serviceConnectStats, ok := engine.taskToServiceConnectStats[taskArn]; ok {
 				if !serviceConnectStats.HasStatsBeenSent() {
-					taskMetric.ServiceConnectMetricsWrapper = serviceConnectStats.GetStats()
+					taskMetric.ServiceConnectMetricsWrapper = convertPtrSliceToValueSlice(serviceConnectStats.GetStats())
 					seelog.Debugf("Adding service connect stats for task : %s", taskArn)
 					serviceConnectStats.SetStatsSent(true)
 				}
@@ -1157,3 +1157,18 @@ func (engine *DockerStatsEngine) getVolumeMetricsWithTimeout(volumeId, hostPath
 	defer cancel()
 	return engine.csiClient.GetVolumeMetrics(derivedCtx, volumeId, hostPath)
 }
+
+// convertPtrSliceToValueSlice converts a slice of GeneralMetricsWrapper pointers to a slice of values
+func convertPtrSliceToValueSlice(ptrSlice []*tcstypes.GeneralMetricsWrapper) []tcstypes.GeneralMetricsWrapper {
+	if ptrSlice == nil {
+		return nil
+	}
+
+	result := make([]tcstypes.GeneralMetricsWrapper, 0, len(ptrSlice))
+	for _, ptr := range ptrSlice {
+		if ptr != nil {
+			result = append(result, *ptr)
+		}
+	}
+	return result
+}

agent/stats/engine_test.go

@@ -576,7 +576,7 @@ func TestGetTaskHealthMetrics(t *testing.T) {
 	assert.Equal(t, aws.ToString(metadata.ContainerInstance), "container_instance")
 	assert.Len(t, taskHealth, 1)
 	assert.Len(t, taskHealth[0].Containers, 1)
-	assert.Equal(t, taskHealth[0].Containers[0].HealthStatus, "HEALTHY")
+	assert.Equal(t, tcstypes.HealthStatusHealthy, taskHealth[0].Containers[0].HealthStatus)
 }
 
 func TestGetTaskHealthMetricsStoppedContainer(t *testing.T) {

agent/stats/service_connect_linux.go

@@ -32,7 +32,7 @@ import (
 )
 
 type ServiceConnectStats struct {
-	stats        []tcstypes.GeneralMetricsWrapper
+	stats        []*tcstypes.GeneralMetricsWrapper
 	appnetClient appnet.AppNetClient
 	sent         bool
 	lock         sync.RWMutex
@@ -80,8 +80,8 @@ func (sc *ServiceConnectStats) retrieveServiceConnectStats(task *apitask.Task) {
 	sc.setStats(statsCollectedList)
 }
 
-func convertToTACSStats(mf map[string]*prometheus.MetricFamily, taskId string) ([]tcstypes.GeneralMetricsWrapper, error) {
-	statsMap := make(map[string]tcstypes.GeneralMetricsWrapper)
+func convertToTACSStats(mf map[string]*prometheus.MetricFamily, taskId string) ([]*tcstypes.GeneralMetricsWrapper, error) {
+	statsMap := make(map[string]*tcstypes.GeneralMetricsWrapper)
 
 	for _, v := range mf {
 		for _, metric := range v.Metric {
@@ -167,7 +167,7 @@ func convertToTACSStats(mf map[string]*prometheus.MetricFamily, taskId string) (
 			if generalMetricsWrapper, ok := statsMap[dimensionAsString]; !ok {
 				// Dimension does not exist in statsMap, add it to the statsMap
 				generalMetricsList := []tcstypes.GeneralMetric{generalMetric}
-				generalMetricsWrapper = tcstypes.GeneralMetricsWrapper{
+				generalMetricsWrapper = &tcstypes.GeneralMetricsWrapper{
 					Dimensions:     dimensions,
 					GeneralMetrics: generalMetricsList,
 					MetricType:     tcstypes.MetricType(metricType),
@@ -180,22 +180,22 @@ func convertToTACSStats(mf map[string]*prometheus.MetricFamily, taskId string) (
 		}
 	}
 
-	statsCollectedList := []tcstypes.GeneralMetricsWrapper{}
+	statsCollectedList := []*tcstypes.GeneralMetricsWrapper{}
 	for _, gm := range statsMap {
 		statsCollectedList = append(statsCollectedList, gm)
 	}
 
 	return statsCollectedList, nil
 }
 
-func (sc *ServiceConnectStats) setStats(stats []tcstypes.GeneralMetricsWrapper) {
+func (sc *ServiceConnectStats) setStats(stats []*tcstypes.GeneralMetricsWrapper) {
 	sc.lock.Lock()
 	defer sc.lock.Unlock()
 
 	sc.stats = stats
 }
 
-func (sc *ServiceConnectStats) GetStats() []tcstypes.GeneralMetricsWrapper {
+func (sc *ServiceConnectStats) GetStats() []*tcstypes.GeneralMetricsWrapper {
 	sc.lock.RLock()
 	defer sc.lock.RUnlock()
 

agent/stats/service_connect_linux_test.go

@@ -58,15 +58,15 @@ func TestRetrieveServiceConnectMetrics(t *testing.T) {
 
 	var tests = []struct {
 		stats         string
-		expectedStats []tcstypes.GeneralMetricsWrapper
+		expectedStats []*tcstypes.GeneralMetricsWrapper
 	}{
 		{
 			stats: `# TYPE MetricFamily1 counter
 				MetricFamily1{DimensionA="value1", DimensionB="value2", Direction="ingress"} 1
 				# TYPE MetricFamily2 counter
 				MetricFamily2{DimensionB="value2", DimensionA="value1", Direction="ingress"} 1
 				`,
-			expectedStats: []tcstypes.GeneralMetricsWrapper{
+			expectedStats: []*tcstypes.GeneralMetricsWrapper{
 				{
 					MetricType: tcstypes.MetricType("1"),
 					Dimensions: []tcstypes.Dimension{
@@ -98,7 +98,7 @@ func TestRetrieveServiceConnectMetrics(t *testing.T) {
 				MetricFamily3{DimensionX="value1", DimensionY="value2", Direction="egress", le="1"} 1
 				MetricFamily3{DimensionX="value1", DimensionY="value2", Direction="egress", le="5"} 3
 				`,
-			expectedStats: []tcstypes.GeneralMetricsWrapper{
+			expectedStats: []*tcstypes.GeneralMetricsWrapper{
 				{
 					MetricType: tcstypes.MetricType("2"),
 					Dimensions: []tcstypes.Dimension{
@@ -125,7 +125,7 @@ func TestRetrieveServiceConnectMetrics(t *testing.T) {
 				MetricFamily3{DimensionX="value1", DimensionY="value2", Direction="egress", le="1"} 0
 				MetricFamily3{DimensionX="value1", DimensionY="value2", Direction="egress", le="5"} 0
 				`,
-			expectedStats: []tcstypes.GeneralMetricsWrapper{},
+			expectedStats: []*tcstypes.GeneralMetricsWrapper{},
 		},
 	}
 
@@ -160,7 +160,7 @@ func TestRetrieveServiceConnectMetrics(t *testing.T) {
 	}
 }
 
-func sortMetrics(metricList []tcstypes.GeneralMetricsWrapper) {
+func sortMetrics(metricList []*tcstypes.GeneralMetricsWrapper) {
 	for _, metric := range metricList {
 		sort.Slice(metric.GeneralMetrics, func(i, j int) bool {
 			return *metric.GeneralMetrics[i].MetricName < *metric.GeneralMetrics[j].MetricName