Merge branch 'main' into main

Author: a-recknagel

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

@@ -90,11 +90,13 @@ def __init__(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
+        attributes: Optional[Attributes] = None,
     ) -> None:
         super().__init__()
         self._name = name
         self._version = version
         self._schema_url = schema_url
+        self._attributes = attributes
 
     @abstractmethod
     def emit(self, record: "LogRecord") -> None:
@@ -117,10 +119,12 @@ def __init__(  # pylint: disable=super-init-not-called
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
+        attributes: Optional[Attributes] = None,
     ):
         self._name = name
         self._version = version
         self._schema_url = schema_url
+        self._attributes = attributes
         self._real_logger: Optional[Logger] = None
         self._noop_logger = NoOpLogger(name)
 
@@ -134,6 +138,7 @@ def _logger(self) -> Logger:
                 self._name,
                 self._version,
                 self._schema_url,
+                self._attributes,
             )
             return self._real_logger
         return self._noop_logger
@@ -153,6 +158,7 @@ def get_logger(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
+        attributes: Optional[Attributes] = None,
     ) -> Logger:
         """Returns a `Logger` for use by the given instrumentation library.
 
@@ -190,9 +196,12 @@ def get_logger(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
+        attributes: Optional[Attributes] = None,
     ) -> Logger:
         """Returns a NoOpLogger."""
-        return NoOpLogger(name, version=version, schema_url=schema_url)
+        return NoOpLogger(
+            name, version=version, schema_url=schema_url, attributes=attributes
+        )
 
 
 class ProxyLoggerProvider(LoggerProvider):
@@ -201,17 +210,20 @@ def get_logger(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
+        attributes: Optional[Attributes] = None,
     ) -> Logger:
         if _LOGGER_PROVIDER:
             return _LOGGER_PROVIDER.get_logger(
                 name,
                 version=version,
                 schema_url=schema_url,
+                attributes=attributes,
             )
         return ProxyLogger(
             name,
             version=version,
             schema_url=schema_url,
+            attributes=attributes,
         )
 
 
@@ -261,6 +273,7 @@ def get_logger(
     instrumenting_library_version: str = "",
     logger_provider: Optional[LoggerProvider] = None,
     schema_url: Optional[str] = None,
+    attributes: Optional[Attributes] = None,
 ) -> "Logger":
     """Returns a `Logger` for use within a python process.
 
@@ -272,5 +285,8 @@ def get_logger(
     if logger_provider is None:
         logger_provider = get_logger_provider()
     return logger_provider.get_logger(
-        instrumenting_module_name, instrumenting_library_version, schema_url
+        instrumenting_module_name,
+        instrumenting_library_version,
+        schema_url,
+        attributes,
     )

opentelemetry-api/tests/logs/test_proxy.py

@@ -19,6 +19,7 @@
 import opentelemetry._logs._internal as _logs_internal
 from opentelemetry import _logs
 from opentelemetry.test.globals_test import LoggingGlobalsTest
+from opentelemetry.util.types import Attributes
 
 
 class TestProvider(_logs.NoOpLoggerProvider):
@@ -27,6 +28,7 @@ def get_logger(
         name: str,
         version: typing.Optional[str] = None,
         schema_url: typing.Optional[str] = None,
+        attributes: typing.Optional[Attributes] = None,
     ) -> _logs.Logger:
         return LoggerTest(name)
 

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

@@ -560,6 +560,7 @@ def __init__(
             instrumentation_scope.name,
             instrumentation_scope.version,
             instrumentation_scope.schema_url,
+            instrumentation_scope.attributes,
         )
         self._resource = resource
         self._multi_log_record_processor = multi_log_record_processor
@@ -609,17 +610,24 @@ def get_logger(
         name: str,
         version: Optional[str] = None,
         schema_url: Optional[str] = None,
+        attributes: Optional[Attributes] = None,
     ) -> Logger:
         if self._disabled:
             _logger.warning("SDK is disabled.")
-            return NoOpLogger(name, version=version, schema_url=schema_url)
+            return NoOpLogger(
+                name,
+                version=version,
+                schema_url=schema_url,
+                attributes=attributes,
+            )
         return Logger(
             self._resource,
             self._multi_log_record_processor,
             InstrumentationScope(
                 name,
                 version,
                 schema_url,
+                attributes,
             ),
         )
 

opentelemetry-sdk/tests/logs/test_logs.py

@@ -55,13 +55,17 @@ def test_get_logger(self):
             "name",
             version="version",
             schema_url="schema_url",
+            attributes={"key": "value"},
         )
 
         self.assertEqual(logger._instrumentation_scope.name, "name")
         self.assertEqual(logger._instrumentation_scope.version, "version")
         self.assertEqual(
             logger._instrumentation_scope.schema_url, "schema_url"
         )
+        self.assertEqual(
+            logger._instrumentation_scope.attributes, {"key": "value"}
+        )
 
     @patch.dict("os.environ", {OTEL_SDK_DISABLED: "true"})
     def test_get_logger_with_sdk_disabled(self):