add emf exporter to changelog

Author: liustve

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsConfigUtils.java

@@ -32,14 +32,14 @@ public final class AwsApplicationSignalsConfigUtils {
    * Removes "awsemf" from OTEL_METRICS_EXPORTER if present.
    *
    * @param configProps the configuration properties
-   * @return string with "awsemf" removed if the original OTEL_METRICS_EXPORTER contains "awsemf",
-   *     otherwise null if "awsemf" is not found
+   * @return Optional containing string with "awsemf" removed if the original OTEL_METRICS_EXPORTER
+   *     contains "awsemf", otherwise empty Optional if "awsemf" is not found
    */
-  static String removeEmfExporterIfEnabled(ConfigProperties configProps) {
+  static Optional<String> removeEmfExporterIfEnabled(ConfigProperties configProps) {
     String metricExporters = configProps.getString(OTEL_METRICS_EXPORTER);
 
     if (metricExporters == null || !metricExporters.contains("awsemf")) {
-      return null;
+      return Optional.empty();
     }
 
     String[] exporters = metricExporters.split(",");
@@ -49,7 +49,10 @@ static String removeEmfExporterIfEnabled(ConfigProperties configProps) {
             .filter(exp -> !exp.equals("awsemf"))
             .collect(java.util.stream.Collectors.toList());
 
-    return filtered.isEmpty() ? "" : String.join(",", filtered);
+    // Return empty string instead of "none" because upstream will not call
+    // customizeMetricExporter if OTEL_METRICS_EXPORTER is set to "none" as it assumes
+    // no metrics exporter is configured
+    return Optional.of(filtered.isEmpty() ? "" : String.join(",", filtered));
   }
 
   /**

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java

@@ -210,11 +210,11 @@ private Map<String, String> customizeProperties(ConfigProperties configProps) {
     boolean isLambdaEnvironment = isLambdaEnvironment();
 
     // Check if awsemf was specified and remove it from OTEL_METRICS_EXPORTER
-    String filteredExporters =
+    Optional<String> filteredExporters =
         AwsApplicationSignalsConfigUtils.removeEmfExporterIfEnabled(configProps);
-    if (filteredExporters != null) {
+    if (filteredExporters.isPresent()) {
       this.isEmfExporterEnabled = true;
-      propsOverride.put(OTEL_METRICS_EXPORTER, filteredExporters);
+      propsOverride.put(OTEL_METRICS_EXPORTER, filteredExporters.get());
     }
 
     // Enable AWS Resource Providers

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/common/LogEventEmitter.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.opentelemetry.javaagent.providers.exporter.aws.common;
+
+import java.util.Map;
+
+/** Interface for emitting log events. */
+public interface LogEventEmitter {
+  /**
+   * Emit a log event.
+   *
+   * @param logEvent The log event to emit
+   */
+  void emit(Map<String, Object> logEvent);
+}

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/AwsCloudWatchEmfExporter.java

@@ -24,11 +24,13 @@
 import java.util.UUID;
 import java.util.logging.Logger;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
+import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.retries.StandardRetryStrategy;
 import software.amazon.awssdk.retries.api.BackoffStrategy;
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
 import software.amazon.awssdk.services.cloudwatchlogs.model.*;
 import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.BaseEmfExporter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.LogEventEmitter;
 
 /**
  * OpenTelemetry metrics exporter for CloudWatch EMF format.
@@ -42,26 +44,32 @@
 public class AwsCloudWatchEmfExporter extends BaseEmfExporter {
   private static final Logger logger = Logger.getLogger(AwsCloudWatchEmfExporter.class.getName());
 
-  private final CloudWatchLogsClientWrapper logsClientWrapper;
+  private final LogEventEmitter emitter;
 
   /**
    * Initialize the CloudWatch EMF exporter.
    *
    * @param namespace CloudWatch namespace for metrics (default: "default")
    * @param logGroupName CloudWatch log group name
    * @param logStreamName CloudWatch log stream name (auto-generated if null)
-   * @param awsRegion AWS region (auto-detected if null)
+   * @param awsRegion AWS region
    */
   public AwsCloudWatchEmfExporter(
       String namespace, String logGroupName, String logStreamName, String awsRegion) {
     super(namespace);
-    this.logsClientWrapper =
-        new CloudWatchLogsClientWrapper(logGroupName, logStreamName, awsRegion);
+    this.emitter = new CloudWatchLogsClientWrapper(logGroupName, logStreamName, awsRegion);
+  }
+
+  public AwsCloudWatchEmfExporter(String namespace, LogEventEmitter emitter) {
+    super(namespace);
+    this.emitter = emitter;
   }
 
   @Override
   public CompletableResultCode flush() {
-    this.logsClientWrapper.flushPendingEvents();
+    if (emitter instanceof CloudWatchLogsClientWrapper) {
+      ((CloudWatchLogsClientWrapper) emitter).flushPendingEvents();
+    }
     logger.fine("AwsCloudWatchEmfExporter force flushes the buffered metrics");
     return CompletableResultCode.ofSuccess();
   }
@@ -75,7 +83,7 @@ public CompletableResultCode shutdown() {
 
   @Override
   protected void emit(Map<String, Object> logEvent) {
-    this.logsClientWrapper.sendLogEvent(logEvent);
+    this.emitter.emit(logEvent);
   }
 
   private static StandardRetryStrategy createExponentialBackoffRetryStrategy() {
@@ -100,7 +108,7 @@ private static StandardRetryStrategy createExponentialBackoffRetryStrategy() {
    * <p>This class handles the batching logic and CloudWatch Logs API interactions for sending EMF
    * logs efficiently while respecting CloudWatch Logs constraints.
    */
-  private static class CloudWatchLogsClientWrapper {
+  private static class CloudWatchLogsClientWrapper implements LogEventEmitter {
     private static final Logger logger = Logger.getLogger(AwsCloudWatchEmfExporter.class.getName());
 
     // Constants for CloudWatch Logs limits
@@ -110,7 +118,7 @@ private static class CloudWatchLogsClientWrapper {
     private static final int CW_MAX_REQUEST_EVENT_COUNT = 10000;
     private static final int CW_PER_EVENT_HEADER_BYTES = 26;
     private static final long BATCH_FLUSH_INTERVAL = 60 * 1000; // 60 seconds
-    private static final int CW_MAX_REQUEST_PAYLOAD_BYTES = 1 * 1024 * 1024; // 1MB
+    private static final int CW_MAX_REQUEST_PAYLOAD_BYTES = 1024 * 1024; // 1MB
     private static final String CW_TRUNCATED_SUFFIX = "[Truncated...]";
     // None of the log events in the batch can be older than 14 days
     private static final long CW_EVENT_TIMESTAMP_LIMIT_PAST = 14 * 24 * 60 * 60 * 1000L;
@@ -120,19 +128,21 @@ private static class CloudWatchLogsClientWrapper {
     private CloudWatchLogsClient logsClient;
     private final String logGroupName;
     private final String logStreamName;
+    private final String awsRegion;
     private LogEventBatch eventBatch;
 
     /**
      * Initialize the CloudWatch Logs client wrapper.
      *
      * @param logGroupName CloudWatch log group name
      * @param logStreamName CloudWatch log stream name (auto-generated if null)
-     * @param awsRegion AWS region (auto-detected if null)
+     * @param awsRegion AWS region
      */
-    public CloudWatchLogsClientWrapper(
+    private CloudWatchLogsClientWrapper(
         String logGroupName, String logStreamName, String awsRegion) {
       this.logGroupName = logGroupName;
       this.logStreamName = logStreamName != null ? logStreamName : generateLogStreamName();
+      this.awsRegion = awsRegion;
     }
 
     private CloudWatchLogsClient getLogsClient() {
@@ -145,6 +155,7 @@ private CloudWatchLogsClient getLogsClient() {
             CloudWatchLogsClient.builder()
                 .overrideConfiguration(
                     config -> config.retryStrategy(createExponentialBackoffRetryStrategy()).build())
+                .region(Region.of(this.awsRegion))
                 .build();
       }
       return this.logsClient;
@@ -191,7 +202,8 @@ private void createLogStreamIfNeeded() {
       }
     }
 
-    private void sendLogEvent(Map<String, Object> logEvent) {
+    @Override
+    public void emit(Map<String, Object> logEvent) {
       try {
         if (!isValidLogEvent(logEvent)) {
           return;

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/AwsCloudWatchEmfExporterTest.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.metrics.data.DoublePointData;
+import io.opentelemetry.sdk.metrics.data.GaugeData;
+import io.opentelemetry.sdk.metrics.data.MetricData;
+import io.opentelemetry.sdk.metrics.data.SumData;
+import io.opentelemetry.sdk.metrics.export.MetricExporter;
+import io.opentelemetry.sdk.resources.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.LogEventEmitter;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class AwsCloudWatchEmfExporterTest {
+  private static final String NAMESPACE = "test-namespace";
+  private MetricExporter exporter;
+  private LogEventEmitter mockEmitter;
+  private List<Map<String, Object>> capturedLogEvents;
+
+  @BeforeEach
+  void setup() {
+    mockEmitter = mock(LogEventEmitter.class);
+    capturedLogEvents = new ArrayList<>();
+
+    doAnswer(
+            invocation -> {
+              capturedLogEvents.add(invocation.getArgument(0));
+              return null;
+            })
+        .when(mockEmitter)
+        .emit(any());
+
+    exporter = new AwsCloudWatchEmfExporter(NAMESPACE, mockEmitter);
+  }
+
+  @Test
+  void testExporterCreation() {}
+
+  @Test
+  void testGaugeAndSumMetricProcessing() {
+    MetricData gaugeMetric = createGaugeMetricWithPoint("test.gauge", 42.0);
+    MetricData sumMetric = createSumMetricWithPoint("test.sum", 100L);
+
+    exporter.export(List.of(gaugeMetric, sumMetric));
+
+    // Validate that log events were emitted
+    assertEquals(2, capturedLogEvents.size());
+
+    for (Map<String, Object> logEvent : capturedLogEvents) {
+      assertNotNull(logEvent.get("message"));
+      assertNotNull(logEvent.get("timestamp"));
+    }
+  }
+
+  private MetricData createGaugeMetricWithPoint(String name, double value) {
+    MetricData metricData = mock(MetricData.class);
+    GaugeData gaugeData = mock(GaugeData.class);
+
+    DoublePointData pointData = mock(DoublePointData.class);
+
+    when(metricData.getName()).thenReturn(name);
+    when(metricData.getUnit()).thenReturn("1");
+    when(metricData.getData()).thenReturn(gaugeData);
+    when(metricData.getResource()).thenReturn(Resource.getDefault());
+    when(gaugeData.getPoints()).thenReturn(List.of(pointData));
+
+    when(pointData.getValue()).thenReturn(value);
+    when(pointData.getAttributes()).thenReturn(Attributes.empty());
+    when(pointData.getEpochNanos()).thenReturn(System.nanoTime());
+
+    return metricData;
+  }
+
+  private MetricData createSumMetricWithPoint(String name, long value) {
+    MetricData metricData = mock(MetricData.class);
+    SumData sumData = mock(SumData.class);
+    DoublePointData pointData = mock(DoublePointData.class);
+
+    when(metricData.getName()).thenReturn(name);
+    when(metricData.getUnit()).thenReturn("1");
+    when(metricData.getData()).thenReturn(sumData);
+    when(metricData.getResource()).thenReturn(Resource.getDefault());
+    when(sumData.getPoints()).thenReturn(List.of(pointData));
+    when(pointData.getValue()).thenReturn((double) value);
+    when(pointData.getAttributes()).thenReturn(Attributes.empty());
+    when(pointData.getEpochNanos()).thenReturn(System.nanoTime());
+
+    return metricData;
+  }
+}

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/OtlpAwsExporterTest.java renamed to awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/otlp/aws/OtlpAwsExporterTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.opentelemetry.javaagent.providers;
+package software.amazon.opentelemetry.javaagent.providers.exporter.otlp.aws;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;