Merge branch 'genai_logs' into sigv4_genai_logs

Author: liustve

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

@@ -11,7 +11,6 @@
 
 AGENT_OBSERVABILITY_ENABLED = "AGENT_OBSERVABILITY_ENABLED"
 
-
 def is_installed(req: str) -> bool:
     """Is the given required package installed?"""
 
@@ -25,6 +24,5 @@ def is_installed(req: str) -> bool:
         return False
     return True
 
-
 def is_agent_observability_enabled() -> bool:
     return os.environ.get(AGENT_OBSERVABILITY_ENABLED, "false").lower() == "true"

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

@@ -10,6 +10,7 @@
 from typing_extensions import override
 
 from amazon.opentelemetry.distro._aws_attribute_keys import AWS_LOCAL_SERVICE
+from amazon.opentelemetry.distro._utils import is_agent_observability_enabled
 from amazon.opentelemetry.distro._aws_resource_attribute_configurator import get_service_attribute
 from amazon.opentelemetry.distro._utils import is_agent_observability_enabled
 from amazon.opentelemetry.distro.always_record_sampler import AlwaysRecordSampler
@@ -166,7 +167,6 @@ def _initialize_components():
     sampler = _custom_import_sampler(sampler_name, resource)
 
     logging_enabled = os.getenv(_OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED, "false")
-
     if logging_enabled.strip().lower() == "true":
         _init_logging(log_exporters, resource)
 
@@ -371,8 +371,10 @@ def _customize_span_exporter(span_exporter: SpanExporter, resource: Resource) ->
 
         if isinstance(span_exporter, OTLPSpanExporter):
             if is_agent_observability_enabled():
-
-                span_exporter = OTLPAwsSpanExporter(endpoint=traces_endpoint, logs_provider=get_logger_provider())
+                span_exporter = OTLPAwsSpanExporter(
+                    endpoint=traces_endpoint,
+                    logger_provider=get_logger_provider()
+                )
             else:
                 span_exporter = OTLPAwsSpanExporter(endpoint=traces_endpoint)
 

aws-opentelemetry-distro/src/amazon/opentelemetry/distro/exporter/otlp/aws/traces/otlp_aws_span_exporter.py

@@ -6,9 +6,10 @@
 from amazon.opentelemetry.distro._utils import is_agent_observability_enabled
 from amazon.opentelemetry.distro.exporter.otlp.aws.common.aws_auth_session import AwsAuthSession
 from amazon.opentelemetry.distro.llo_handler import LLOHandler
+from amazon.opentelemetry.distro._utils import is_agent_observability_enabled
+from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.exporter.otlp.proto.http import Compression
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
-from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk.trace import ReadableSpan
 from opentelemetry.sdk.trace.export import SpanExportResult
 
@@ -25,12 +26,12 @@ def __init__(
         headers: Optional[Dict[str, str]] = None,
         timeout: Optional[int] = None,
         compression: Optional[Compression] = None,
-        logs_provider: Optional[LoggerProvider] = None,
+        logger_provider: Optional[LoggerProvider] = None
     ):
         self._aws_region = None
 
-        if logs_provider:
-            self._llo_handler = LLOHandler(logs_provider)
+        if logger_provider:
+            self._llo_handler = LLOHandler(logger_provider)
 
         if endpoint:
             self._aws_region = endpoint.split(".")[1]