From 755e4638e7426ba4693930a3ea36445e3c9333a9 Mon Sep 17 00:00:00 2001 From: Varun C Date: Thu, 6 Mar 2025 18:52:29 +0000 Subject: [PATCH 1/5] Unhardcode region for creating aws clients --- util/awsservice/constant.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/util/awsservice/constant.go b/util/awsservice/constant.go index f9a3fd015..c35caacb5 100644 --- a/util/awsservice/constant.go +++ b/util/awsservice/constant.go @@ -6,6 +6,7 @@ package awsservice import ( "context" "fmt" + "os" "sync" "time" @@ -59,7 +60,13 @@ var ( func init() { ctx = context.Background() - err := ConfigureAWSClients("us-west-2") + region := os.Getenv("AWS_REGION") + if region == "" { + // default to us-west-2 + region = "us-west-2" + } + + err := ConfigureAWSClients(region) if err != nil { fmt.Println("There was an error trying to configure the AWS clients: ", err) } From 43006cc8c523412dc8513f8b77b142da46e5ae1a Mon Sep 17 00:00:00 2001 From: Varun C Date: Fri, 7 Mar 2025 15:44:34 +0000 Subject: [PATCH 2/5] Only run resource metric entity test if in us-west-2 --- .../metric_value_benchmark/metrics_value_benchmark_test.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/metric_value_benchmark/metrics_value_benchmark_test.go b/test/metric_value_benchmark/metrics_value_benchmark_test.go index 6e97f8172..14b1d580d 100644 --- a/test/metric_value_benchmark/metrics_value_benchmark_test.go +++ b/test/metric_value_benchmark/metrics_value_benchmark_test.go @@ -125,9 +125,12 @@ func getEc2TestRunners(env *environment.MetaData) []*test_runner.TestRunner { {TestRunner: &RenameSSMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, {TestRunner: &JMXTomcatJVMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, {TestRunner: &JMXKafkaTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &EntityMetricsTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, } - } + + // Only add EntityMetricsTestRunner if in us-west-2 (we don't have access to ListEntitiesForMetric in CN/ITAR) + if env.Region == "us-west-2" { + ec2TestRunners = append(ec2TestRunners, &test_runner.TestRunner{TestRunner: &EntityMetricsTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}) + } return ec2TestRunners } From ab82fd2fdc0b0d6181b852352291562bdcb723fe Mon Sep 17 00:00:00 2001 From: Varun C Date: Fri, 7 Mar 2025 15:47:15 +0000 Subject: [PATCH 3/5] Fix formatting --- test/metric_value_benchmark/metrics_value_benchmark_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/test/metric_value_benchmark/metrics_value_benchmark_test.go b/test/metric_value_benchmark/metrics_value_benchmark_test.go index 14b1d580d..3bf82701e 100644 --- a/test/metric_value_benchmark/metrics_value_benchmark_test.go +++ b/test/metric_value_benchmark/metrics_value_benchmark_test.go @@ -131,6 +131,7 @@ func getEc2TestRunners(env *environment.MetaData) []*test_runner.TestRunner { if env.Region == "us-west-2" { ec2TestRunners = append(ec2TestRunners, &test_runner.TestRunner{TestRunner: &EntityMetricsTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}) } + } return ec2TestRunners } From 33c0ab3a78c18cb904df723c72d04f55ef5f0755 Mon Sep 17 00:00:00 2001 From: Varun C Date: Fri, 7 Mar 2025 16:22:24 +0000 Subject: [PATCH 4/5] Add debugging --- .../metrics_value_benchmark_test.go | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/test/metric_value_benchmark/metrics_value_benchmark_test.go b/test/metric_value_benchmark/metrics_value_benchmark_test.go index 3bf82701e..0d944e4e0 100644 --- a/test/metric_value_benchmark/metrics_value_benchmark_test.go +++ b/test/metric_value_benchmark/metrics_value_benchmark_test.go @@ -109,26 +109,28 @@ func getEc2TestRunners(env *environment.MetaData) []*test_runner.TestRunner { factory := dimension.GetDimensionFactory(*env) ec2TestRunners = []*test_runner.TestRunner{ {TestRunner: &StatsdTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &DiskTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &NetStatTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &PrometheusTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &CPUTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &MemTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &ProcStatTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &DiskIOTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &NetTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &EthtoolTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &EMFTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &SwapTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &ProcessesTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &CollectDTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &RenameSSMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &JMXTomcatJVMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - {TestRunner: &JMXKafkaTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &DiskTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &NetStatTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &PrometheusTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &CPUTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &MemTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &ProcStatTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &DiskIOTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &NetTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &EthtoolTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &EMFTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &SwapTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &ProcessesTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &CollectDTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &RenameSSMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &JMXTomcatJVMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + // {TestRunner: &JMXKafkaTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, } // Only add EntityMetricsTestRunner if in us-west-2 (we don't have access to ListEntitiesForMetric in CN/ITAR) + log.Printf("Region: %v", env.Region) if env.Region == "us-west-2" { + log.Printf("adding Entity metrics test runner") ec2TestRunners = append(ec2TestRunners, &test_runner.TestRunner{TestRunner: &EntityMetricsTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}) } } From 645fa70e5d4e8861e897e4ce55ca0abe190ef933 Mon Sep 17 00:00:00 2001 From: Varun C Date: Fri, 7 Mar 2025 16:26:58 +0000 Subject: [PATCH 5/5] Remove debugging --- .../metrics_value_benchmark_test.go | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/test/metric_value_benchmark/metrics_value_benchmark_test.go b/test/metric_value_benchmark/metrics_value_benchmark_test.go index 0d944e4e0..3bf82701e 100644 --- a/test/metric_value_benchmark/metrics_value_benchmark_test.go +++ b/test/metric_value_benchmark/metrics_value_benchmark_test.go @@ -109,28 +109,26 @@ func getEc2TestRunners(env *environment.MetaData) []*test_runner.TestRunner { factory := dimension.GetDimensionFactory(*env) ec2TestRunners = []*test_runner.TestRunner{ {TestRunner: &StatsdTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &DiskTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &NetStatTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &PrometheusTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &CPUTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &MemTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &ProcStatTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &DiskIOTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &NetTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &EthtoolTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &EMFTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &SwapTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &ProcessesTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &CollectDTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &RenameSSMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &JMXTomcatJVMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, - // {TestRunner: &JMXKafkaTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &DiskTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &NetStatTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &PrometheusTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &CPUTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &MemTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &ProcStatTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &DiskIOTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &NetTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &EthtoolTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &EMFTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &SwapTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &ProcessesTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &CollectDTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &RenameSSMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &JMXTomcatJVMTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, + {TestRunner: &JMXKafkaTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}, } // Only add EntityMetricsTestRunner if in us-west-2 (we don't have access to ListEntitiesForMetric in CN/ITAR) - log.Printf("Region: %v", env.Region) if env.Region == "us-west-2" { - log.Printf("adding Entity metrics test runner") ec2TestRunners = append(ec2TestRunners, &test_runner.TestRunner{TestRunner: &EntityMetricsTestRunner{test_runner.BaseTestRunner{DimensionFactory: factory}}}) } }