Skip to content

fix: use FQDN for CloudWatch agent auto-instrumentation endpoint (#392) #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pete911 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use FQDN for CloudWatch agent auto-instrumentation endpoint (#392) #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ metadata:
namespace: default # use a namespace with pods you'd like to inject
spec:
exporter:
endpoint: http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics
endpoint: http://cloudwatch-agent.amazon-cloudwatch.svc.cluster.local:4316/v1/metrics
propagators:
- tracecontext
- baggage
Expand All @@ -147,7 +147,7 @@ spec:
- name: OTEL_EXPORTER_OTLP_PROTOCOL
value: "http/protobuf"
- name: OTEL_AWS_APPLICATION_SIGNALS_EXPORTER_ENDPOINT
value: "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics"
value: "http://cloudwatch-agent.amazon-cloudwatch.svc.cluster.local:4316/v1/metrics"
EOF
```

Expand Down
4 changes: 2 additions & 2 deletions pkg/instrumentation/defaultinstrumentation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ func getDefaultInstrumentation(agentConfig *adapters.CwaConfig, additionalEnvs m
return nil, errors.New("unable to determine nodejs instrumentation image")
}

cloudwatchAgentServiceEndpoint := "cloudwatch-agent.amazon-cloudwatch"
cloudwatchAgentServiceEndpoint := cloudwatchAgentStandardEndpoint
if isWindowsPod {
// Windows pods use the headless service endpoint due to limitations with the agent on host network mode
// https://kubernetes.io/docs/concepts/services-networking/windows-networking/#limitations
cloudwatchAgentServiceEndpoint = "cloudwatch-agent-windows-headless.amazon-cloudwatch.svc.cluster.local"
cloudwatchAgentServiceEndpoint = cloudwatchAgentWindowsEndpoint
}

// set protocol by checking cloudwatch agent config for tls setting
Expand Down
Loading
Loading