From 29da7a1ae81f39008406dd230240ad487206ef76 Mon Sep 17 00:00:00 2001
From: Xing Zheng <xingzhen@amazon.com>
Date: Wed, 5 Feb 2025 17:40:49 +0000
Subject: [PATCH] Emit failure and total metrics for DPE call

---
 .../amazon-ecs-agent/ecs-agent/api/ecs/client/ecs_client.go    | 3 ++-
 .../aws/amazon-ecs-agent/ecs-agent/metrics/constants.go        | 3 ++-
 ecs-agent/api/ecs/client/ecs_client.go                         | 3 ++-
 ecs-agent/metrics/constants.go                                 | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/client/ecs_client.go b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/client/ecs_client.go
index 5894c152d5e..9fbe8176fa5 100644
--- a/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/client/ecs_client.go
+++ b/agent/vendor/github.com/aws/amazon-ecs-agent/ecs-agent/api/ecs/client/ecs_client.go
@@ -763,7 +763,8 @@ func (client *ecsClient) discoverPollEndpoint(containerInstanceArn string,
 		Cluster:           aws.String(client.configAccessor.Cluster()),
 		ZoneId:            aws.String(availabilityZone),
 	})
-	client.metricsFactory.New(metrics.DiscoverPollEndpointCallName).Done(err)
+	client.metricsFactory.New(metrics.DiscoverPollEndpointFailure).Done(err)
+	client.metricsFactory.New(metrics.DiscoverPollEndpointTotal).Done(nil)
 	if err != nil {
 		// If we got an error calling the API, fallback to an expired cached endpoint if
 		// we have it.
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
index 020e9a2f879..c9eb2089fd3 100644
--- 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
@@ -61,7 +61,8 @@ const (
 
 	// ECS Client Metrics
 	ecsClientNamespace               = "ECSClient"
-	DiscoverPollEndpointCallName     = ecsClientNamespace + ".DiscoverPollEndpoint"
+	DiscoverPollEndpointFailure      = ecsClientNamespace + ".DiscoverPollEndpointFailure"
+	DiscoverPollEndpointTotal        = ecsClientNamespace + ".DiscoverPollEndpoint"
 	DiscoverPollEndpointDurationName = ecsClientNamespace + ".DiscoverPollEndpointDuration"
 
 	dbClientMetricNamespace                 = "Data"
diff --git a/ecs-agent/api/ecs/client/ecs_client.go b/ecs-agent/api/ecs/client/ecs_client.go
index 5894c152d5e..9fbe8176fa5 100644
--- a/ecs-agent/api/ecs/client/ecs_client.go
+++ b/ecs-agent/api/ecs/client/ecs_client.go
@@ -763,7 +763,8 @@ func (client *ecsClient) discoverPollEndpoint(containerInstanceArn string,
 		Cluster:           aws.String(client.configAccessor.Cluster()),
 		ZoneId:            aws.String(availabilityZone),
 	})
-	client.metricsFactory.New(metrics.DiscoverPollEndpointCallName).Done(err)
+	client.metricsFactory.New(metrics.DiscoverPollEndpointFailure).Done(err)
+	client.metricsFactory.New(metrics.DiscoverPollEndpointTotal).Done(nil)
 	if err != nil {
 		// If we got an error calling the API, fallback to an expired cached endpoint if
 		// we have it.
diff --git a/ecs-agent/metrics/constants.go b/ecs-agent/metrics/constants.go
index 020e9a2f879..c9eb2089fd3 100644
--- a/ecs-agent/metrics/constants.go
+++ b/ecs-agent/metrics/constants.go
@@ -61,7 +61,8 @@ const (
 
 	// ECS Client Metrics
 	ecsClientNamespace               = "ECSClient"
-	DiscoverPollEndpointCallName     = ecsClientNamespace + ".DiscoverPollEndpoint"
+	DiscoverPollEndpointFailure      = ecsClientNamespace + ".DiscoverPollEndpointFailure"
+	DiscoverPollEndpointTotal        = ecsClientNamespace + ".DiscoverPollEndpoint"
 	DiscoverPollEndpointDurationName = ecsClientNamespace + ".DiscoverPollEndpointDuration"
 
 	dbClientMetricNamespace                 = "Data"