Merge branch 'main' into fix_instrumentation_scope_encoding_to_otlp

Author: dbarker

CHANGELOG.md

@@ -9,10 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fix OTLP encoders missing instrumentation scope schema url and attributes
   ([#4359](https://github.com/open-telemetry/opentelemetry-python/pull/4359))  
+- Always setup logs sdk, OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED only controls python `logging` module handler setup
+  ([#4340](https://github.com/open-telemetry/opentelemetry-python/pull/4340))
 - Add `attributes` field in `metrics.get_meter` wrapper function
   ([#4364](https://github.com/open-telemetry/opentelemetry-python/pull/4364))
 - Add Python 3.13 support
   ([#4353](https://github.com/open-telemetry/opentelemetry-python/pull/4353))
+- sdk: don't log or print warnings when the SDK has been disabled
+  ([#4371](https://github.com/open-telemetry/opentelemetry-python/pull/4371))
 
 ## Version 1.29.0/0.50b0 (2024-12-11)
 

mypy.ini

@@ -17,4 +17,6 @@
   strict_equality = True
   strict_optional = True
   no_implicit_optional =  True
-  no_implicit_reexport = True
+  no_implicit_reexport = True
+  # https://mypy.readthedocs.io/en/stable/running_mypy.html#follow-imports
+  follow_imports = silent

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

@@ -236,6 +236,7 @@ def _init_metrics(
 def _init_logging(
     exporters: Dict[str, Type[LogExporter]],
     resource: Resource = None,
+    setup_logging_handler: bool = True,
 ):
     provider = LoggerProvider(resource=resource)
     set_logger_provider(provider)
@@ -246,13 +247,15 @@ def _init_logging(
             BatchLogRecordProcessor(exporter_class(**exporter_args))
         )
 
-    handler = LoggingHandler(level=logging.NOTSET, logger_provider=provider)
-
-    logging.getLogger().addHandler(handler)
-
     event_logger_provider = EventLoggerProvider(logger_provider=provider)
     set_event_logger_provider(event_logger_provider)
 
+    if setup_logging_handler:
+        handler = LoggingHandler(
+            level=logging.NOTSET, logger_provider=provider
+        )
+        logging.getLogger().addHandler(handler)
+
 
 def _import_exporters(
     trace_exporter_names: Sequence[str],
@@ -364,7 +367,7 @@ def _initialize_components(
     sampler: Optional[Sampler] = None,
     resource_attributes: Optional[Attributes] = None,
     id_generator: IdGenerator = None,
-    logging_enabled: Optional[bool] = None,
+    setup_logging_handler: Optional[bool] = None,
 ):
     if trace_exporter_names is None:
         trace_exporter_names = []
@@ -401,17 +404,16 @@ def _initialize_components(
         resource=resource,
     )
     _init_metrics(metric_exporters, resource)
-    if logging_enabled is None:
-        logging_enabled = (
+    if setup_logging_handler is None:
+        setup_logging_handler = (
             os.getenv(
                 _OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED, "false"
             )
             .strip()
             .lower()
             == "true"
         )
-    if logging_enabled:
-        _init_logging(log_exporters, resource)
+    _init_logging(log_exporters, resource, setup_logging_handler)
 
 
 class _BaseConfigurator(ABC):

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py

@@ -670,7 +670,6 @@ def get_logger(
         attributes: Optional[Attributes] = None,
     ) -> Logger:
         if self._disabled:
-            warnings.warn("SDK is disabled.")
             return NoOpLogger(
                 name,
                 version=version,

opentelemetry-sdk/src/opentelemetry/sdk/environment_variables/__init__.py

@@ -669,7 +669,7 @@
 .. envvar:: OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED
 
 The :envvar:`OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED` environment variable allows users to
-enable/disable the logging SDK auto instrumentation.
+enable/disable the auto instrumentation for the python logging module.
 Default: False
 
 Note: Logs SDK and its related settings are experimental.

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/__init__.py

@@ -537,7 +537,6 @@ def get_meter(
         attributes: Optional[Attributes] = None,
     ) -> Meter:
         if self._disabled:
-            _logger.warning("SDK is disabled.")
             return NoOpMeter(name, version=version, schema_url=schema_url)
 
         if self._shutdown:

opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py

@@ -1228,7 +1228,6 @@ def get_tracer(
         attributes: typing.Optional[types.Attributes] = None,
     ) -> "trace_api.Tracer":
         if self._disabled:
-            logger.warning("SDK is disabled.")
             return NoOpTracer()
         if not instrumenting_module_name:  # Reject empty strings too.
             instrumenting_module_name = ""

opentelemetry-sdk/src/opentelemetry/sdk/util/__init__.pyi

@@ -49,8 +49,8 @@ class BoundedList(Sequence[_T]):
     @overload
     def __getitem__(self, s: slice) -> Sequence[_T]: ...
     def __len__(self) -> int: ...
-    def append(self, item: _T): ...
-    def extend(self, seq: Sequence[_T]): ...
+    def append(self, item: _T) -> None: ...
+    def extend(self, seq: Sequence[_T]) -> None: ...
     @classmethod
     def from_seq(cls, maxlen: int, seq: Iterable[_T]) -> BoundedList[_T]: ...  # pylint: disable=undefined-variable
 

opentelemetry-sdk/tests/logs/test_handler.py

@@ -15,7 +15,6 @@
 import logging
 import os
 import unittest
-import warnings
 from unittest.mock import Mock, patch
 
 from opentelemetry._logs import NoOpLoggerProvider, SeverityNumber
@@ -290,11 +289,7 @@ def test_handler_root_logger_with_disabled_sdk_does_not_go_into_recursion_error(
         processor, logger = set_up_test_logging(
             logging.NOTSET, root_logger=True
         )
-        with warnings.catch_warnings(record=True) as cw:
-            logger.warning("hello")
-
-        self.assertEqual(len(cw), 1)
-        self.assertEqual("SDK is disabled.", str(cw[0].message))
+        logger.warning("hello")
 
         self.assertEqual(processor.emit_count(), 0)
 

opentelemetry-sdk/tests/logs/test_logs.py

@@ -15,7 +15,6 @@
 # pylint: disable=protected-access
 
 import unittest
-import warnings
 from unittest.mock import Mock, patch
 
 from opentelemetry.sdk._logs import LoggerProvider
@@ -70,12 +69,9 @@ def test_get_logger(self):
 
     @patch.dict("os.environ", {OTEL_SDK_DISABLED: "true"})
     def test_get_logger_with_sdk_disabled(self):
-        with warnings.catch_warnings(record=True) as cw:
-            logger = LoggerProvider().get_logger(Mock())
+        logger = LoggerProvider().get_logger(Mock())
 
         self.assertIsInstance(logger, NoOpLogger)
-        self.assertEqual(len(cw), 1)
-        self.assertEqual("SDK is disabled.", str(cw[0].message))
 
     @patch.object(Resource, "create")
     def test_logger_provider_init(self, resource_patch):