Retrieve ECS Cluster Region when empty

Author: agarakan

extension/ecsobserver/ecsobserver.go

@@ -24,10 +24,10 @@ type ECSObserver struct {
 func NewECSObserver(config *ecsobserver.Config, logger *zap.Logger, settings component.TelemetrySettings) (*ECSObserver, error) {
 	// Create the OpenTelemetry ECS observer extension
 	factory := ecsobserver.NewFactory()
-	
+
 	// Create component ID with the correct type that the upstream factory expects
 	componentID := component.NewIDWithName(component.MustNewType("ecs_observer"), "")
-	
+
 	ext, err := factory.Create(
 		context.Background(),
 		extension.Settings{

extension/ecsobserver/main.go

@@ -7,5 +7,7 @@ import (
 	_ "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver"
 )
 
-// This file ensures that the ecsobserver package is properly initialized.
-// The blank import above ensures that the ecsobserver extension is registered.
+/*
+This file ensures that the ecsobserver package is properly initialized
+The blank import above ensures that the ecsobserver extension is registered
+*/

translator/translate/otel/extension/ecsobserver/translator.go

@@ -63,14 +63,19 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) {
 		return nil, &common.MissingKeyError{ID: t.ID(), JsonKey: ecsSDKey}
 	}
 
-	clusterName := getString(ecsSD, "sd_target_cluster")
-	if clusterName == "" {
-		clusterName = ecsutil.GetECSUtilSingleton().Cluster
-	}
+	// ECS SD Top Level Fields
+	resultFile := getStringWithDefault(ecsSD, "sd_result_file", "/tmp/cwagent_ecs_auto_sd.yaml")
+
+	clusterName := getStringWithDefault(ecsSD, "sd_target_cluster", ecsutil.GetECSUtilSingleton().Cluster)
 	if clusterName == "" {
 		return nil, fmt.Errorf("ECS Target Cluster Name is not defined: %s", clusterName)
 	}
 
+	clusterRegion := getStringWithDefault(ecsSD, "sd_cluster_region", ecsutil.GetECSUtilSingleton().Region)
+	if clusterRegion == "" {
+		return nil, fmt.Errorf("ECS Target Cluster Region is not defined: %s", clusterRegion)
+	}
+
 	refreshDuration, err := time.ParseDuration(getStringWithDefault(ecsSD, "sd_frequency", "10s"))
 	if err != nil {
 		return nil, fmt.Errorf("invalid refresh interval: %w", err)
@@ -79,8 +84,8 @@ func (t *translator) Translate(conf *confmap.Conf) (component.Config, error) {
 	cfg := &ecsobserver.Config{
 		RefreshInterval: refreshDuration,
 		ClusterName:     clusterName,
-		ClusterRegion:   getString(ecsSD, "sd_cluster_region"),
-		ResultFile:      getString(ecsSD, "sd_result_file"),
+		ClusterRegion:   clusterRegion,
+		ResultFile:      resultFile,
 	}
 	// Docker label based service discovery
 	if dockerLabel, ok := ecsSD["docker_label"].(map[string]interface{}); ok {