changed the dimensions and ports

aws · Oct 25, 2023 · 11e2a50 · 11e2a50
1 parent ddfaa4f
commit 11e2a50
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/terraform/eks/daemon/apm/main.tf b/terraform/eks/daemon/apm/main.tf
@@ -218,8 +218,8 @@ resource "kubernetes_daemonset" "service" {
             }
           }
           port {
-            container_port = 4318
-            host_port      = 4318
+            container_port = 4316
+            host_port      = 4316
             protocol       = "TCP"
           }
           env {
@@ -349,7 +349,7 @@ resource "kubernetes_daemonset" "service" {
               field_ref {
                 field_path = "status.hostIP"
               }
-            }
+            }Ï
           }
           env {
             name = "HOST_NAME"

diff --git a/test/apm/apm_test.go b/test/apm/apm_test.go
@@ -22,7 +22,7 @@ import (
 const (
 	APMServerConsumerTestName = "APM-Server-Consumer"
 	APMClientProducerTestName = "APM-Client-Producer"
-	APMTracesTestName = "APM-Traces"
+	APMTracesTestName         = "APM-Traces"
 )
 
 type APMTestSuite struct {
@@ -53,11 +53,11 @@ func getEksTestRunners(env *environment.MetaData) []*test_runner.EKSTestRunner {
 
 		eksTestRunners = []*test_runner.EKSTestRunner{
 			{
-				Runner: &APMMetricsRunner{test_runner.BaseTestRunner{DimensionFactory: factory}, APMServerConsumerTestName, "EKS.Cluster"},
+				Runner: &APMMetricsRunner{test_runner.BaseTestRunner{DimensionFactory: factory}, APMServerConsumerTestName, "HostedIn.EKS.Cluster"},
 				Env:    *env,
 			},
 			{
-				Runner: &APMMetricsRunner{test_runner.BaseTestRunner{DimensionFactory: factory}, APMClientProducerTestName, "EKS.Cluster"},
+				Runner: &APMMetricsRunner{test_runner.BaseTestRunner{DimensionFactory: factory}, APMClientProducerTestName, "HostedIn.EKS.Cluster"},
 				Env:    *env,
 			},
 			{

diff --git a/test/metric/apm_util.go b/test/metric/apm_util.go
@@ -20,11 +20,11 @@ var (
 
 	ServerConsumerInstructions = []dimension.Instruction{
 		{
-			Key:   "EKS.Cluster",
+			Key:   "HostedIn.EKS.Cluster",
 			Value: dimension.UnknownDimensionValue(),
 		},
 		{
-			Key:   "K8s.Namespace",
+			Key:   "HostedIn.K8s.Namespace",
 			Value: dimension.ExpectedDimensionValue{Value: aws.String("default")},
 		},
 		{
@@ -39,11 +39,11 @@ var (
 
 	ClientProducerInstructions = []dimension.Instruction{
 		{
-			Key:   "EKS.Cluster",
+			Key:   "HostedIn.EKS.Cluster",
 			Value: dimension.UnknownDimensionValue(),
 		},
 		{
-			Key:   "K8s.Namespace",
+			Key:   "HostedIn.K8s.Namespace",
 			Value: dimension.ExpectedDimensionValue{Value: aws.String("default")},
 		},
 		{

diff --git a/test/metric/dimension/instanceid_provider.go b/test/metric/dimension/instanceid_provider.go
@@ -80,9 +80,9 @@ func (p *EKSClusterNameProvider) IsApplicable() bool {
 
 func (p *EKSClusterNameProvider) GetDimension(instruction Instruction) types.Dimension {
 	// For APM metrics, cluster name is under EKS.Cluster dimension
-	if instruction.Key == "EKS.Cluster" {
+	if instruction.Key == "HostedIn.EKS.Cluster" {
 		return types.Dimension{
-			Name:  aws.String("EKS.Cluster"),
+			Name:  aws.String("HostedIn.EKS.Cluster"),
 			Value: aws.String(p.env.EKSClusterName),
 		}
 	}