sync changes, remove duplicate test

Author: jj22ee

aws-distro-opentelemetry-node-autoinstrumentation/src/aws-opentelemetry-configurator.ts

@@ -1048,26 +1048,15 @@ export function createEmfExporter(): EMFExporterBase | undefined {
   if (isLambdaEnvironment() && !otlpLogHeaderSetting.isValid) {
     // Lambda without valid logs http headers - use Console EMF exporter
     exporter = new ConsoleEMFExporter(otlpLogHeaderSetting.namespace);
-  } else {
+  } else if (otlpLogHeaderSetting.isValid) {
     // Non-Lambda environment - use CloudWatch EMF exporter
-    exporter = createCloudWatchEmfExporter(otlpLogHeaderSetting);
+    // If headersResult.isValid is true, then headersResult.logGroup and headersResult.logStream are guaranteed to be strings
+    exporter = new AWSCloudWatchEMFExporter(
+      otlpLogHeaderSetting.namespace,
+      otlpLogHeaderSetting.logGroup as string,
+      otlpLogHeaderSetting.logStream as string
+    );
   }
 
   return exporter;
 }
-
-export function createCloudWatchEmfExporter(
-  otlpLogHeaderSetting?: OtlpLogHeaderSetting
-): AWSCloudWatchEMFExporter | undefined {
-  const headersResult = otlpLogHeaderSetting ?? validateAndFetchLogsHeader();
-  if (!headersResult.isValid) {
-    return undefined;
-  }
-
-  // If headersResult.isValid is true, then headersResult.logGroup and headersResult.logStream are guaranteed to be strings
-  return new AWSCloudWatchEMFExporter(
-    headersResult.namespace,
-    headersResult.logGroup as string,
-    headersResult.logStream as string
-  );
-}

aws-distro-opentelemetry-node-autoinstrumentation/test/aws-opentelemetry-configurator.test.ts

@@ -40,7 +40,6 @@ import {
   AwsOpentelemetryConfigurator,
   AwsSpanProcessorProvider,
   checkEmfExporterEnabled,
-  createCloudWatchEmfExporter,
   createEmfExporter,
   customBuildSamplerFromEnv,
   isAwsOtlpEndpoint,
@@ -1309,14 +1308,6 @@ describe('AwsOpenTelemetryConfiguratorTest', () => {
     expect(process.env.OTEL_METRICS_EXPORTER).toEqual('first,third');
   });
 
-  it('testCreateCloudWatchEmfExporter', async () => {
-    process.env.OTEL_EXPORTER_OTLP_LOGS_HEADERS =
-      'x-aws-log-group=/test/log/group/name,x-aws-log-stream=test_log_stream_name,x-aws-metric-namespace=TEST_NAMESPACE';
-    const exporter = createCloudWatchEmfExporter();
-    expect(exporter).toBeInstanceOf(AWSCloudWatchEMFExporter);
-    delete process.env.OTEL_EXPORTER_OTLP_LOGS_HEADERS;
-  });
-
   it('testIsAwsOtlpEndpoint', () => {
     expect(isAwsOtlpEndpoint('https://xray.us-east-1.amazonaws.com/v1/traces', 'xray')).toBeTruthy();
     expect(isAwsOtlpEndpoint('https://lambda.us-east-1.amazonaws.com/v1/traces', 'xray')).toBeFalsy();

aws-distro-opentelemetry-node-autoinstrumentation/test/exporter/aws/metrics/aws-cloudwatch-emf-exporter.test.ts

@@ -35,7 +35,7 @@ import { Resource } from '@opentelemetry/resources';
 import { LogEventBatch } from '../../../../src/exporter/aws/metrics/cloudwatch-logs-client';
 import { AWSCloudWatchEMFExporter } from '../../../../src/exporter/aws/metrics/aws-cloudwatch-emf-exporter';
 
-describe('TestAwsCloudWatchEmfExporter', () => {
+describe('TestAWSCloudWatchEMFExporter', () => {
   let exporter: AWSCloudWatchEMFExporter;
   const { CloudWatchLogs } = require('@aws-sdk/client-cloudwatch-logs');