add extra unit tests

Author: liustve

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/exporter/otlp/aws/logs/otlp_aws_logs_exporter.py

@@ -28,7 +28,8 @@
 
 class OTLPAwsLogExporter(OTLPLogExporter):
     """
-    Below is the protobuf-JSON formatted path to "content" and "role" for the following GenAI Consolidated Log Event Schema:
+    Below is the protobuf-JSON formatted path to "content" and "role" for the
+    following GenAI Consolidated Log Event Schema:
 
     "body": {
         "output": {
@@ -188,7 +189,7 @@ def _send(self, serialized_data: bytes):
                 cert=self._client_cert,
             )
             return response
-        except ConnectionError:
+        except requests.exceptions.ConnectionError:
             response = self._session.post(
                 url=self._endpoint,
                 headers={self._LARGE_LOG_HEADER: self._LARGE_GEN_AI_LOG_PATH_HEADER} if self._gen_ai_log_flag else None,

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/exporter/aws/metrics/aws_cloudwatch_emf_exporter.py renamed to aws-opentelemetry-distro/src/amazon/opentelemetry/distro/exporter/otlp/aws/metrics/aws_cloudwatch_emf_exporter.py

@@ -63,3 +63,18 @@ def test_aws_auth_session(self, _, __):
         self.assertIn(AUTHORIZATION_HEADER, actual_headers)
         self.assertIn(X_AMZ_DATE_HEADER, actual_headers)
         self.assertIn(X_AMZ_SECURITY_TOKEN_HEADER, actual_headers)
+
+    @patch("requests.Session.request", return_value=requests.Response())
+    @patch("botocore.session.Session.get_credentials", return_value=mock_credentials)
+    @patch("botocore.auth.SigV4Auth.add_auth", side_effect=Exception("Signing failed"))
+    def test_aws_auth_session_signing_error(self, mock_add_auth, mock_get_credentials, mock_request):
+        """Tests that aws_auth_session does not any Sigv4 headers if signing errors."""
+
+        session = AwsAuthSession("us-east-1", "xray")
+        actual_headers = {"test": "test"}
+
+        session.request("POST", AWS_OTLP_TRACES_ENDPOINT, data="", headers=actual_headers)
+
+        self.assertNotIn(AUTHORIZATION_HEADER, actual_headers)
+        self.assertNotIn(X_AMZ_DATE_HEADER, actual_headers)
+        self.assertNotIn(X_AMZ_SECURITY_TOKEN_HEADER, actual_headers)

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/exporter/otlp/aws/common/test_aws_auth_session.py

@@ -9,7 +9,6 @@
 )
 from opentelemetry._logs.severity import SeverityNumber
 from opentelemetry.sdk._logs import LogData, LogRecord
-from opentelemetry.sdk._logs._internal import LogLimits
 from opentelemetry.sdk._logs.export import LogExportResult
 from opentelemetry.sdk.util.instrumentation import InstrumentationScope
 from opentelemetry.trace import TraceFlags

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/exporter/otlp/aws/logs/test_aws_batch_log_record_processor.py

@@ -159,6 +159,14 @@ def test_should_export_again_with_backoff_delay_if_retryable_and_bad_retry_after
         self.assertEqual(mock_request.call_count, 4)
         self.assertEqual(result, LogExportResult.SUCCESS)
 
+    @patch("requests.Session.post", side_effect=[requests.exceptions.ConnectionError(), good_response])
+    def test_export_connection_error_retry(self, mock_request):
+        """Tests that the exporter retries on ConnectionError."""
+        result = self.exporter.export(self.logs)
+
+        self.assertEqual(mock_request.call_count, 2)
+        self.assertEqual(result, LogExportResult.SUCCESS)
+
     def generate_test_log_data(self, count=5):
         logs = []
         for i in range(count):

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/exporter/otlp/aws/logs/test_otlp_aws_logs_exporter.py

@@ -8,7 +8,7 @@
 
 from botocore.exceptions import ClientError
 
-from amazon.opentelemetry.distro.exporter.aws.metrics.aws_cloudwatch_emf_exporter import AwsCloudWatchEmfExporter
+from amazon.opentelemetry.distro.exporter.otlp.aws.metrics.aws_cloudwatch_emf_exporter import AwsCloudWatchEmfExporter
 from opentelemetry.sdk.metrics.export import Gauge, MetricExportResult
 from opentelemetry.sdk.resources import Resource