From ddfaa4f577aa0e9d803c6027952f9401e3551934 Mon Sep 17 00:00:00 2001 From: Pooja Reddy Nathala Date: Tue, 24 Oct 2023 15:13:59 -0400 Subject: [PATCH] reverted the hostedIn and changed the port --- terraform/eks/daemon/apm/main.tf | 2 +- test/metric/apm_util.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/terraform/eks/daemon/apm/main.tf b/terraform/eks/daemon/apm/main.tf index 131e966a8..1759c4f58 100644 --- a/terraform/eks/daemon/apm/main.tf +++ b/terraform/eks/daemon/apm/main.tf @@ -341,7 +341,7 @@ resource "kubernetes_daemonset" "service" { command = [ "/bin/sh", "-c", - "while true; echo '${data.template_file.traceid_generator.rendered}' > traceid_generator.go && chmod +x traceid_generator.go; export START_TIME=$(date +%s%N); export TRACE_ID=$(go run ./traceid_generator.go); do echo '${data.template_file.server_consumer.rendered}' | sed -e \"s/START_TIME/$START_TIME/\" > server_consumer.json; curl -H 'Content-Type: application/json' -d @server_consumer.json -i http://127.0.0.1:4318/v1/metrics --verbose; echo '${data.template_file.client_producer.rendered}' | sed -e \"s/START_TIME/$START_TIME/\" > client_producer.json; curl -H 'Content-Type: application/json' -d @client_producer.json -i http://127.0.0.1:4318/v1/metrics --verbose; echo '${data.template_file.traces.rendered}' | sed -e \"s/START_TIME/$START_TIME/\" | sed -e \"s/TRACE_ID/$TRACE_ID/\" > traces.json; curl -H 'Content-Type: application/json' -d @traces.json -i http://127.0.0.1:4318/v1/traces --verbose; sleep 1; done" + "while true; echo '${data.template_file.traceid_generator.rendered}' > traceid_generator.go && chmod +x traceid_generator.go; export START_TIME=$(date +%s%N); export TRACE_ID=$(go run ./traceid_generator.go); do echo '${data.template_file.server_consumer.rendered}' | sed -e \"s/START_TIME/$START_TIME/\" > server_consumer.json; curl -H 'Content-Type: application/json' -d @server_consumer.json -i http://127.0.0.1:4316/v1/metrics --verbose; echo '${data.template_file.client_producer.rendered}' | sed -e \"s/START_TIME/$START_TIME/\" > client_producer.json; curl -H 'Content-Type: application/json' -d @client_producer.json -i http://127.0.0.1:4316/v1/metrics --verbose; echo '${data.template_file.traces.rendered}' | sed -e \"s/START_TIME/$START_TIME/\" | sed -e \"s/TRACE_ID/$TRACE_ID/\" > traces.json; curl -H 'Content-Type: application/json' -d @traces.json -i http://127.0.0.1:4316/v1/traces --verbose; sleep 1; done" ] env { name = "HOST_IP" diff --git a/test/metric/apm_util.go b/test/metric/apm_util.go index 16c7e06b4..ed5164ff0 100644 --- a/test/metric/apm_util.go +++ b/test/metric/apm_util.go @@ -20,11 +20,11 @@ var ( ServerConsumerInstructions = []dimension.Instruction{ { - Key: "HostedIn.EKS.Cluster", + Key: "EKS.Cluster", Value: dimension.UnknownDimensionValue(), }, { - Key: "HostedIn.K8s.Namespace", + Key: "K8s.Namespace", Value: dimension.ExpectedDimensionValue{Value: aws.String("default")}, }, { @@ -39,11 +39,11 @@ var ( ClientProducerInstructions = []dimension.Instruction{ { - Key: "HostedIn.EKS.Cluster", + Key: "EKS.Cluster", Value: dimension.UnknownDimensionValue(), }, { - Key: "HostedIn.K8s.Namespace", + Key: "K8s.Namespace", Value: dimension.ExpectedDimensionValue{Value: aws.String("default")}, }, {