From dd23711c866d41f196a877e2be790766dae64799 Mon Sep 17 00:00:00 2001 From: Pranjali Hugay <51330380+phugay@users.noreply.github.com> Date: Tue, 19 Nov 2024 10:07:49 -0500 Subject: [PATCH 1/2] Translate awsentity processor last when translating pipelines (#1428) Co-authored-by: Lisa Guo --- .../otel/pipeline/applicationsignals/translator.go | 5 +++-- .../otel/pipeline/applicationsignals/translator_test.go | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/translator/translate/otel/pipeline/applicationsignals/translator.go b/translator/translate/otel/pipeline/applicationsignals/translator.go index 9540c9844e..239823937c 100644 --- 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 index 23119032eb..a28c93b19e 100644 --- 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"}, }, From ed0c1ae33bb7165de347ebde09e63bb8b083d780 Mon Sep 17 00:00:00 2001 From: Kaushik Surya <108111936+sky333999@users.noreply.github.com> Date: Tue, 19 Nov 2024 11:51:25 -0500 Subject: [PATCH 2/2] Update RELEASE_NOTES for 1.300050.0 (#1433) --- RELEASE_NOTES | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index ed001459a0..51bd121123 100644 --- 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) ========================================================================