Merge remote-tracking branch 'origin/main'

a-recknagel · a-recknagel · commit eaf328d82e35 · 2024-07-04T10:56:40.000+02:00
# Conflicts:
#	CHANGELOG.md
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py
@@ -460,7 +460,8 @@ def __init__(
             __name__, logger_provider=self._logger_provider
         )
 
-    def _get_attributes(self, record: logging.LogRecord) -> Attributes:
+    @staticmethod
+    def _get_attributes(record: logging.LogRecord) -> Attributes:
         attributes = {
             k: v
             for k, v in vars(record).items()

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,8 @@ def __init__(`
`460`	`460`	`__name__, logger_provider=self._logger_provider`
`461`	`461`	`)`
`462`	`462`
`463`		`- def _get_attributes(self, record: logging.LogRecord) -> Attributes:`
	`463`	`+ @staticmethod`
	`464`	`+ def _get_attributes(record: logging.LogRecord) -> Attributes:`
`464`	`465`	`attributes = {`
`465`	`466`	`k: v`
`466`	`467`	`for k, v in vars(record).items()`