refactor: use single logs exporter and logs provider instance

Author: yiyuan-he

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

@@ -28,7 +28,7 @@
 from amazon.opentelemetry.distro.sampler.aws_xray_remote_sampler import AwsXRayRemoteSampler
 from amazon.opentelemetry.distro.scope_based_exporter import ScopeBasedPeriodicExportingMetricReader
 from amazon.opentelemetry.distro.scope_based_filtering_view import ScopeBasedRetainingView
-from opentelemetry._logs import set_logger_provider
+from opentelemetry._logs import set_logger_provider, get_logger_provider
 from opentelemetry.exporter.otlp.proto.http._log_exporter import OTLPLogExporter
 from opentelemetry.exporter.otlp.proto.http.metric_exporter import OTLPMetricExporter as OTLPHttpOTLPMetricExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
@@ -163,16 +163,17 @@ def _initialize_components():
     sampler_name = _get_sampler()
     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)
+
     _init_tracing(
         exporters=trace_exporters,
         id_generator=id_generator,
         sampler=sampler,
         resource=resource,
     )
     _init_metrics(metric_exporters, resource)
-    logging_enabled = os.getenv(_OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED, "false")
-    if logging_enabled.strip().lower() == "true":
-        _init_logging(log_exporters, resource)
 
 
 def _init_logging(
@@ -367,7 +368,7 @@ def _customize_span_exporter(span_exporter: SpanExporter, resource: Resource) ->
                 logs_exporter = OTLPAwsLogExporter(endpoint=logs_endpoint)
                 span_exporter = OTLPAwsSpanExporter(
                     endpoint=traces_endpoint,
-                    logs_exporter=logs_exporter
+                    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

@@ -5,8 +5,8 @@
 
 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.exporter.otlp.aws.logs.otlp_aws_logs_exporter import OTLPAwsLogExporter
 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.trace import ReadableSpan
@@ -25,12 +25,12 @@ def __init__(
         headers: Optional[Dict[str, str]] = None,
         timeout: Optional[int] = None,
         compression: Optional[Compression] = None,
-        logs_exporter: Optional[OTLPAwsLogExporter] = None
+        logger_provider: Optional[LoggerProvider] = None
     ):
         self._aws_region = None
 
-        if logs_exporter:
-            self._llo_handler = LLOHandler(logs_exporter)
+        if logger_provider:
+            self._llo_handler = LLOHandler(logger_provider)
 
         if endpoint:
             self._aws_region = endpoint.split(".")[1]

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

@@ -20,12 +20,8 @@ class LLOHandler:
     This class identifies LLO attributes, emits them as log records, and filters
     them out from telemetry data.
     """
-    def __init__(self, logs_exporter: OTLPAwsLogExporter):
-        self._logs_exporter = logs_exporter
-        self._logger_provider = LoggerProvider()
-        self._logger_provider.add_log_record_processor(
-            BatchLogRecordProcessor(self._logs_exporter)
-        )
+    def __init__(self, logger_provider: LoggerProvider):
+        self._logger_provider = logger_provider
 
         self._event_logger_provider = EventLoggerProvider(logger_provider=self._logger_provider)
         self._event_logger = self._event_logger_provider.get_event_logger("gen_ai.events")