refactor

Author: movence

translator/config/schema.json

@@ -1390,6 +1390,13 @@
           "type": "string",
           "minLength": 1,
           "maxLength": 259
+        },
+        "log_group_name": {
+          "description": "CloudWatch log group name for OTLP metrics",
+          "type": "string"
+        },
+        "emf_processor": {
+          "$ref": "#/definitions/emfProcessorDefinition"
         }
       },
       "additionalProperties": false

translator/tocwconfig/sampleConfig/otlp_metrics_cloudwatchlogs_config.json

@@ -8,6 +8,14 @@
         "tls": {
           "cert_file": "/path/to/cert.pem",
           "key_file": "/path/to/key.pem"
+        },
+        "log_group_name": "/aws/application/otlp",
+        "emf_processor": {
+          "metric_namespace": "MyApplication/OTLP",
+          "metric_unit": {
+            "request_duration": "Milliseconds",
+            "request_count": "Count"
+          }
         }
       }
     }

translator/tocwconfig/sampleConfig/otlp_metrics_cloudwatchlogs_config.yaml

@@ -11,12 +11,19 @@ exporters:
         external_id: ""
         imds_retries: 1
         local_mode: false
-        log_group_name: /aws/cwagent
+        log_group_name: /aws/application/otlp
         log_retention: 0
         log_stream_name: ""
         max_retries: 2
+        metric_descriptors:
+            - metric_name: request_count
+              overwrite: false
+              unit: Count
+            - metric_name: request_duration
+              overwrite: false
+              unit: Milliseconds
         middleware: agenthealth/logs
-        namespace: CWAgent
+        namespace: MyApplication/OTLP
         no_verify_ssl: false
         num_workers: 8
         output_destination: cloudwatch

translator/translate/logs/metrics_collected/otlp/otlp.go

@@ -0,0 +1,46 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package otlp
+
+import (
+	parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected"
+)
+
+type Otlp struct {
+}
+
+const SectionKey = "otlp"
+
+func GetCurPath() string {
+	curPath := parent.GetCurPath() + SectionKey + "/"
+	return curPath
+}
+
+func (o *Otlp) ApplyRule(input interface{}) (returnKey string, returnVal interface{}) {
+	im := input.(map[string]interface{})
+	result := map[string]map[string]interface{}{}
+	inputs := map[string]interface{}{}
+	processors := map[string]interface{}{}
+
+	// Check if this plugin exists in the input instance
+	if _, ok := im[SectionKey]; !ok {
+		returnKey = ""
+		returnVal = ""
+	} else {
+		// OTLP configuration is handled by the OTEL pipeline translator
+		// This rule just validates the configuration exists
+		result["inputs"] = inputs
+		result["processors"] = processors
+		returnKey = SectionKey
+		returnVal = result
+	}
+	return
+}
+
+func init() {
+	o := new(Otlp)
+	parent.RegisterLinuxRule(SectionKey, o)
+	parent.RegisterDarwinRule(SectionKey, o)
+	parent.RegisterWindowsRule(SectionKey, o)
+}

translator/translate/otel/exporter/awsemf/otlp.go

@@ -0,0 +1,52 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: MIT
+
+package awsemf
+
+import (
+	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
+	"go.opentelemetry.io/collector/confmap"
+
+	"github.com/aws/amazon-cloudwatch-agent/translator/translate/otel/common"
+)
+
+var (
+	otlpBasePathKey         = common.OTLPLogsKey
+	otlpEMFProcessorPathKey = common.ConfigKey(otlpBasePathKey, common.EMFProcessorKey)
+)
+
+// setOTLPFields configures the EMF exporter for OTLP metrics
+func setOTLPFields(conf *confmap.Conf, cfg *awsemfexporter.Config) error {
+	// Set log group name if provided
+	setOTLPLogGroup(conf, cfg)
+
+	// Set EMF processor fields if provided
+	if conf.IsSet(otlpEMFProcessorPathKey) {
+		if err := setOTLPNamespace(conf, cfg); err != nil {
+			return err
+		}
+		if err := setOTLPMetricDescriptors(conf, cfg); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+// setOTLPLogGroup sets the log group name for OTLP metrics
+// If not set, use the default from awsemf_default_generic.yaml (/aws/cwagent)
+func setOTLPLogGroup(conf *confmap.Conf, cfg *awsemfexporter.Config) {
+	if logGroupName, ok := common.GetString(conf, common.ConfigKey(otlpBasePathKey, common.LogGroupName)); ok {
+		cfg.LogGroupName = logGroupName
+	}
+}
+
+// setOTLPNamespace sets the metric namespace for OTLP metrics
+func setOTLPNamespace(conf *confmap.Conf, cfg *awsemfexporter.Config) error {
+	return setNamespaceWithDefault(conf, common.ConfigKey(otlpEMFProcessorPathKey, metricNamespace), "", cfg)
+}
+
+// setOTLPMetricDescriptors sets the metric units for OTLP metrics
+func setOTLPMetricDescriptors(conf *confmap.Conf, cfg *awsemfexporter.Config) error {
+	return setMetricDescriptors(conf, common.ConfigKey(otlpEMFProcessorPathKey, metricUnit), cfg)
+}