Add manual handling of auto instrumentation and code attributes logging

Author: xrmx

instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/__init__.py

@@ -228,16 +228,19 @@ def record_factory(*args, **kwargs):
                 "Disabling logging auto-instrumentation. If you have opentelemetry-instrumentation-logging "
                 "you don't need to set `OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED=true`"
             )
-        elif (
+        elif kwargs.get(
+            "enable_log_auto_istrumentation",
             environ.get(OTEL_PYTHON_LOG_AUTO_INSTRUMENTATION, "true")
             .strip()
             .lower()
-        ) == "true":
-            log_code_attributes = (
+            == "true",
+        ):
+            log_code_attributes = kwargs.get(
+                "log_code_attributes",
                 environ.get(OTEL_PYTHON_LOG_CODE_ATTRIBUTES, "false")
                 .strip()
                 .lower()
-                == "true"
+                == "true",
             )
             logger_provider = get_logger_provider()
             handler = _setup_logging_handler(

instrumentation/opentelemetry-instrumentation-logging/tests/test_logging.py

@@ -376,3 +376,35 @@ def test_handler_setup_is_called_with_code_attributes_from_env_var(self):
         setup_mock.assert_called_once_with(
             logger_provider=logger_provider, log_code_attributes=True
         )
+
+    def test_handler_setup_is_controlled_by_instrumentor_parameter(
+        self,
+    ):
+        LoggingInstrumentor().uninstrument()
+        with self.caplog.at_level(level=logging.WARNING):
+            LoggingInstrumentor().instrument(
+                enable_log_auto_istrumentation=False
+            )
+
+        self.assertEqual(len(self.caplog.records), 0)
+        root_logger = logging.getLogger()
+        logging_handler_instances = [
+            handler
+            for handler in root_logger.handlers
+            if isinstance(handler, LoggingHandler)
+        ]
+        self.assertEqual(logging_handler_instances, [])
+
+    def test_handler_code_attributes_is_controlled_by_instrumentor_parameter(
+        self,
+    ):
+        LoggingInstrumentor().uninstrument()
+        with mock.patch(
+            "opentelemetry.instrumentation.logging._setup_logging_handler"
+        ) as setup_mock:
+            LoggingInstrumentor().instrument(log_code_attributes=True)
+
+        logger_provider = get_logger_provider()
+        setup_mock.assert_called_once_with(
+            logger_provider=logger_provider, log_code_attributes=True
+        )