From 0db3337aba75b9971e37a34822103f17796fabbd Mon Sep 17 00:00:00 2001
From: musa-asad <musaasad@amazon.com>
Date: Mon, 16 Dec 2024 22:36:10 -0500
Subject: [PATCH] Check for max metric value.

---
 test/e2e/jmx/jmx_test.go             | 30 +++++----
 util/awsservice/cloudwatchmetrics.go | 97 ++++++++++++++++++----------
 2 files changed, 78 insertions(+), 49 deletions(-)

diff --git a/test/e2e/jmx/jmx_test.go b/test/e2e/jmx/jmx_test.go
index e69bd7585..d8fe439af 100644
--- a/test/e2e/jmx/jmx_test.go
+++ b/test/e2e/jmx/jmx_test.go
@@ -258,23 +258,24 @@ func testTomcatSessions(t *testing.T) {
 			}
 		}
 
-		time.Sleep(10 * time.Minute)
+		time.Sleep(5 * time.Minute)
 
-		startTime := time.Now().Add(-15 * time.Minute)
+		startTime := time.Now().Add(-5 * time.Minute)
 		endTime := time.Now()
 
-		hasActiveSessions := awsservice.ValidateSampleCountFloat(
+		maxSessions, err := awsservice.GetMetricMaximum(
 			"tomcat.sessions",
 			"JVM_TOMCAT_E2E",
-			nil,
 			startTime,
 			endTime,
-			0.01,
-			1000,
 			60,
 		)
+		if err != nil {
+			t.Errorf("Failed to get metric maximum: %v", err)
+			return
+		}
 
-		if !hasActiveSessions {
+		if maxSessions == 0 {
 			t.Error("Expected non-zero tomcat.sessions after applying traffic")
 		}
 	})
@@ -359,23 +360,24 @@ func testTomcatRejectedSessions(t *testing.T) {
 			}
 		}
 
-		time.Sleep(10 * time.Minute)
+		time.Sleep(5 * time.Minute)
 
-		startTime := time.Now().Add(-15 * time.Minute)
+		startTime := time.Now().Add(-5 * time.Minute)
 		endTime := time.Now()
 
-		hasActiveSessions := awsservice.ValidateSampleCountFloat(
+		maxRejectedSessions, err := awsservice.GetMetricMaximum(
 			"catalina_manager_rejectedsessions",
 			"ContainerInsights/Prometheus",
-			nil,
 			startTime,
 			endTime,
-			0.01,
-			1000,
 			60,
 		)
+		if err != nil {
+			t.Errorf("Failed to get metric maximum: %v", err)
+			return
+		}
 
-		if !hasActiveSessions {
+		if maxRejectedSessions == 0 {
 			t.Error("Expected non-zero catalina_manager_rejectedsessions after applying traffic")
 		}
 	})
diff --git a/util/awsservice/cloudwatchmetrics.go b/util/awsservice/cloudwatchmetrics.go
index cd6e1c0ab..0bc74fb97 100644
--- a/util/awsservice/cloudwatchmetrics.go
+++ b/util/awsservice/cloudwatchmetrics.go
@@ -106,41 +106,6 @@ func ValidateSampleCount(metricName, namespace string, dimensions []types.Dimens
 	return false
 }
 
-func ValidateSampleCountFloat(metricName, namespace string, dimensions []types.Dimension,
-	startTime time.Time, endTime time.Time,
-	lowerBoundInclusive float64, upperBoundInclusive float64, periodInSeconds int32) bool {
-
-	metricStatsInput := cloudwatch.GetMetricStatisticsInput{
-		MetricName: aws.String(metricName),
-		Namespace:  aws.String(namespace),
-		StartTime:  aws.Time(startTime),
-		EndTime:    aws.Time(endTime),
-		Period:     aws.Int32(periodInSeconds),
-		Dimensions: dimensions,
-		Statistics: []types.Statistic{types.StatisticSampleCount},
-	}
-	data, err := CwmClient.GetMetricStatistics(ctx, &metricStatsInput)
-	if err != nil {
-		return false
-	}
-
-	var dataPoints float64
-	log.Printf("These are the data points: %v", data)
-	log.Printf("These are the data points: %v", data.Datapoints)
-
-	for _, datapoint := range data.Datapoints {
-		dataPoints += *datapoint.SampleCount
-	}
-	log.Printf("Number of datapoints for start time %v with endtime %v and period %d is %.3f is inclusive between %.3f and %.3f",
-		startTime, endTime, periodInSeconds, dataPoints, lowerBoundInclusive, upperBoundInclusive)
-
-	if lowerBoundInclusive <= dataPoints && dataPoints <= upperBoundInclusive {
-		return true
-	}
-
-	return false
-}
-
 func GetMetricStatistics(
 	metricName string,
 	namespace string,
@@ -169,6 +134,68 @@ func GetMetricStatistics(
 	return CwmClient.GetMetricStatistics(ctx, &metricStatsInput)
 }
 
+func GetMetricMaximum(
+	metricName string,
+	namespace string,
+	startTime time.Time,
+	endTime time.Time,
+	periodInSeconds int32,
+) (float64, error) {
+	// List metrics without any dimension filter to see what's available
+	listMetricsInput := cloudwatch.ListMetricsInput{
+		MetricName:     aws.String(metricName),
+		Namespace:      aws.String(namespace),
+		RecentlyActive: "PT3H",
+	}
+
+	metrics, err := CwmClient.ListMetrics(ctx, &listMetricsInput)
+	if err != nil {
+		return 0, err
+	}
+	if len(metrics.Metrics) == 0 {
+		return 0, fmt.Errorf("no metrics found for %s", metricName)
+	}
+
+	// Log all available metrics and their dimensions
+	for _, metric := range metrics.Metrics {
+		log.Printf("Found metric: %s", *metric.MetricName)
+		for _, dim := range metric.Dimensions {
+			log.Printf("  Dimension: %s = %s", *dim.Name, *dim.Value)
+		}
+	}
+
+	// Use the dimensions from the first matching metric
+	dimensions := metrics.Metrics[0].Dimensions
+
+	data, err := GetMetricStatistics(
+		metricName,
+		namespace,
+		dimensions,
+		startTime,
+		endTime,
+		periodInSeconds,
+		[]types.Statistic{types.StatisticMaximum},
+		nil,
+	)
+	if err != nil {
+		return 0, err
+	}
+
+	if len(data.Datapoints) == 0 {
+		return 0, fmt.Errorf("no datapoints found for metric %s", metricName)
+	}
+
+	maxValue := float64(0)
+	for _, datapoint := range data.Datapoints {
+		if *datapoint.Maximum > maxValue {
+			maxValue = *datapoint.Maximum
+		}
+	}
+	log.Printf("Maximum value found: %v", maxValue)
+
+	return maxValue, nil
+}
+
 // GetMetricData takes the metric name, metric dimension and metric namespace and return the query metrics
 func GetMetricData(metricDataQueries []types.MetricDataQuery, startTime, endTime time.Time) (*cloudwatch.GetMetricDataOutput, error) {
 	getMetricDataInput := cloudwatch.GetMetricDataInput{