Unify Application Signals export template (#1430)

aws · Dec 4, 2024 · 6856538 · 6856538
1 parent 9af4477
commit 6856538
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 129 deletions.
diff --git a/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml b/translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.yaml
@@ -32,17 +32,47 @@ exporters:
             - dimensions:
                   - - Environment
                     - Operation
+                    - RemoteEnvironment
                     - RemoteOperation
                     - RemoteResourceIdentifier
                     - RemoteResourceType
                     - RemoteService
                     - Service
                   - - Environment
                     - Operation
+                    - RemoteEnvironment
                     - RemoteOperation
                     - RemoteService
                     - Service
                   - - Environment
+                    - Operation
+                    - RemoteOperation
+                    - RemoteResourceIdentifier
+                    - RemoteResourceType
+                    - RemoteService
+                    - Service
+                  - - Environment
+                    - Operation
+                    - RemoteOperation
+                    - RemoteService
+                    - Service
+                  - - Environment
+                    - RemoteEnvironment
+                    - RemoteService
+                    - Service
+                  - - Environment
+                    - RemoteService
+                    - Service
+                  - - Environment
+                    - RemoteEnvironment
+                    - RemoteOperation
+                    - RemoteResourceIdentifier
+                    - RemoteResourceType
+                    - RemoteService
+                    - Service
+                  - - Environment
+                    - RemoteEnvironment
+                    - RemoteOperation
                     - RemoteService
                     - Service
                   - - Environment

diff --git a/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml b/translator/tocwconfig/sampleConfig/base_appsignals_config.yaml
@@ -32,17 +32,47 @@ exporters:
             - dimensions:
                 - - Environment
                   - Operation
+                  - RemoteEnvironment
                   - RemoteOperation
                   - RemoteResourceIdentifier
                   - RemoteResourceType
                   - RemoteService
                   - Service
                 - - Environment
                   - Operation
+                  - RemoteEnvironment
                   - RemoteOperation
                   - RemoteService
                   - Service
                 - - Environment
+                  - Operation
+                  - RemoteOperation
+                  - RemoteResourceIdentifier
+                  - RemoteResourceType
+                  - RemoteService
+                  - Service
+                - - Environment
+                  - Operation
+                  - RemoteOperation
+                  - RemoteService
+                  - Service
+                - - Environment
+                  - RemoteEnvironment
+                  - RemoteService
+                  - Service
+                - - Environment
+                  - RemoteService
+                  - Service
+                - - Environment
+                  - RemoteEnvironment
+                  - RemoteOperation
+                  - RemoteResourceIdentifier
+                  - RemoteResourceType
+                  - RemoteService
+                  - Service
+                - - Environment
+                  - RemoteEnvironment
+                  - RemoteOperation
                   - RemoteService
                   - Service
                 - - Environment

diff --git a/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml b/translator/tocwconfig/sampleConfig/base_appsignals_fallback_config.yaml
@@ -32,17 +32,47 @@ exporters:
       - dimensions:
           - - Environment
             - Operation
+            - RemoteEnvironment
             - RemoteOperation
             - RemoteResourceIdentifier
             - RemoteResourceType
             - RemoteService
             - Service
           - - Environment
             - Operation
+            - RemoteEnvironment
             - RemoteOperation
             - RemoteService
             - Service
           - - Environment
+            - Operation
+            - RemoteOperation
+            - RemoteResourceIdentifier
+            - RemoteResourceType
+            - RemoteService
+            - Service
+          - - Environment
+            - Operation
+            - RemoteOperation
+            - RemoteService
+            - Service
+          - - Environment
+            - RemoteEnvironment
+            - RemoteService
+            - Service
+          - - Environment
+            - RemoteService
+            - Service
+          - - Environment
+            - RemoteEnvironment
+            - RemoteOperation
+            - RemoteResourceIdentifier
+            - RemoteResourceType
+            - RemoteService
+            - Service
+          - - Environment
+            - RemoteEnvironment
+            - RemoteOperation
             - RemoteService
             - Service
           - - Environment

diff --git a/translator/translate/otel/exporter/awsemf/appsignals_config_generic.yaml b/translator/translate/otel/exporter/awsemf/appsignals_config_generic.yaml
diff --git a/translator/translate/otel/exporter/awsemf/appsignals_config_k8s.yaml b/translator/translate/otel/exporter/awsemf/appsignals_config_k8s.yaml
diff --git a/...xporter/awsemf/appsignals_config_eks.yaml → ...ter/awsemf/awsemf_default_appsignals.yaml b/...xporter/awsemf/appsignals_config_eks.yaml → ...ter/awsemf/awsemf_default_appsignals.yaml
diff --git a/translator/translate/otel/exporter/awsemf/translator.go b/translator/translate/otel/exporter/awsemf/translator.go
@@ -22,7 +22,6 @@ import (
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/common"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/extension/agenthealth"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/receiver/awscontainerinsight"
-	"github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil"
 )
 
 const (
@@ -44,13 +43,7 @@ var defaultKubernetesKueueConfig string
 //go:embed awsemf_default_prometheus.yaml
 var defaultPrometheusConfig string
 
-//go:embed appsignals_config_eks.yaml
-var appSignalsConfigEks string
-
-//go:embed appsignals_config_k8s.yaml
-var appSignalsConfigK8s string
-
-//go:embed appsignals_config_generic.yaml
+//go:embed awsemf_default_appsignals.yaml
 var appSignalsConfigGeneric string
 
 //go:embed awsemf_jmx_config.yaml
@@ -92,7 +85,7 @@ func (t *translator) Translate(c *confmap.Conf) (component.Config, error) {
 
 	defaultConfig := defaultGenericConfig
 	if t.isAppSignals(c) {
-		defaultConfig = getAppSignalsConfig()
+		defaultConfig = appSignalsConfigGeneric
 	} else if t.isCiJMX(c) {
 		defaultConfig = defaultJmxConfig
 	} else if isEcs(c) {
@@ -163,31 +156,6 @@ func (t *translator) Translate(c *confmap.Conf) (component.Config, error) {
 	return cfg, nil
 }
 
-func getAppSignalsConfig() string {
-	ctx := context.CurrentContext()
-
-	mode := ctx.KubernetesMode()
-	if mode == "" {
-		mode = ctx.Mode()
-	}
-	if mode == config.ModeEC2 {
-		if ecsutil.GetECSUtilSingleton().IsECS() {
-			mode = config.ModeECS
-		}
-	}
-
-	switch mode {
-	case config.ModeEKS:
-		return appSignalsConfigEks
-	case config.ModeK8sEC2, config.ModeK8sOnPrem:
-		return appSignalsConfigK8s
-	case config.ModeEC2, config.ModeECS:
-		return appSignalsConfigGeneric
-	default:
-		return appSignalsConfigGeneric
-	}
-}
-
 func (t *translator) isAppSignals(conf *confmap.Conf) bool {
 	return (t.name == common.AppSignals || t.name == common.AppSignalsFallback) && (conf.IsSet(common.AppSignalsMetrics) || conf.IsSet(common.AppSignalsTraces) || conf.IsSet(common.AppSignalsMetricsFallback) || conf.IsSet(common.AppSignalsTracesFallback))
 }

diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go
@@ -928,7 +928,7 @@ func TestTranslateAppSignals(t *testing.T) {
 						"application_signals": map[string]any{},
 					},
 				}},
-			want: testutil.GetConfWithOverrides(t, filepath.Join("appsignals_config_eks.yaml"), map[string]any{
+			want: testutil.GetConfWithOverrides(t, filepath.Join("awsemf_default_appsignals.yaml"), map[string]any{
 				"local_mode":            "false",
 				"region":                "us-east-1",
 				"role_arn":              "global_arn",
@@ -944,7 +944,7 @@ func TestTranslateAppSignals(t *testing.T) {
 						"application_signals": map[string]any{},
 					},
 				}},
-			want: testutil.GetConfWithOverrides(t, filepath.Join("appsignals_config_k8s.yaml"), map[string]any{
+			want: testutil.GetConfWithOverrides(t, filepath.Join("awsemf_default_appsignals.yaml"), map[string]any{
 				"local_mode":            "true",
 				"region":                "us-east-1",
 				"role_arn":              "global_arn",
@@ -960,7 +960,7 @@ func TestTranslateAppSignals(t *testing.T) {
 						"application_signals": map[string]any{},
 					},
 				}},
-			want: testutil.GetConfWithOverrides(t, filepath.Join("appsignals_config_generic.yaml"), map[string]any{
+			want: testutil.GetConfWithOverrides(t, filepath.Join("awsemf_default_appsignals.yaml"), map[string]any{
 				"local_mode":            "true",
 				"region":                "us-east-1",
 				"role_arn":              "global_arn",
@@ -976,7 +976,7 @@ func TestTranslateAppSignals(t *testing.T) {
 						"application_signals": map[string]any{},
 					},
 				}},
-			want: testutil.GetConfWithOverrides(t, filepath.Join("appsignals_config_generic.yaml"), map[string]any{
+			want: testutil.GetConfWithOverrides(t, filepath.Join("awsemf_default_appsignals.yaml"), map[string]any{
 				"local_mode":            "false",
 				"region":                "us-east-1",
 				"role_arn":              "global_arn",
@@ -992,7 +992,7 @@ func TestTranslateAppSignals(t *testing.T) {
 						"app_signals": map[string]any{},
 					},
 				}},
-			want: testutil.GetConfWithOverrides(t, filepath.Join("appsignals_config_eks.yaml"), map[string]any{
+			want: testutil.GetConfWithOverrides(t, filepath.Join("awsemf_default_appsignals.yaml"), map[string]any{
 				"local_mode":            "false",
 				"region":                "us-east-1",
 				"role_arn":              "global_arn",
@@ -1008,7 +1008,7 @@ func TestTranslateAppSignals(t *testing.T) {
 						"app_signals": map[string]any{},
 					},
 				}},
-			want: testutil.GetConfWithOverrides(t, filepath.Join("appsignals_config_k8s.yaml"), map[string]any{
+			want: testutil.GetConfWithOverrides(t, filepath.Join("awsemf_default_appsignals.yaml"), map[string]any{
 				"local_mode":            "true",
 				"region":                "us-east-1",
 				"role_arn":              "global_arn",
@@ -1024,7 +1024,7 @@ func TestTranslateAppSignals(t *testing.T) {
 						"app_signals": map[string]any{},
 					},
 				}},
-			want: testutil.GetConfWithOverrides(t, filepath.Join("appsignals_config_generic.yaml"), map[string]any{
+			want: testutil.GetConfWithOverrides(t, filepath.Join("awsemf_default_appsignals.yaml"), map[string]any{
 				"local_mode":            "true",
 				"region":                "us-east-1",
 				"role_arn":              "global_arn",
@@ -1040,7 +1040,7 @@ func TestTranslateAppSignals(t *testing.T) {
 						"app_signals": map[string]any{},
 					},
 				}},
-			want: testutil.GetConfWithOverrides(t, filepath.Join("appsignals_config_generic.yaml"), map[string]any{
+			want: testutil.GetConfWithOverrides(t, filepath.Join("awsemf_default_appsignals.yaml"), map[string]any{
 				"local_mode":            "false",
 				"region":                "us-east-1",
 				"role_arn":              "global_arn",