Merge branch 'main' into hectorhdzg/logrecrename

Author: xrmx

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

@@ -39,6 +39,8 @@
 from time import time_ns
 from typing import Optional, cast, overload
 
+from typing_extensions import deprecated
+
 from opentelemetry._logs.severity import SeverityNumber
 from opentelemetry.context.context import Context
 from opentelemetry.environment_variables import _OTEL_PYTHON_LOGGER_PROVIDER
@@ -73,6 +75,9 @@ def __init__(
     ) -> None: ...
 
     @overload
+    @deprecated(
+        "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated since 1.35.0. Use `context` instead."
+    )
     def __init__(
         self,
         *,

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

@@ -232,6 +232,9 @@ def __init__(
     ): ...
 
     @overload
+    @deprecated(
+        "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated since 1.35.0. Use `context` instead."  # noqa: E501
+    )
     def __init__(
         self,
         timestamp: int | None = None,
@@ -265,8 +268,8 @@ def __init__(  # pylint:disable=too-many-locals
     ):
         if trace_id or span_id or trace_flags:
             warnings.warn(
-                "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated. Use `context` instead.",
-                LogRecordDeprecatedInitWarning,
+                "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated since 1.35.0. Use `context` instead.",
+                LogDeprecatedInitWarning,
                 stacklevel=2,
             )
 

opentelemetry-sdk/tests/logs/test_log_record.py

@@ -168,7 +168,7 @@ def test_log_record_deprecated_init_warning(self):
                     cw[-1].message, LogRecordDeprecatedInitWarning
                 )
                 self.assertIn(
-                    "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated. Use `context` instead.",
+                    "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated since 1.35.0. Use `context` instead.",
                     str(cw[-1].message),
                 )