Merge branch 'main' into dependabot/go_modules/github.com/docker/dock…

…er-26.1.5incompatible
aws · Nov 20, 2024 · bcc98ca · bcc98ca
2 parents 52e8d9b + ed0c1ae
commit bcc98ca
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,3 +1,11 @@
+========================================================================
+Amazon CloudWatch Agent 1.300050.0 (2024-11-18)
+========================================================================
+Features:
+* [Prometheus] Introduce OTel Prometheus Receiver for publishing to AMP
+* [Prometheus] Support Target Allocator with Prometheus Receivers
+* [ContainerInsights] Introduce Kueue metrics for Container Insights
+
 ========================================================================
 Amazon CloudWatch Agent 1.300049.1 (2024-11-06)
 ========================================================================

diff --git a/translator/translate/otel/pipeline/applicationsignals/translator.go b/translator/translate/otel/pipeline/applicationsignals/translator.go
@@ -60,11 +60,12 @@ func (t *translator) Translate(conf *confmap.Conf) (*common.ComponentTranslators
 	}
 
 	mode := context.CurrentContext().KubernetesMode()
+	translators.Processors.Set(resourcedetection.NewTranslator(resourcedetection.WithDataType(t.dataType)))
+	translators.Processors.Set(awsapplicationsignals.NewTranslator(awsapplicationsignals.WithDataType(t.dataType)))
+
 	if t.dataType == component.DataTypeMetrics && mode != "" {
 		translators.Processors.Set(awsentity.NewTranslatorWithEntityType(awsentity.Service, common.AppSignals, false))
 	}
-	translators.Processors.Set(resourcedetection.NewTranslator(resourcedetection.WithDataType(t.dataType)))
-	translators.Processors.Set(awsapplicationsignals.NewTranslator(awsapplicationsignals.WithDataType(t.dataType)))
 
 	if enabled, _ := common.GetBool(conf, common.AgentDebugConfigKey); enabled {
 		translators.Exporters.Set(debug.NewTranslator(common.WithName(common.AppSignals)))

diff --git a/translator/translate/otel/pipeline/applicationsignals/translator_test.go b/translator/translate/otel/pipeline/applicationsignals/translator_test.go
@@ -126,7 +126,7 @@ func TestTranslatorMetricsForKubernetes(t *testing.T) {
 			},
 			want: &want{
 				receivers:  []string{"otlp/application_signals"},
-				processors: []string{"metricstransform/application_signals", "awsentity/service/application_signals", "resourcedetection", "awsapplicationsignals"},
+				processors: []string{"metricstransform/application_signals", "resourcedetection", "awsapplicationsignals", "awsentity/service/application_signals"},
 				exporters:  []string{"awsemf/application_signals"},
 				extensions: []string{"agenthealth/logs"},
 			},
@@ -147,7 +147,7 @@ func TestTranslatorMetricsForKubernetes(t *testing.T) {
 			},
 			want: &want{
 				receivers:  []string{"otlp/application_signals"},
-				processors: []string{"metricstransform/application_signals", "awsentity/service/application_signals", "resourcedetection", "awsapplicationsignals"},
+				processors: []string{"metricstransform/application_signals", "resourcedetection", "awsapplicationsignals", "awsentity/service/application_signals"},
 				exporters:  []string{"debug/application_signals", "awsemf/application_signals"},
 				extensions: []string{"agenthealth/logs"},
 			},
@@ -165,7 +165,7 @@ func TestTranslatorMetricsForKubernetes(t *testing.T) {
 			},
 			want: &want{
 				receivers:  []string{"otlp/application_signals"},
-				processors: []string{"metricstransform/application_signals", "awsentity/service/application_signals", "resourcedetection", "awsapplicationsignals"},
+				processors: []string{"metricstransform/application_signals", "resourcedetection", "awsapplicationsignals", "awsentity/service/application_signals"},
 				exporters:  []string{"awsemf/application_signals"},
 				extensions: []string{"agenthealth/logs"},
 			},