fixing make tests

Author: Paramadon

translator/tocwconfig/sampleConfig/prometheus_combined_config_linux.yaml

@@ -1,4 +1,13 @@
 exporters:
+    awscloudwatch:
+        force_flush_interval: 1m0s
+        max_datums_per_call: 1000
+        max_values_per_datum: 150
+        middleware: agenthealth/metrics
+        namespace: CWAgent
+        region: us-west-2
+        resource_to_telemetry_conversion:
+            enabled: true
     awsemf/prometheus:
         add_entity: false
         certificate_file_path: ""
@@ -107,6 +116,14 @@ extensions:
             usage_flags:
                 mode: EC2
                 region_type: ACJ
+    agenthealth/metrics:
+        is_usage_data_enabled: true
+        stats:
+            operations:
+                - PutMetricData
+            usage_flags:
+                mode: EC2
+                region_type: ACJ
     agenthealth/statuscode:
         is_status_code_enabled: true
         is_usage_data_enabled: true
@@ -127,11 +144,23 @@ processors:
         send_batch_max_size: 0
         send_batch_size: 8192
         timeout: 1m0s
+    batch/prometheus/cloudwatch:
+        metadata_cardinality_limit: 1000
+        send_batch_max_size: 0
+        send_batch_size: 8192
+        timeout: 1m0s
     batch/prometheus/cloudwatchlogs:
         metadata_cardinality_limit: 1000
         send_batch_max_size: 0
         send_batch_size: 8192
         timeout: 30s
+    cumulativetodelta/prometheus/cloudwatch:
+        exclude:
+            match_type: ""
+        include:
+            match_type: ""
+        initial_value: 2
+        max_staleness: 0s
     deltatocumulative/prometheus/amp:
         max_stale: 336h0m0s
         max_streams: 9223372036854775807
@@ -179,9 +208,10 @@ receivers:
         timeout: 0s
 service:
     extensions:
-        - agenthealth/logs
+        - agenthealth/metrics
         - agenthealth/statuscode
         - sigv4auth
+        - agenthealth/logs
         - entitystore
     pipelines:
         metrics/prometheus/amp:
@@ -192,6 +222,14 @@ service:
                 - deltatocumulative/prometheus/amp
             receivers:
                 - prometheus
+        metrics/prometheus/cloudwatch:
+            exporters:
+                - awscloudwatch
+            processors:
+                - batch/prometheus/cloudwatch
+                - cumulativetodelta/prometheus/cloudwatch
+            receivers:
+                - prometheus
         metrics/prometheus/cloudwatchlogs:
             exporters:
                 - awsemf/prometheus

translator/tocwconfig/sampleConfig/prometheus_pmd_config.json

@@ -1,10 +1,9 @@
 {
   "agent": {
-    "metrics_collection_interval": 15,
-    "debug": true
+    "metrics_collection_interval": 15
   },
   "metrics": {
-    "namespace": "PrometheusTest123",
+    "namespace": "CWAgent",
     "metrics_destinations": {
       "cloudwatch": {}
     },

translator/tocwconfig/sampleConfig/prometheus_pmd_config.yaml

@@ -36,6 +36,13 @@ processors:
         send_batch_max_size: 0
         send_batch_size: 8192
         timeout: 1m0s
+    cumulativetodelta/prometheus/cloudwatch:
+        exclude:
+            match_type: ""
+        include:
+            match_type: ""
+        initial_value: 2
+        max_staleness: 0s
     ec2tagger:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
@@ -99,6 +106,7 @@ service:
                 - awscloudwatch
             processors:
                 - batch/prometheus/cloudwatch
+                - cumulativetodelta/prometheus/cloudwatch
                 - rollup
                 - ec2tagger
             receivers:

translator/translate/otel/pipeline/prometheus/translator.go

@@ -15,7 +15,6 @@ import (
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/common"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/exporter/awscloudwatch"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/exporter/awsemf"
-	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/exporter/debug"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/exporter/prometheusremotewrite"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/extension/agenthealth"
 	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/extension/sigv4auth"
@@ -68,7 +67,7 @@ func (t *translator) Translate(conf *confmap.Conf) (*common.ComponentTranslators
 	// otel_prometheus - AMP
 	// this could change in future releases to support different source/destination combinations
 	switch t.Destination() {
-	case common.CloudWatchKey:
+	case common.DefaultDestination, common.CloudWatchKey:
 		if !conf.IsSet(MetricsKey) {
 			return nil, fmt.Errorf("pipeline (%s) is missing prometheus configuration under metrics section with destination (%s)", t.name, t.Destination())
 		}
@@ -78,10 +77,7 @@ func (t *translator) Translate(conf *confmap.Conf) (*common.ComponentTranslators
 				batchprocessor.NewTranslatorWithNameAndSection(t.name, common.MetricsKey),
 				cumulativetodeltaprocessor.NewTranslator(common.WithName(t.name), cumulativetodeltaprocessor.WithDefaultKeys()),
 			),
-			Exporters: common.NewTranslatorMap(
-				awscloudwatch.NewTranslator(),
-				debug.NewTranslator(),
-			),
+			Exporters: common.NewTranslatorMap(awscloudwatch.NewTranslator()),
 			Extensions: common.NewTranslatorMap(
 				agenthealth.NewTranslator(agenthealth.MetricsName, []string{agenthealth.OperationPutMetricData}),
 				agenthealth.NewTranslatorWithStatusCode(agenthealth.StatusCodeName, nil, true),

translator/translate/otel/pipeline/prometheus/translators.go

@@ -12,7 +12,11 @@ import (
 
 func NewTranslators(conf *confmap.Conf) common.PipelineTranslatorMap {
 	translators := common.NewTranslatorMap[*common.ComponentTranslators, pipeline.ID]()
+
 	destinations := common.GetMetricsDestinations(conf)
+	if conf.IsSet(LogsKey) {
+		destinations = append(destinations, common.CloudWatchLogsKey)
+	}
 
 	for _, destination := range destinations {
 		translators.Set(NewTranslator(common.WithDestination(destination)))

translator/translate/otel/pipeline/prometheus/translators_test.go

@@ -4,6 +4,7 @@
 package prometheus
 
 import (
+	"log"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -33,7 +34,7 @@ func TestTranslators(t *testing.T) {
 				},
 			},
 			want: []pipeline.ID{
-				pipeline.MustNewIDWithName("metrics", "prometheus/amp"),
+				pipeline.MustNewIDWithName("metrics", "prometheus"),
 			},
 		},
 		"WithLogsWithoutDestinations": {
@@ -60,7 +61,7 @@ func TestTranslators(t *testing.T) {
 				},
 			},
 			want: []pipeline.ID{
-				pipeline.MustNewIDWithName("metrics", "prometheus/amp"),
+				pipeline.MustNewIDWithName("metrics", "prometheus/cloudwatch"),
 			},
 		},
 		"WithMetricsWithAMP": {
@@ -95,6 +96,22 @@ func TestTranslators(t *testing.T) {
 			},
 			want: []pipeline.ID{
 				pipeline.MustNewIDWithName("metrics", "prometheus/cloudwatchlogs"),
+				pipeline.MustNewIDWithName("metrics", "prometheus/cloudwatch"),
+			},
+		},
+		"WithMetricsAndCloudWatchDestinationOnly": {
+			input: map[string]any{
+				"metrics": map[string]any{
+					"metrics_destinations": map[string]any{
+						"cloudwatch": map[string]any{},
+					},
+					"metrics_collected": map[string]any{
+						"prometheus": map[string]any{},
+					},
+				},
+			},
+			want: []pipeline.ID{
+				pipeline.MustNewIDWithName("metrics", "prometheus/cloudwatch"),
 			},
 		},
 		"WithMultiple/Destinations": {
@@ -119,6 +136,7 @@ func TestTranslators(t *testing.T) {
 			want: []pipeline.ID{
 				pipeline.MustNewIDWithName("metrics", "prometheus/amp"),
 				pipeline.MustNewIDWithName("metrics", "prometheus/cloudwatchlogs"),
+				pipeline.MustNewIDWithName("metrics", "prometheus/cloudwatch"),
 			},
 		},
 	}
@@ -130,6 +148,8 @@ func TestTranslators(t *testing.T) {
 				require.Nil(t, got)
 			} else {
 				require.NotNil(t, got)
+				log.Println(testCase.want)
+				log.Println(got)
 				assert.Equal(t, len(testCase.want), got.Len())
 				for _, id := range testCase.want {
 					_, ok := got.Get(id)

translator/translate/otel/processor/cumulativetodeltaprocessor/translator_test.go

@@ -31,7 +31,7 @@ func TestTranslator(t *testing.T) {
 					},
 				},
 			},
-			wantErr: &common.MissingKeyError{ID: cdpTranslator.ID(), JsonKey: fmt.Sprint(diskioKey, " or ", netKey, " or ", otlpKey, " or ", otlpEmfKey)},
+			wantErr: &common.MissingKeyError{ID: cdpTranslator.ID(), JsonKey: fmt.Sprint(diskioKey, " or ", netKey, " or ", otlpKey, " or ", otlpEmfKey, " or ", prometheusPmdKey)},
 		},
 		"GenerateDeltaProcessorConfigWithNet": {
 			input: map[string]any{