From 462f28aa6ba0c63c5a185e8598a3e9ab69b6e457 Mon Sep 17 00:00:00 2001 From: Hyunsoo Kim Date: Mon, 25 Sep 2023 12:03:56 -0400 Subject: [PATCH] update ports used by the cloudwatch agent otlp receiver --- pkg/collector/common.go | 8 ++++++-- pkg/instrumentation/podmutator.go | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkg/collector/common.go b/pkg/collector/common.go index 089300b32..53d74b4e0 100644 --- a/pkg/collector/common.go +++ b/pkg/collector/common.go @@ -10,10 +10,14 @@ import ( var CloudwatchAgentPorts = []corev1.ServicePort{ { Name: "otlp-grpc", - Port: 4317, + Port: 4315, }, { Name: "otlp-http", - Port: 4318, + Port: 4316, + }, + { + Name: "aws-proxy", + Port: 2000, }, } diff --git a/pkg/instrumentation/podmutator.go b/pkg/instrumentation/podmutator.go index cc8e3c4c0..6331c8cd7 100644 --- a/pkg/instrumentation/podmutator.go +++ b/pkg/instrumentation/podmutator.go @@ -21,7 +21,7 @@ import ( ) const ( - defaultExporterEndpoint = "http://amazon-cloudwatch-agent.amazon-cloudwatch:4317" + defaultExporterEndpoint = "http://amazon-cloudwatch-agent.amazon-cloudwatch:4315" defaultJavaImage = "160148376629.dkr.ecr.us-west-2.amazonaws.com/aws-apm-preview:latest" defaultAPIVersion = "cloudwatch.aws.amazon.com/v1alpha1" defaultInstrumenation = "java-instrumentation" @@ -34,7 +34,7 @@ const ( otelTracesSamplerKey = "OTEL_TRACES_SAMPLER" otelTracesSamplerDefaultValue = "parentbased_traceidratio" otelExporterTracesEndpointKey = "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT" - otelExporterTracesEndpointDefaultValue = "http://amazon-cloudwatch-agent.amazon-cloudwatch:4317" + otelExporterTracesEndpointDefaultValue = "http://amazon-cloudwatch-agent.amazon-cloudwatch:4315" ) var (