fix pylint

Author: wangzlei

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/aws_opentelemetry_configurator.py

@@ -619,27 +619,29 @@ def _is_application_signals_runtime_enabled():
 def _get_code_correlation_enabled_status() -> Optional[bool]:
     """
     Get the code correlation enabled status from environment variable.
-    
+
     Returns:
         True if OTEL_AWS_CODE_CORRELATION_ENABLED is set to 'true'
         False if OTEL_AWS_CODE_CORRELATION_ENABLED is set to 'false'
         None if OTEL_AWS_CODE_CORRELATION_ENABLED is not set (default state)
     """
     env_value = os.environ.get(CODE_CORRELATION_ENABLED_CONFIG)
-    
+
     if env_value is None:
         return None  # Default state - environment variable not set
-    
+
     env_value_lower = env_value.strip().lower()
     if env_value_lower == "true":
         return True
-    elif env_value_lower == "false":
+    if env_value_lower == "false":
         return False
-    else:
-        # Invalid value, treat as default and log warning
-        _logger.warning("Invalid value for %s: %s. Expected 'true' or 'false'. Using default.", 
-                       CODE_CORRELATION_ENABLED_CONFIG, env_value)
-        return None
+    # Invalid value, treat as default and log warning
+    _logger.warning(
+        "Invalid value for %s: %s. Expected 'true' or 'false'. Using default.",
+        CODE_CORRELATION_ENABLED_CONFIG,
+        env_value,
+    )
+    return None
 
 
 def _is_lambda_environment():

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/code_correlation/__init__.py

@@ -40,12 +40,12 @@ def _add_code_attributes_to_span(span, func: Callable[..., Any]) -> None:
 
     try:
         # Get function name
-        function_name = getattr(func, '__name__', str(func))
+        function_name = getattr(func, "__name__", str(func))
         span.set_attribute(CODE_FUNCTION_NAME, function_name)
 
         # Get function source file from code object
         try:
-            if hasattr(func, '__code__'):
+            if hasattr(func, "__code__"):
                 source_file = func.__code__.co_filename
                 span.set_attribute(CODE_FILE_PATH, source_file)
         except (AttributeError, TypeError):
@@ -55,14 +55,14 @@ def _add_code_attributes_to_span(span, func: Callable[..., Any]) -> None:
 
         # Get function line number from code object
         try:
-            if hasattr(func, '__code__'):
+            if hasattr(func, "__code__"):
                 line_number = func.__code__.co_firstlineno
                 span.set_attribute(CODE_LINE_NUMBER, line_number)
         except (AttributeError, TypeError):
             # Handle cases where code object is not available
             pass
 
-    except Exception:
+    except Exception:  # pylint: disable=broad-exception-caught
         # Silently handle any unexpected errors to avoid breaking
         # the instrumentation flow
         pass
@@ -99,8 +99,7 @@ async def my_async_function():
     """
     # Detect async functions: check function code object flags or special attributes
     # CO_ITERABLE_COROUTINE = 0x80, async functions will have this flag set
-    is_async = (hasattr(func, '__code__') and
-                func.__code__.co_flags & 0x80) or hasattr(func, '_is_coroutine')
+    is_async = (hasattr(func, "__code__") and func.__code__.co_flags & 0x80) or hasattr(func, "_is_coroutine")
 
     if is_async:
         # Async function wrapper
@@ -111,28 +110,28 @@ async def async_wrapper(*args, **kwargs):
                 current_span = trace.get_current_span()
                 if current_span:
                     _add_code_attributes_to_span(current_span, func)
-            except Exception:
+            except Exception:  # pylint: disable=broad-exception-caught
                 # Silently handle any unexpected errors
                 pass
 
             # Call and await the original async function
             return await func(*args, **kwargs)
 
         return async_wrapper
-    else:
-        # Sync function wrapper
-        @wraps(func)
-        def sync_wrapper(*args, **kwargs):
-            # Add code attributes to current span
-            try:
-                current_span = trace.get_current_span()
-                if current_span:
-                    _add_code_attributes_to_span(current_span, func)
-            except Exception:
-                # Silently handle any unexpected errors
-                pass
 
-            # Call the original sync function
-            return func(*args, **kwargs)
+    # Sync function wrapper
+    @wraps(func)
+    def sync_wrapper(*args, **kwargs):
+        # Add code attributes to current span
+        try:
+            current_span = trace.get_current_span()
+            if current_span:
+                _add_code_attributes_to_span(current_span, func)
+        except Exception:  # pylint: disable=broad-exception-caught
+            # Silently handle any unexpected errors
+            pass
+
+        # Call the original sync function
+        return func(*args, **kwargs)
 
-        return sync_wrapper
+    return sync_wrapper

aws-opentelemetry-distro/tests/amazon/opentelemetry/distro/code_correlation/test_code_correlation.py

@@ -3,11 +3,11 @@
 
 import asyncio
 from unittest import TestCase
-from unittest.mock import MagicMock, patch, PropertyMock
+from unittest.mock import MagicMock, PropertyMock, patch
 
 from amazon.opentelemetry.distro.code_correlation import (
-    CODE_FUNCTION_NAME,
     CODE_FILE_PATH,
+    CODE_FUNCTION_NAME,
     CODE_LINE_NUMBER,
     _add_code_attributes_to_span,
     add_code_attributes_to_span,
@@ -35,6 +35,7 @@ def setUp(self):
 
     def test_add_code_attributes_to_recording_span(self):
         """Test adding code attributes to a recording span."""
+
         def test_function():
             pass
 
@@ -68,7 +69,7 @@ def test_add_code_attributes_function_without_code(self):
         # Create a mock function without __code__ attribute
         mock_func = MagicMock()
         mock_func.__name__ = "mock_function"
-        delattr(mock_func, '__code__')
+        delattr(mock_func, "__code__")
 
         _add_code_attributes_to_span(self.mock_span, mock_func)
 
@@ -87,7 +88,7 @@ def test_add_code_attributes_function_without_name(self):
         """Test handling of functions without __name__ attribute."""
         # Create an object without __name__ attribute
         mock_func = MagicMock()
-        delattr(mock_func, '__name__')
+        delattr(mock_func, "__name__")
         mock_func.__code__ = MagicMock()
         mock_func.__code__.co_filename = "/test/file.py"
         mock_func.__code__.co_firstlineno = 10
@@ -115,7 +116,7 @@ def test_add_code_attributes_exception_handling(self):
         self.mock_span.set_attribute.assert_any_call(CODE_FUNCTION_NAME, "test_func")
         self.mock_span.set_attribute.assert_any_call(CODE_FILE_PATH, "/test/file.py")
 
-    @patch('amazon.opentelemetry.distro.code_correlation.getattr')
+    @patch("amazon.opentelemetry.distro.code_correlation.getattr")
     def test_add_code_attributes_getattr_exception(self, mock_getattr):
         """Test exception handling when getattr fails."""
         mock_getattr.side_effect = Exception("Test exception")
@@ -204,7 +205,7 @@ def setUp(self):
         self.mock_span = MagicMock(spec=Span)
         self.mock_span.is_recording.return_value = True
 
-    @patch('amazon.opentelemetry.distro.code_correlation.trace.get_current_span')
+    @patch("amazon.opentelemetry.distro.code_correlation.trace.get_current_span")
     def test_decorator_sync_function(self, mock_get_current_span):
         """Test decorator with synchronous function."""
         mock_get_current_span.return_value = self.mock_span
@@ -222,7 +223,7 @@ def test_sync_function(arg1, arg2=None):
         # Verify span attributes were set
         self.mock_span.set_attribute.assert_any_call(CODE_FUNCTION_NAME, "test_sync_function")
 
-    @patch('amazon.opentelemetry.distro.code_correlation.trace.get_current_span')
+    @patch("amazon.opentelemetry.distro.code_correlation.trace.get_current_span")
     def test_decorator_async_function(self, mock_get_current_span):
         """Test decorator with asynchronous function."""
         mock_get_current_span.return_value = self.mock_span
@@ -245,7 +246,7 @@ async def test_async_function(arg1, arg2=None):
         # Verify span attributes were set
         self.mock_span.set_attribute.assert_any_call(CODE_FUNCTION_NAME, "test_async_function")
 
-    @patch('amazon.opentelemetry.distro.code_correlation.trace.get_current_span')
+    @patch("amazon.opentelemetry.distro.code_correlation.trace.get_current_span")
     def test_decorator_no_current_span(self, mock_get_current_span):
         """Test decorator when there's no current span."""
         mock_get_current_span.return_value = None
@@ -263,7 +264,7 @@ def test_function():
         # Verify no span attributes were set
         self.mock_span.set_attribute.assert_not_called()
 
-    @patch('amazon.opentelemetry.distro.code_correlation.trace.get_current_span')
+    @patch("amazon.opentelemetry.distro.code_correlation.trace.get_current_span")
     def test_decorator_exception_handling(self, mock_get_current_span):
         """Test decorator handles exceptions gracefully."""
         mock_get_current_span.side_effect = Exception("Test exception")
@@ -280,6 +281,7 @@ def test_function():
 
     def test_decorator_preserves_function_metadata(self):
         """Test that decorator preserves original function metadata."""
+
         @add_code_attributes_to_span
         def test_function():
             """Test function docstring."""
@@ -291,6 +293,7 @@ def test_function():
 
     def test_async_function_detection(self):
         """Test that async functions are properly detected."""
+
         # Create a regular function
         def sync_func():
             pass
@@ -309,7 +312,7 @@ async def async_func():
         # Check that async function returns a coroutine function
         self.assertTrue(asyncio.iscoroutinefunction(decorated_async))
 
-    @patch('amazon.opentelemetry.distro.code_correlation.trace.get_current_span')
+    @patch("amazon.opentelemetry.distro.code_correlation.trace.get_current_span")
     def test_decorator_with_function_that_raises_exception(self, mock_get_current_span):
         """Test decorator with function that raises exception."""
         mock_get_current_span.return_value = self.mock_span
@@ -325,7 +328,7 @@ def test_function():
         # Verify span attributes were still set before exception
         self.mock_span.set_attribute.assert_any_call(CODE_FUNCTION_NAME, "test_function")
 
-    @patch('amazon.opentelemetry.distro.code_correlation.trace.get_current_span')
+    @patch("amazon.opentelemetry.distro.code_correlation.trace.get_current_span")
     def test_decorator_with_async_function_that_raises_exception(self, mock_get_current_span):
         """Test decorator with async function that raises exception."""
         mock_get_current_span.return_value = self.mock_span
@@ -346,8 +349,8 @@ async def test_async_function():
         # Verify span attributes were still set before exception
         self.mock_span.set_attribute.assert_any_call(CODE_FUNCTION_NAME, "test_async_function")
 
-    @patch('amazon.opentelemetry.distro.code_correlation._add_code_attributes_to_span')
-    @patch('amazon.opentelemetry.distro.code_correlation.trace.get_current_span')
+    @patch("amazon.opentelemetry.distro.code_correlation._add_code_attributes_to_span")
+    @patch("amazon.opentelemetry.distro.code_correlation.trace.get_current_span")
     def test_decorator_internal_exception_handling_sync(self, mock_get_current_span, mock_add_attributes):
         """Test that decorator handles internal exceptions gracefully in sync function."""
         mock_get_current_span.return_value = self.mock_span
@@ -364,8 +367,8 @@ def test_function():
         # Verify the function still works correctly despite internal exception
         self.assertEqual(result, "test result")
 
-    @patch('amazon.opentelemetry.distro.code_correlation._add_code_attributes_to_span')
-    @patch('amazon.opentelemetry.distro.code_correlation.trace.get_current_span')
+    @patch("amazon.opentelemetry.distro.code_correlation._add_code_attributes_to_span")
+    @patch("amazon.opentelemetry.distro.code_correlation.trace.get_current_span")
     def test_decorator_internal_exception_handling_async(self, mock_get_current_span, mock_add_attributes):
         """Test that decorator handles internal exceptions gracefully in async function."""
         mock_get_current_span.return_value = self.mock_span

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

@@ -17,6 +17,7 @@
 from amazon.opentelemetry.distro.aws_lambda_span_processor import AwsLambdaSpanProcessor
 from amazon.opentelemetry.distro.aws_metric_attributes_span_exporter import AwsMetricAttributesSpanExporter
 from amazon.opentelemetry.distro.aws_opentelemetry_configurator import (
+    CODE_CORRELATION_ENABLED_CONFIG,
     LAMBDA_SPAN_EXPORT_BATCH_SIZE,
     OTEL_EXPORTER_OTLP_LOGS_ENDPOINT,
     OTEL_EXPORTER_OTLP_LOGS_HEADERS,
@@ -1428,9 +1429,6 @@ def test_create_emf_exporter_cloudwatch_exporter_import_error(
 
     def test_get_code_correlation_enabled_status(self):
         """Test _get_code_correlation_enabled_status function with various environment variable values"""
-        # Import the constant we need
-        from amazon.opentelemetry.distro.aws_opentelemetry_configurator import CODE_CORRELATION_ENABLED_CONFIG
-        
         # Test when environment variable is not set (default state)
         os.environ.pop(CODE_CORRELATION_ENABLED_CONFIG, None)
         result = _get_code_correlation_enabled_status()
@@ -1472,9 +1470,6 @@ def test_get_code_correlation_enabled_status(self):
         self.assertFalse(result)
 
         # Test invalid values (should return None and log warning)
-        # We'll use caplog to capture log messages instead of mocking
-        import logging
-        
         os.environ[CODE_CORRELATION_ENABLED_CONFIG] = "invalid"
         result = _get_code_correlation_enabled_status()
         self.assertIsNone(result)