move emf exporter files, removed need to set x-aws-metric-namespace header, and consolidated unit tests

liustve · liustve · commit 423622065287 · 2025-09-27T10:05:27.000-07:00
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java
@@ -541,8 +541,7 @@ MetricExporter customizeMetricExporter(
 
       if (awsRegion.isPresent()) {
         if (headers.containsKey(AWS_OTLP_LOGS_GROUP_HEADER)
-            && headers.containsKey(AWS_OTLP_LOGS_STREAM_HEADER)
-            && headers.containsKey(AWS_EMF_METRICS_NAMESPACE)) {
+            && headers.containsKey(AWS_OTLP_LOGS_STREAM_HEADER)) {
           String namespace = headers.get(AWS_EMF_METRICS_NAMESPACE);
           String logGroup = headers.get(AWS_OTLP_LOGS_GROUP_HEADER);
           String logStream = headers.get(AWS_OTLP_LOGS_STREAM_HEADER);
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/AwsCloudWatchEmfExporter.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/AwsCloudWatchEmfExporter.java
@@ -18,9 +18,9 @@
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import java.util.logging.Logger;
 import software.amazon.awssdk.services.cloudwatchlogs.CloudWatchLogsClient;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.BaseEmfExporter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.CloudWatchLogsClientEmitter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.LogEventEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.BaseEmfExporter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.CloudWatchLogsClientEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.LogEventEmitter;
 
 /**
  * EMF metrics exporter for sending data directly to CloudWatch Logs.
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/ConsoleEmfExporter.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/ConsoleEmfExporter.java
@@ -19,9 +19,9 @@
 import java.io.PrintStream;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.BaseEmfExporter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.ConsoleEmitter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.LogEventEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.BaseEmfExporter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.ConsoleEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.LogEventEmitter;
 
 /** EMF metrics exporter for printing data to Standard Out. */
 public class ConsoleEmfExporter extends BaseEmfExporter<PrintStream> {
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/BaseEmfExporter.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/BaseEmfExporter.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.opentelemetry.javaagent.providers.exporter.aws.common;
+package software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.opentelemetry.api.common.Attributes;
@@ -38,7 +38,7 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.logging.Logger;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.LogEventEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.LogEventEmitter;
 
 /**
  * Base class for EMF metric exporters that converts OpenTelemetry metrics to CloudWatch EMF format.
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/MetricRecord.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/MetricRecord.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.opentelemetry.javaagent.providers.exporter.aws.common;
+package software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.metrics.data.DoublePointData;
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/emitter/CloudWatchLogsClientEmitter.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/emitter/CloudWatchLogsClientEmitter.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter;
+package software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter;
 
 import java.time.Duration;
 import java.util.*;
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/emitter/ConsoleEmitter.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/emitter/ConsoleEmitter.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter;
+package software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter;
 
 import java.io.PrintStream;
 import java.util.Map;
diff --git a/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/emitter/LogEventEmitter.java b/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/common/emitter/LogEventEmitter.java
@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter;
+package software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter;
 
 import java.util.Map;
 
diff --git a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProviderTest.java b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProviderTest.java
@@ -601,21 +601,11 @@ static Stream<Arguments> invalidEmfConfigProvider() {
             AWS_REGION,
             "us-east-1");
 
-    Map<String, String> missingNamespace =
-        Map.of(
-            OTEL_METRICS_EXPORTER,
-            "awsemf",
-            OTEL_EXPORTER_OTLP_LOGS_HEADERS,
-            "x-aws-log-group=test-group,x-aws-log-stream=test-stream",
-            AWS_REGION,
-            "us-east-1");
-
     args.add(wrongExporter);
     args.add(missingHeaders);
     args.add(missingRegion);
     args.add(missingLogGroup);
     args.add(missingLogStream);
-    args.add(missingNamespace);
 
     return args.stream().map(Arguments::of);
   }
diff --git a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/AwsCloudWatchEmfExporterTest.java b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/AwsCloudWatchEmfExporterTest.java
@@ -37,8 +37,8 @@
 import software.amazon.awssdk.services.cloudwatchlogs.model.PutLogEventsRequest;
 import software.amazon.awssdk.services.cloudwatchlogs.model.ResourceAlreadyExistsException;
 import software.amazon.awssdk.services.cloudwatchlogs.model.ResourceNotFoundException;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.CloudWatchLogsClientEmitter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.LogEventEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.CloudWatchLogsClientEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.LogEventEmitter;
 
 public class AwsCloudWatchEmfExporterTest extends BaseEmfExporterTest<CloudWatchLogsClient> {
   private static final String LOG_GROUP_NAME = "test-log-group";
@@ -72,23 +72,6 @@ protected MetricExporter createExporter() {
     return new AwsCloudWatchEmfExporter(NAMESPACE, this.mockEmitter);
   }
 
-  @Override
-  protected Optional<Map<String, Object>> validateEmfStructure(
-      Map<String, Object> logEvent, String metricName) {
-
-    Optional<Map<String, Object>> emfLogOpt = super.validateEmfStructure(logEvent, metricName);
-
-    if (emfLogOpt.isPresent()) {
-      Map<String, Object> emfLog = emfLogOpt.get();
-      Map<String, Object> aws = (Map<String, Object>) emfLog.get("_aws");
-      List<Map<String, Object>> cloudWatchMetrics =
-          (List<Map<String, Object>>) aws.get("CloudWatchMetrics");
-      assertEquals(NAMESPACE, cloudWatchMetrics.get(0).get("Namespace"));
-    }
-
-    return emfLogOpt;
-  }
-
   @Test
   void testShutdown() {
     AwsCloudWatchEmfExporter spyExporter = spy(this.mockExporter);
diff --git a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/BaseEmfExporterTest.java b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/BaseEmfExporterTest.java
@@ -42,7 +42,7 @@
 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.emitter.LogEventEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.LogEventEmitter;
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -318,6 +318,7 @@ protected Optional<Map<String, Object>> validateEmfStructure(
           (List<Map<String, Object>>) awsMetadata.get("CloudWatchMetrics");
       assertEquals(1, cloudWatchMetrics.size());
       Map<String, Object> metricGroup = cloudWatchMetrics.get(0);
+      assertEquals(NAMESPACE, metricGroup.get("Namespace"));
       List<Map<String, Object>> metrics = (List<Map<String, Object>>) metricGroup.get("Metrics");
       assertTrue(metrics.size() >= 1);
       boolean foundMetric = metrics.stream().anyMatch(m -> metricName.equals(m.get("Name")));
diff --git a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/ConsoleEmfExporterTest.java b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/exporter/aws/metrics/ConsoleEmfExporterTest.java
@@ -27,8 +27,8 @@
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.ConsoleEmitter;
-import software.amazon.opentelemetry.javaagent.providers.exporter.aws.common.emitter.LogEventEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.ConsoleEmitter;
+import software.amazon.opentelemetry.javaagent.providers.exporter.aws.metrics.common.emitter.LogEventEmitter;
 
 public class ConsoleEmfExporterTest extends BaseEmfExporterTest<PrintStream> {
   private LogEventEmitter<PrintStream> testMockEmitter;
