fix pylint

Author: wangzlei

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/exporter/aws/metrics/test_base_emf_exporter.py

@@ -20,11 +20,11 @@ def _export(self, log_event):
         """Implementation that stores exported logs for testing."""
         self.exported_logs.append(log_event)
 
-    def force_flush(self, timeout_millis=None):
+    def force_flush(self, timeout_millis=None):  # pylint: disable=no-self-use
         """Force flush implementation for testing."""
         return True
 
-    def shutdown(self, timeout_millis=None):
+    def shutdown(self, timeout_millis=None):  # pylint: disable=no-self-use
         """Shutdown implementation for testing."""
         return True
 

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/exporter/aws/metrics/test_console_emf_exporter.py

@@ -7,7 +7,7 @@
 
 from amazon.opentelemetry.distro.exporter.aws.metrics.console_emf_exporter import ConsoleEmfExporter
 from opentelemetry.sdk.metrics import Counter
-from opentelemetry.sdk.metrics.export import AggregationTemporality, MetricsData
+from opentelemetry.sdk.metrics.export import AggregationTemporality, MetricsData, MetricExportResult
 
 
 class TestConsoleEmfExporter(unittest.TestCase):
@@ -212,8 +212,6 @@ def test_integration_with_metrics_data(self):
             result = self.exporter.export(mock_metrics_data)
 
         # Should succeed even with no actual metrics
-        from opentelemetry.sdk.metrics.export import MetricExportResult
-
         self.assertEqual(result, MetricExportResult.SUCCESS)
 
     def test_integration_export_success(self):
@@ -222,8 +220,6 @@ def test_integration_export_success(self):
         mock_metrics_data = MagicMock(spec=MetricsData)
         mock_metrics_data.resource_metrics = []
 
-        from opentelemetry.sdk.metrics.export import MetricExportResult
-
         result = self.exporter.export(mock_metrics_data)
         self.assertEqual(result, MetricExportResult.SUCCESS)
 
@@ -232,8 +228,6 @@ def test_integration_export_with_timeout(self):
         mock_metrics_data = MagicMock(spec=MetricsData)
         mock_metrics_data.resource_metrics = []
 
-        from opentelemetry.sdk.metrics.export import MetricExportResult
-
         result = self.exporter.export(mock_metrics_data, timeout_millis=5000)
         self.assertEqual(result, MetricExportResult.SUCCESS)
 
@@ -250,8 +244,6 @@ def test_export_failure_handling(self):
 
         # Patch the logger in the base_emf_exporter since that's where the error logging happens
         with patch("amazon.opentelemetry.distro.exporter.aws.metrics.base_emf_exporter.logger") as mock_logger:
-            from opentelemetry.sdk.metrics.export import MetricExportResult
-
             result = self.exporter.export(mock_metrics_data)
 
             self.assertEqual(result, MetricExportResult.FAILURE)

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/test_aws_opentelementry_configurator.py

@@ -969,7 +969,6 @@ def test_check_emf_exporter_enabled(self):
         os.environ.pop("OTEL_METRICS_EXPORTER", None)
 
     def test_fetch_logs_header(self):
-        # Clear cache before starting tests
         _clear_logs_header_cache()
 
         # Test when headers are not set
@@ -985,7 +984,6 @@ def test_fetch_logs_header(self):
         result2 = _fetch_logs_header()
         self.assertIs(result, result2)  # Same object reference
 
-        # Clear cache and test with valid headers
         _clear_logs_header_cache()
         os.environ[OTEL_EXPORTER_OTLP_LOGS_HEADERS] = "x-aws-log-group=test-group,x-aws-log-stream=test-stream"
         result = _fetch_logs_header()
@@ -998,7 +996,6 @@ def test_fetch_logs_header(self):
         result2 = _fetch_logs_header()
         self.assertIs(result, result2)
 
-        # Clear cache and test with valid headers including namespace
         _clear_logs_header_cache()
         os.environ[OTEL_EXPORTER_OTLP_LOGS_HEADERS] = (
             "x-aws-log-group=test-group,x-aws-log-stream=test-stream,x-aws-metric-namespace=test-namespace"
@@ -1009,31 +1006,27 @@ def test_fetch_logs_header(self):
         self.assertEqual(result.namespace, "test-namespace")
         self.assertTrue(result.is_valid())
 
-        # Clear cache and test with missing log group
         _clear_logs_header_cache()
         os.environ[OTEL_EXPORTER_OTLP_LOGS_HEADERS] = "x-aws-log-stream=test-stream"
         result = _fetch_logs_header()
         self.assertIsNone(result.log_group)
         self.assertEqual(result.log_stream, "test-stream")
         self.assertFalse(result.is_valid())
 
-        # Clear cache and test with missing log stream
         _clear_logs_header_cache()
         os.environ[OTEL_EXPORTER_OTLP_LOGS_HEADERS] = "x-aws-log-group=test-group"
         result = _fetch_logs_header()
         self.assertEqual(result.log_group, "test-group")
         self.assertIsNone(result.log_stream)
         self.assertFalse(result.is_valid())
 
-        # Clear cache and test with empty value in log group
         _clear_logs_header_cache()
         os.environ[OTEL_EXPORTER_OTLP_LOGS_HEADERS] = "x-aws-log-group=,x-aws-log-stream=test-stream"
         result = _fetch_logs_header()
         self.assertIsNone(result.log_group)
         self.assertEqual(result.log_stream, "test-stream")
         self.assertFalse(result.is_valid())
 
-        # Clear cache and test with empty value in log stream
         _clear_logs_header_cache()
         os.environ[OTEL_EXPORTER_OTLP_LOGS_HEADERS] = "x-aws-log-group=test-group,x-aws-log-stream="
         result = _fetch_logs_header()