Merge branch 'main' of https://github.com/aws-observability/aws-otel-python-instrumentation

Author: liustve

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

@@ -15,12 +15,12 @@
 from typing import Any, Dict, List, Optional
 
 # Environment variable constants
-_ENV_CONFIG = "OTEL_AWS_CODE_CORRELATION_CONFIG"
+_ENV_CONFIG = "OTEL_AWS_CODE_ATTRIBUTES_CONFIG"
 
 _logger = logging.getLogger(__name__)
 
 
-class AwsCodeCorrelationConfig:
+class AwsCodeAttributesConfig:
     """
     Configuration manager for AWS OpenTelemetry code correlation features.
 
@@ -29,10 +29,10 @@ class AwsCodeCorrelationConfig:
     and stack trace depth configuration.
 
     Environment Variables:
-        OTEL_AWS_CODE_CORRELATION_CONFIG: JSON configuration with detailed settings
+        OTEL_AWS_CODE_ATTRIBUTES_CONFIG: JSON configuration with detailed settings
 
     Example Configuration:
-        export OTEL_AWS_CODE_CORRELATION_CONFIG='{
+        export OTEL_AWS_CODE_ATTRIBUTES_CONFIG='{
             "include": ["myapp", "mylib"],
             "exclude": ["third-party", "vendor"],
             "stack_depth": 5
@@ -55,12 +55,12 @@ def __init__(
         self.stack_depth = stack_depth
 
     @classmethod
-    def from_env(cls) -> "AwsCodeCorrelationConfig":
+    def from_env(cls) -> "AwsCodeAttributesConfig":
         """
         Create configuration instance from environment variables.
 
         Returns:
-            AwsCodeCorrelationConfig: Configured instance
+            AwsCodeAttributesConfig: Configured instance
         """
         config_data = cls._parse_config_data()
         include_value = cls._validate_string_list(config_data, "include")
@@ -168,7 +168,7 @@ def to_json(self, indent: Optional[int] = 2) -> str:
     def __repr__(self) -> str:
         """Return string representation of the configuration."""
         return (
-            f"AwsCodeCorrelationConfig("
+            f"AwsCodeAttributesConfig("
             f"include={self.include}, "
             f"exclude={self.exclude}, "
             f"stack_depth={self.stack_depth})"

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/code_correlation/internal/packages_resolver.py

@@ -20,13 +20,13 @@
 from pathlib import Path
 from typing import Any, Callable, Dict, List, NamedTuple, Optional, Set, Union
 
-from ..config import AwsCodeCorrelationConfig
+from ..config import AwsCodeAttributesConfig
 
 # Module-level constants
 _logger = logging.getLogger(__name__)
 
 # Configuration
-_code_attributes_config = AwsCodeCorrelationConfig.from_env()
+_code_attributes_config = AwsCodeAttributesConfig.from_env()
 
 # Global caching variables
 _sys_path_hash: Optional[int] = None

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_aio_pika_patches.py

@@ -9,7 +9,6 @@
 import functools
 import logging
 
-from amazon.opentelemetry.distro.aws_opentelemetry_configurator import get_code_correlation_enabled_status
 from amazon.opentelemetry.distro.code_correlation.utils import record_code_attributes
 
 logger = logging.getLogger(__name__)
@@ -32,9 +31,6 @@ def patched_decorate(self, callback):
 def _apply_aio_pika_instrumentation_patches():
     """Apply aio-pika patches if code correlation is enabled."""
     try:
-        if get_code_correlation_enabled_status() is not True:
-            return
-
         # Import CallbackDecorator inside function to allow proper testing
         try:
             # pylint: disable=import-outside-toplevel

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_celery_patches.py

@@ -12,7 +12,6 @@
 import logging
 from typing import Any, Callable, Optional
 
-from amazon.opentelemetry.distro.aws_opentelemetry_configurator import get_code_correlation_enabled_status
 from amazon.opentelemetry.distro.code_correlation.utils import add_code_attributes_to_span
 
 logger = logging.getLogger(__name__)
@@ -125,9 +124,6 @@ def _apply_celery_instrumentation_patches():
     Apply code correlation patches to the Celery instrumentation.
     """
     try:
-        if get_code_correlation_enabled_status() is not True:
-            return
-
         if CeleryInstrumentor is None:
             logger.warning("Failed to apply Celery patches: CeleryInstrumentor not available")
             return

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_django_patches.py

@@ -4,8 +4,6 @@
 
 from logging import getLogger
 
-from amazon.opentelemetry.distro.aws_opentelemetry_configurator import get_code_correlation_enabled_status
-
 _logger = getLogger(__name__)
 
 
@@ -17,8 +15,7 @@ def _apply_django_instrumentation_patches() -> None:
     to spans by modifying the process_view method of the Django middleware.
     Also patches Django's path/re_path functions for URL pattern instrumentation.
     """
-    if get_code_correlation_enabled_status() is True:
-        _apply_django_code_attributes_patch()
+    _apply_django_code_attributes_patch()
 
 
 def _apply_django_code_attributes_patch() -> None:  # pylint: disable=too-many-statements

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_fastapi_patches.py

@@ -4,8 +4,6 @@
 
 from logging import getLogger
 
-from amazon.opentelemetry.distro.aws_opentelemetry_configurator import get_code_correlation_enabled_status
-
 _logger = getLogger(__name__)
 
 
@@ -16,8 +14,7 @@ def _apply_fastapi_instrumentation_patches() -> None:
     This patches the FastAPI instrumentation to automatically add code attributes
     to spans by decorating view functions with record_code_attributes.
     """
-    if get_code_correlation_enabled_status() is True:
-        _apply_fastapi_code_attributes_patch()
+    _apply_fastapi_code_attributes_patch()
 
 
 def _apply_fastapi_code_attributes_patch() -> None:

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_flask_patches.py

@@ -4,8 +4,6 @@
 
 from logging import getLogger
 
-from amazon.opentelemetry.distro.aws_opentelemetry_configurator import get_code_correlation_enabled_status
-
 _logger = getLogger(__name__)
 
 
@@ -16,8 +14,7 @@ def _apply_flask_instrumentation_patches() -> None:
     This patches the Flask instrumentation to automatically add code attributes
     to spans by decorating view functions with record_code_attributes.
     """
-    if get_code_correlation_enabled_status() is True:
-        _apply_flask_code_attributes_patch()
+    _apply_flask_code_attributes_patch()
 
 
 def _apply_flask_code_attributes_patch() -> None:  # pylint: disable=too-many-statements

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_pika_patches.py

@@ -9,7 +9,6 @@
 import functools
 import logging
 
-from amazon.opentelemetry.distro.aws_opentelemetry_configurator import get_code_correlation_enabled_status
 from amazon.opentelemetry.distro.code_correlation.utils import add_code_attributes_to_span
 
 logger = logging.getLogger(__name__)
@@ -43,9 +42,6 @@ def enhanced_consume_hook(span, body, properties):
 def _apply_pika_instrumentation_patches():
     """Apply pika patches if code correlation is enabled."""
     try:
-        if get_code_correlation_enabled_status() is not True:
-            return
-
         # Import pika_utils inside function to allow proper testing
         try:
             # pylint: disable=import-outside-toplevel

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/patches/_starlette_patches.py

@@ -5,7 +5,6 @@
 from typing import Collection
 
 from amazon.opentelemetry.distro._utils import is_agent_observability_enabled
-from amazon.opentelemetry.distro.aws_opentelemetry_configurator import get_code_correlation_enabled_status
 
 _logger: Logger = getLogger(__name__)
 
@@ -16,8 +15,7 @@ def _apply_starlette_instrumentation_patches() -> None:
     This applies both version compatibility patches and code attributes support.
     """
     _apply_starlette_version_patches()
-    if get_code_correlation_enabled_status() is True:
-        _apply_starlette_code_attributes_patch()
+    _apply_starlette_code_attributes_patch()
 
 
 # Upstream fix available in OpenTelemetry 1.34.0/0.55b0 (2025-06-04)