fix bug with AWS_REGION being parsed in config properties

Author: liustve

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

@@ -88,8 +88,8 @@
 public final class AwsApplicationSignalsCustomizerProvider
     implements AutoConfigurationCustomizerProvider {
   // https://docs.aws.amazon.com/cli/v1/userguide/cli-configure-envvars.html
-  static final String AWS_REGION = "AWS_REGION";
-  static final String AWS_DEFAULT_REGION = "AWS_DEFAULT_REGION";
+  static final String AWS_REGION = "aws.region";
+  static final String AWS_DEFAULT_REGION = "aws.default.region";
   static final String AWS_LAMBDA_FUNCTION_NAME_CONFIG = "AWS_LAMBDA_FUNCTION_NAME";
   static final String LAMBDA_APPLICATION_SIGNALS_REMOTE_ENVIRONMENT =
       "LAMBDA_APPLICATION_SIGNALS_REMOTE_ENVIRONMENT";

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

@@ -24,7 +24,6 @@
 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.metrics.AwsCloudWatchEmfExporter;
 
 /**
  * CloudWatch Logs client for batching and sending log events.
@@ -33,7 +32,8 @@
  * logs while respecting CloudWatch Logs constraints.
  */
 public class CloudWatchLogsClientEmitter implements LogEventEmitter<CloudWatchLogsClient> {
-  private static final Logger logger = Logger.getLogger(AwsCloudWatchEmfExporter.class.getName());
+  private static final Logger logger =
+      Logger.getLogger(CloudWatchLogsClientEmitter.class.getName());
 
   // Constants for CloudWatch Logs limits
   // http://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/cloudwatch_limits_cwl.html
@@ -344,8 +344,7 @@ private static StandardRetryStrategy createExponentialBackoffRetryStrategy() {
   /**
    * Container for a batch of CloudWatch log events with metadata.
    *
-   * <p>Tracks the log events, total byte size, and timestamps for efficient batching and
-   * validation.
+   * <p>Tracks the log events, total byte size, and timestamps for batching and validation.
    */
   private static class LogEventBatch {
     private final List<InputLogEvent> logEvents = new ArrayList<>();

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProviderTest.java

@@ -571,11 +571,11 @@ static Stream<Arguments> invalidEmfConfigProvider() {
             "otlp",
             OTEL_EXPORTER_OTLP_LOGS_HEADERS,
             "x-aws-log-group=test-group,x-aws-log-stream=test-stream,x-aws-metric-namespace=test-namespace",
-            "AWS_REGION",
+            AWS_REGION,
             "us-east-1");
 
     Map<String, String> missingHeaders =
-        Map.of(OTEL_METRICS_EXPORTER, "awsemf", "AWS_REGION", "us-east-1");
+        Map.of(OTEL_METRICS_EXPORTER, "awsemf", AWS_REGION, "us-east-1");
 
     Map<String, String> missingRegion =
         Map.of(
@@ -589,7 +589,7 @@ static Stream<Arguments> invalidEmfConfigProvider() {
             "awsemf",
             OTEL_EXPORTER_OTLP_LOGS_HEADERS,
             "x-aws-log-stream=test-stream,x-aws-metric-namespace=test-namespace",
-            "AWS_REGION",
+            AWS_REGION,
             "us-east-1");
 
     Map<String, String> missingLogStream =
@@ -598,7 +598,7 @@ static Stream<Arguments> invalidEmfConfigProvider() {
             "awsemf",
             OTEL_EXPORTER_OTLP_LOGS_HEADERS,
             "x-aws-log-group=test-group,x-aws-metric-namespace=test-namespace",
-            "AWS_REGION",
+            AWS_REGION,
             "us-east-1");
 
     Map<String, String> missingNamespace =
@@ -607,7 +607,7 @@ static Stream<Arguments> invalidEmfConfigProvider() {
             "awsemf",
             OTEL_EXPORTER_OTLP_LOGS_HEADERS,
             "x-aws-log-group=test-group,x-aws-log-stream=test-stream",
-            "AWS_REGION",
+            AWS_REGION,
             "us-east-1");
 
     args.add(wrongExporter);
@@ -629,7 +629,7 @@ static Stream<Arguments> validEmfConfigProvider() {
             "awsemf",
             OTEL_EXPORTER_OTLP_LOGS_HEADERS,
             "x-aws-log-group=test-group,x-aws-log-stream=test-stream,x-aws-metric-namespace=test-namespace",
-            "AWS_REGION",
+            AWS_REGION,
             "us-east-1");
 
     Map<String, String> awsDefaultRegionConfig =
@@ -638,7 +638,7 @@ static Stream<Arguments> validEmfConfigProvider() {
             "awsemf",
             OTEL_EXPORTER_OTLP_LOGS_HEADERS,
             "x-aws-log-group=test-group,x-aws-log-stream=test-stream,x-aws-metric-namespace=test-namespace",
-            "AWS_DEFAULT_REGION",
+            AWS_DEFAULT_REGION,
             "us-west-2");
 
     args.add(awsRegionConfig);