Revert "Update OTLP ports to have less conflict & add aws-proxy port (#…

…14)" (#16) This reverts commit 98ec59c.
aws · Oct 2, 2023 · 7ee42fb · 7ee42fb
1 parent a93aae7
commit 7ee42fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -133,7 +133,7 @@ metadata:
   namespace: default # use a namespace with pods you'd like to inject
 spec:
   exporter:
-    endpoint: http://amazon-cloudwatch-agent.amazon-cloudwatch:4315
+    endpoint: http://amazon-cloudwatch-agent.amazon-cloudwatch:4317
   propagators:
     - tracecontext
     - baggage

diff --git a/pkg/collector/common.go b/pkg/collector/common.go
@@ -10,14 +10,10 @@ import (
 var CloudwatchAgentPorts = []corev1.ServicePort{
 	{
 		Name: "otlp-grpc",
-		Port: 4315,
+		Port: 4317,
 	},
 	{
 		Name: "otlp-http",
-		Port: 4316,
-	},
-	{
-		Name: "aws-proxy",
-		Port: 2000,
+		Port: 4318,
 	},
 }
diff --git a/pkg/instrumentation/podmutator.go b/pkg/instrumentation/podmutator.go
@@ -21,7 +21,7 @@ import (
 )
 
 const (
-	defaultExporterEndpoint                = "http://amazon-cloudwatch-agent.amazon-cloudwatch:4315"
+	defaultExporterEndpoint                = "http://amazon-cloudwatch-agent.amazon-cloudwatch:4317"
 	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:4315"
+	otelExporterTracesEndpointDefaultValue = "http://amazon-cloudwatch-agent.amazon-cloudwatch:4317"
 )
 
 var (