Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ CWAGENT_VERSION
terraform.*
**/.terraform/*
coverage.txt

.kiro/
14 changes: 14 additions & 0 deletions cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (
"github.com/aws/amazon-cloudwatch-agent/cfg/envconfig"
"github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent/internal"
"github.com/aws/amazon-cloudwatch-agent/extension/agenthealth/handler/useragent"
"github.com/aws/amazon-cloudwatch-agent/internal/cloudmetadata"
"github.com/aws/amazon-cloudwatch-agent/internal/mapstructure"
"github.com/aws/amazon-cloudwatch-agent/internal/merge/confmap"
"github.com/aws/amazon-cloudwatch-agent/internal/version"
Expand Down Expand Up @@ -295,6 +296,19 @@ func runAgent(ctx context.Context,
log.Printf("I! AWS SDK log level, %s\n", sdkLogLevel)
}

// Initialize global cloud metadata provider early (non-blocking with timeout)
// Covers all agent modes (logs-only and OTEL)
log.Println("I! [agent] Initializing cloud metadata provider...")
initCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
defer cancel() // Release context resources
go func() {
if err := cloudmetadata.InitGlobalProvider(initCtx, nil); err != nil {
log.Printf("W! [agent] Cloud metadata provider unavailable - some features may be limited: %v", err)
} else {
log.Println("I! [agent] Cloud metadata provider ready")
}
}()

if *fTest || *fTestWait != 0 {
testWaitDuration := time.Duration(*fTestWait) * time.Second
return ag.Test(ctx, testWaitDuration)
Expand Down
Loading
Loading