address comments

Author: Heming Han

agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/client/client.go

@@ -125,14 +125,11 @@ func (cs *tcsClientServer) publishMessages(ctx context.Context) {
 			return
 		case metric := <-cs.metrics:
 			seelog.Debugf("received telemetry message in metricsChannel")
-			includeServiceConnectStats := metric.IncludeServiceConnectStats
-			if !cs.disableResourceMetrics || includeServiceConnectStats {
-				err := cs.publishMetricsOnce(metric)
-				if err != nil {
-					logger.Warn("Error publishing metrics", logger.Fields{
-						field.Error: err,
-					})
-				}
+			err := cs.publishMetricsOnce(metric)
+			if err != nil {
+				logger.Warn("Error publishing metrics", logger.Fields{
+					field.Error: err,
+				})
 			}
 		case health := <-cs.health:
 			seelog.Debugf("received health message in healthChannel")

agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/tcs/model/ecstcs/types.go

@@ -370,9 +370,8 @@ func TestPublishOnceIdleStatsEngine(t *testing.T) {
 	mockEngine := idleStatsEngine{}
 	metadata, taskMetrics, _ := mockEngine.GetInstanceMetrics(testNotIncludeScStats)
 	requests, err := cs.metricsToPublishMetricRequests(ecstcs.TelemetryMessage{
-		Metadata:                   metadata,
-		TaskMetrics:                taskMetrics,
-		IncludeServiceConnectStats: testNotIncludeScStats,
+		Metadata:    metadata,
+		TaskMetrics: taskMetrics,
 	})
 	if err != nil {
 		t.Fatal("Error creating publishMetricRequests: ", err)
@@ -397,9 +396,8 @@ func TestPublishOnceNonIdleStatsEngine(t *testing.T) {
 	}
 	metadata, taskMetrics, err := mockEngine.GetInstanceMetrics(testNotIncludeScStats)
 	requests, err := cs.metricsToPublishMetricRequests(ecstcs.TelemetryMessage{
-		Metadata:                   metadata,
-		TaskMetrics:                taskMetrics,
-		IncludeServiceConnectStats: testNotIncludeScStats,
+		Metadata:    metadata,
+		TaskMetrics: taskMetrics,
 	})
 	if err != nil {
 		t.Fatal("Error creating publishMetricRequests: ", err)
@@ -459,9 +457,8 @@ func TestPublishServiceConnectStatsEngine(t *testing.T) {
 			mockEngine := newServiceConnectStatsEngine(tc.numTasks)
 			metadata, taskMetrics, _ := mockEngine.GetInstanceMetrics(testIncludeScStats)
 			requests, err := cs.metricsToPublishMetricRequests(ecstcs.TelemetryMessage{
-				Metadata:                   metadata,
-				TaskMetrics:                taskMetrics,
-				IncludeServiceConnectStats: testIncludeScStats,
+				Metadata:    metadata,
+				TaskMetrics: taskMetrics,
 			})
 			if err != nil {
 				t.Fatal("Error creating publishMetricRequests: ", err)