Merge branch 'main' of github.com:aws/amazon-cloudwatch-agent-test in…

…to apm
aws · Aug 8, 2023 · 80315f5 · 80315f5
2 parents 6916897 + 7339e9d
commit 80315f5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/test/metric_value_benchmark/eks_daemonset_test.go b/test/metric_value_benchmark/eks_daemonset_test.go
@@ -156,6 +156,7 @@ func (e *EKSDaemonTestRunner) validateLogs(env *environment.MetaData) status.Tes
 
 				if !awsservice.MatchEMFLogWithSchema(l, rs, validateLogContents) {
 					log.Println("failed to match log with schema")
+					log.Printf("log entry %s json schema %s", l, jsonSchema)
 					return false
 				}
 			}
@@ -208,7 +209,6 @@ func (e *EKSDaemonTestRunner) GetMeasuredMetrics() []string {
 		"pod_memory_utilization_over_pod_limit",
 		"pod_network_rx_bytes",
 		"pod_network_tx_bytes",
-		"pod_number_of_container_restarts",
 		"service_number_of_running_pods",
 	}
 }

diff --git a/test/metrics_number_dimension/metrics_number_dimension_test.go b/test/metrics_number_dimension/metrics_number_dimension_test.go
@@ -96,7 +96,7 @@ func TestNumberMetricDimension(t *testing.T) {
 
 			// test for cloud watch metrics
 			dimensionFilter := buildDimensionFilterList(parameter.numberDimensionsInCW)
-			awsservice.ValidateMetricWithTest(t, parameter.metricName, namespace, dimensionFilter)
+			awsservice.ValidateMetricWithTest(t, parameter.metricName, namespace, dimensionFilter, 5, 20*time.Second)
 		})
 	}
 }

diff --git a/test/metrics_number_dimension/resources/10_dimension/config.json b/test/metrics_number_dimension/resources/10_dimension/config.json
@@ -1,11 +1,12 @@
 {
   "agent": {
-    "metrics_collection_interval": 60,
+    "metrics_collection_interval": 10,
     "run_as_user": "root",
     "debug": true,
     "logfile": ""
   },
   "metrics": {
+    "force_flush_interval": 10,
     "namespace": "MetricNumberDimensionTest",
     "append_dimensions": {
       "InstanceId": "${aws:InstanceId}"
@@ -15,7 +16,7 @@
         "measurement": [
           "mem_used_percent"
         ],
-        "metrics_collection_interval": 60,
+        "metrics_collection_interval": 10,
         "append_dimensions": {
           "append0": "Lorem ipsum dolor sit amet consectetur adipiscing elit Vivamus non mauris malesuada mattis ex eget porttitor purus Suspendisse potenti Praesent vel sollicitudin ipsum Quisque luctus pretium lorem non faucibus Ut vel quam dui Nunc fermentum condimentum consectetur Morbi tellus mauris tristique tincidunt elit consectetur hendrerit placerat dui In nulla erat finibus eget erat a hendrerit sodales urna In sapien purus auctor sit amet congue ut congue eget nisi Vivamus sed neque ut ligula lobortis accumsan quis id metus In feugiat velit et leo mattis non fringilla dui elementum Proin a nisi ac sapien vulputate consequat Vestibulum eu tellus mi Integer consectetur efficiturappend0",
           "append1": "Lorem ipsum dolor sit amet consectetur adipiscing elit Vivamus non mauris malesuada mattis ex eget porttitor purus Suspendisse potenti Praesent vel sollicitudin ipsum Quisque luctus pretium lorem non faucibus Ut vel quam dui Nunc fermentum condimentum consectetur Morbi tellus mauris tristique tincidunt elit consectetur hendrerit placerat dui In nulla erat finibus eget erat a hendrerit sodales urna In sapien purus auctor sit amet congue ut congue eget nisi Vivamus sed neque ut ligula lobortis accumsan quis id metus In feugiat velit et leo mattis non fringilla dui elementum Proin a nisi ac sapien vulputate consequat Vestibulum eu tellus mi Integer consectetur efficiturappend1",

diff --git a/test/metrics_number_dimension/resources/30_dimension/config.json b/test/metrics_number_dimension/resources/30_dimension/config.json
@@ -1,11 +1,12 @@
 {
   "agent": {
-    "metrics_collection_interval": 60,
+    "metrics_collection_interval": 10,
     "run_as_user": "root",
     "debug": true,
     "logfile": ""
   },
   "metrics": {
+    "force_flush_interval": 10,
     "namespace": "MetricNumberDimensionTest",
     "append_dimensions": {
       "InstanceId": "${aws:InstanceId}"
@@ -15,7 +16,7 @@
         "measurement": [
           "mem_used_percent"
         ],
-        "metrics_collection_interval": 60,
+        "metrics_collection_interval": 10,
         "append_dimensions": {
           "append0": "Lorem ipsum dolor sit amet consectetur adipiscing elit Vivamus non mauris malesuada mattis ex eget porttitor purus Suspendisse potenti Praesent vel sollicitudin ipsum Quisque luctus pretium lorem non faucibus Ut vel quam dui Nunc fermentum condimentum consectetur Morbi tellus mauris tristique tincidunt elit consectetur hendrerit placerat dui In nulla erat finibus eget erat a hendrerit sodales urna In sapien purus auctor sit amet congue ut congue eget nisi Vivamus sed neque ut ligula lobortis accumsan quis id metus In feugiat velit et leo mattis non fringilla dui elementum Proin a nisi ac sapien vulputate consequat Vestibulum eu tellus mi Integer consectetur efficiturappend0",
           "append1": "Lorem ipsum dolor sit amet consectetur adipiscing elit Vivamus non mauris malesuada mattis ex eget porttitor purus Suspendisse potenti Praesent vel sollicitudin ipsum Quisque luctus pretium lorem non faucibus Ut vel quam dui Nunc fermentum condimentum consectetur Morbi tellus mauris tristique tincidunt elit consectetur hendrerit placerat dui In nulla erat finibus eget erat a hendrerit sodales urna In sapien purus auctor sit amet congue ut congue eget nisi Vivamus sed neque ut ligula lobortis accumsan quis id metus In feugiat velit et leo mattis non fringilla dui elementum Proin a nisi ac sapien vulputate consequat Vestibulum eu tellus mi Integer consectetur efficiturappend1",

diff --git a/test/metrics_number_dimension/resources/35_dimension/config.json b/test/metrics_number_dimension/resources/35_dimension/config.json
@@ -1,11 +1,12 @@
 {
   "agent": {
-    "metrics_collection_interval": 60,
+    "metrics_collection_interval": 10,
     "run_as_user": "root",
     "debug": true,
     "logfile": ""
   },
   "metrics": {
+    "force_flush_interval": 10,
     "namespace": "MetricNumberDimensionTest",
     "append_dimensions": {
       "InstanceId": "${aws:InstanceId}"
@@ -15,7 +16,7 @@
         "measurement": [
           "mem_used_percent"
         ],
-        "metrics_collection_interval": 60,
+        "metrics_collection_interval": 10,
         "append_dimensions": {
           "append0": "Lorem ipsum dolor sit amet consectetur adipiscing elit Vivamus non mauris malesuada mattis ex eget porttitor purus Suspendisse potenti Praesent vel sollicitudin ipsum Quisque luctus pretium lorem non faucibus Ut vel quam dui Nunc fermentum condimentum consectetur Morbi tellus mauris tristique tincidunt elit consectetur hendrerit placerat dui In nulla erat finibus eget erat a hendrerit sodales urna In sapien purus auctor sit amet congue ut congue eget nisi Vivamus sed neque ut ligula lobortis accumsan quis id metus In feugiat velit et leo mattis non fringilla dui elementum Proin a nisi ac sapien vulputate consequat Vestibulum eu tellus mi Integer consectetur efficiturappend0",
           "append1": "Lorem ipsum dolor sit amet consectetur adipiscing elit Vivamus non mauris malesuada mattis ex eget porttitor purus Suspendisse potenti Praesent vel sollicitudin ipsum Quisque luctus pretium lorem non faucibus Ut vel quam dui Nunc fermentum condimentum consectetur Morbi tellus mauris tristique tincidunt elit consectetur hendrerit placerat dui In nulla erat finibus eget erat a hendrerit sodales urna In sapien purus auctor sit amet congue ut congue eget nisi Vivamus sed neque ut ligula lobortis accumsan quis id metus In feugiat velit et leo mattis non fringilla dui elementum Proin a nisi ac sapien vulputate consequat Vestibulum eu tellus mi Integer consectetur efficiturappend1",

diff --git a/util/awsservice/cloudwatchmetrics.go b/util/awsservice/cloudwatchmetrics.go
@@ -57,10 +57,18 @@ func ValidateMetric(metricName, namespace string, dimensionsFilter []types.Dimen
 }
 
 // ValidateMetrics takes the metric name, metric dimension and corresponding namespace that contains the metric
-func ValidateMetricWithTest(t *testing.T, metricName, namespace string, dimensionsFilter []types.DimensionFilter) {
-	err := ValidateMetric(metricName, namespace, dimensionsFilter)
+func ValidateMetricWithTest(t *testing.T, metricName, namespace string, dimensionsFilter []types.DimensionFilter, retries int, retryTime time.Duration) {
+	var err error
+	for i := 0; i < retries; i++ {
+		err = ValidateMetric(metricName, namespace, dimensionsFilter)
+		if err == nil {
+			return
+		}
+		log.Printf("could not validate metrics try : %d of %d error %v", i+1, retries, err)
+		time.Sleep(retryTime)
+	}
 	if err != nil {
-		t.Errorf(err.Error())
+		t.Errorf("could not validate metrics")
 	}
 }