Update

Author: hectorhdzg

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder/__init__.py

@@ -30,7 +30,7 @@
     ResourceLogs,
     ScopeLogs,
 )
-from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
+from opentelemetry.sdk._logs import SDKLogRecord
 
 
 def encode_logs(batch: Sequence[SDKLogRecord]) -> ExportLogsServiceRequest:

exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py

@@ -45,8 +45,7 @@
 from opentelemetry.proto.resource.v1.resource_pb2 import (
     Resource as PB2Resource,
 )
-from opentelemetry.sdk._logs import LogLimits
-from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
+from opentelemetry.sdk._logs import LogLimits, SDKLogRecord
 from opentelemetry.sdk.resources import Resource as SDKResource
 from opentelemetry.sdk.util.instrumentation import InstrumentationScope
 from opentelemetry.trace import (

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/_log_exporter/__init__.py

@@ -28,7 +28,7 @@
 from opentelemetry.proto.collector.logs.v1.logs_service_pb2_grpc import (
     LogsServiceStub,
 )
-from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
+from opentelemetry.sdk._logs import SDKLogRecord
 from opentelemetry.sdk._logs.export import LogExporter, LogExportResult
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE,

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/logs/test_otlp_logs_exporter.py

@@ -39,7 +39,7 @@
 from opentelemetry.proto.resource.v1.resource_pb2 import (
     Resource as OTLPResource,
 )
-from opentelemetry.sdk._logs import LogRecord
+from opentelemetry.sdk._logs import SDKLogRecord
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_OTLP_LOGS_CERTIFICATE,
     OTEL_EXPORTER_OTLP_LOGS_CLIENT_CERTIFICATE,
@@ -74,7 +74,7 @@ def setUp(self):
                 )
             )
         )
-        self.log_data_1 = LogRecord(
+        self.log_data_1 = SDKLogRecord(
             timestamp=int(time.time() * 1e9),
             context=ctx_log_data_1,
             severity_text="WARNING",
@@ -96,7 +96,7 @@ def setUp(self):
                 )
             )
         )
-        self.log_data_2 = LogRecord(
+        self.log_data_2 = SDKLogRecord(
             timestamp=int(time.time() * 1e9),
             context=ctx_log_data_2,
             severity_text="INFO",
@@ -118,7 +118,7 @@ def setUp(self):
                 )
             )
         )
-        self.log_data_3 = LogRecord(
+        self.log_data_3 = SDKLogRecord(
             timestamp=int(time.time() * 1e9),
             context=ctx_log_data_3,
             severity_text="ERROR",
@@ -134,7 +134,7 @@ def setUp(self):
                 SpanContext(0, 5213367945872657629, False, TraceFlags(0x01))
             )
         )
-        self.log_data_4 = LogRecord(
+        self.log_data_4 = SDKLogRecord(
             timestamp=int(time.time() * 1e9),
             context=ctx_log_data_4,
             severity_text="ERROR",
@@ -155,7 +155,7 @@ def setUp(self):
                 )
             )
         )
-        self.log_data_5 = LogRecord(
+        self.log_data_5 = SDKLogRecord(
             timestamp=int(time.time() * 1e9),
             context=ctx_log_data_5,
             severity_text="ERROR",

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_log_exporter/__init__.py

@@ -32,7 +32,7 @@
 from opentelemetry.exporter.otlp.proto.http._common import (
     _is_retryable,
 )
-from opentelemetry.sdk._logs import LogRecord
+from opentelemetry.sdk._logs import SDKLogRecord
 from opentelemetry.sdk._logs.export import (
     LogExporter,
     LogExportResult,
@@ -156,7 +156,7 @@ def _export(self, serialized_data: bytes, timeout_sec: float):
             )
         return resp
 
-    def export(self, batch: Sequence[LogRecord]) -> LogExportResult:
+    def export(self, batch: Sequence[SDKLogRecord]) -> LogExportResult:
         if self._shutdown:
             _logger.warning("Exporter already shutdown, ignoring batch")
             return LogExportResult.FAILURE

exporter/opentelemetry-exporter-otlp-proto-http/tests/test_proto_log_exporter.py

@@ -38,7 +38,7 @@
 from opentelemetry.proto.collector.logs.v1.logs_service_pb2 import (
     ExportLogsServiceRequest,
 )
-from opentelemetry.sdk._logs import LogRecord as SDKLogRecord
+from opentelemetry.sdk._logs import SDKLogRecord
 from opentelemetry.sdk._logs.export import LogExportResult
 from opentelemetry.sdk.environment_variables import (
     OTEL_EXPORTER_OTLP_CERTIFICATE,

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

@@ -15,12 +15,11 @@
 from time import time_ns
 from typing import Optional
 
-from opentelemetry import trace
 from opentelemetry._events import Event
 from opentelemetry._events import EventLogger as APIEventLogger
 from opentelemetry._events import EventLoggerProvider as APIEventLoggerProvider
 from opentelemetry._logs import NoOpLogger, SeverityNumber, get_logger_provider
-from opentelemetry.sdk._logs import Logger, LoggerProvider, LogRecord
+from opentelemetry.sdk._logs import Logger, LoggerProvider, SDKLogRecord
 from opentelemetry.util.types import _ExtendedAttributes
 
 _logger = logging.getLogger(__name__)
@@ -49,13 +48,9 @@ def emit(self, event: Event) -> None:
         if isinstance(self._logger, NoOpLogger):
             # Do nothing if SDK is disabled
             return
-        span_context = trace.get_current_span().get_span_context()
-        log_record = LogRecord(
+        log_record = SDKLogRecord(
             timestamp=event.timestamp or time_ns(),
             observed_timestamp=None,
-            trace_id=event.trace_id or span_context.trace_id,
-            span_id=event.span_id or span_context.span_id,
-            trace_flags=event.trace_flags or span_context.trace_flags,
             severity_text=None,
             severity_number=event.severity_number or SeverityNumber.INFO,
             body=event.body,

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

@@ -14,23 +14,21 @@
 
 
 from opentelemetry.sdk._logs._internal import (
-    LogDeprecatedInitWarning,
     LogDroppedAttributesWarning,
     Logger,
     LoggerProvider,
     LoggingHandler,
     LogLimits,
-    LogRecord,
     LogRecordProcessor,
+    SDKLogRecord,
 )
 
 __all__ = [
     "Logger",
     "LoggerProvider",
     "LoggingHandler",
     "LogLimits",
-    "LogRecord",
     "LogRecordProcessor",
-    "LogDeprecatedInitWarning",
     "LogDroppedAttributesWarning",
+    "SDKLogRecord",
 ]

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

@@ -27,12 +27,10 @@
 from time import time_ns
 from typing import Any, Callable, Tuple, Union, cast, overload  # noqa
 
-from typing_extensions import deprecated
-
 from opentelemetry._logs import Logger as APILogger
 from opentelemetry._logs import LoggerProvider as APILoggerProvider
-from opentelemetry._logs import LogRecord as APILogRecord
 from opentelemetry._logs import (
+    LogRecord,
     NoOpLogger,
     SeverityNumber,
     get_logger,
@@ -56,7 +54,6 @@
     format_trace_id,
     get_current_span,
 )
-from opentelemetry.trace.span import TraceFlags
 from opentelemetry.util.types import AnyValue, _ExtendedAttributes
 
 _logger = logging.getLogger(__name__)
@@ -84,18 +81,6 @@ class LogDroppedAttributesWarning(UserWarning):
 warnings.simplefilter("once", LogDroppedAttributesWarning)
 
 
-class LogDeprecatedInitWarning(UserWarning):
-    """Custom warning to indicate deprecated LogRecord init was used.
-
-    This class is used to filter and handle these specific warnings separately
-    from other warnings, ensuring that they are only shown once without
-    interfering with default user warnings.
-    """
-
-
-warnings.simplefilter("once", LogDeprecatedInitWarning)
-
-
 class LogLimits:
     """This class is based on a SpanLimits class in the Tracing module.
 
@@ -187,10 +172,10 @@ def _from_env_if_absent(
 )
 
 
-class LogRecord(APILogRecord):
-    """A LogRecord instance represents an event being logged.
+class SDKLogRecord(LogRecord):
+    """A SDKLogRecord instance represents an event being logged.
 
-    LogRecord instances are created and emitted via `Logger`
+    SDKLogRecord instances are created and emitted via `Logger`
     every time something is logged. They contain all the information
     pertinent to the event being logged.
     """
@@ -210,33 +195,11 @@ def __init__(
         event_name: str | None = None,
     ): ...
 
-    @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,
-        observed_timestamp: int | None = None,
-        trace_id: int | None = None,
-        span_id: int | None = None,
-        trace_flags: TraceFlags | None = None,
-        severity_text: str | None = None,
-        severity_number: SeverityNumber | None = None,
-        body: AnyValue | None = None,
-        resource: Resource | None = None,
-        attributes: _ExtendedAttributes | None = None,
-        limits: LogLimits | None = _UnsetLogLimits,
-    ): ...
-
     def __init__(  # pylint:disable=too-many-locals
         self,
         timestamp: int | None = None,
         observed_timestamp: int | None = None,
         context: Context | None = None,
-        trace_id: int | None = None,
-        span_id: int | None = None,
-        trace_flags: TraceFlags | None = None,
         severity_text: str | None = None,
         severity_number: SeverityNumber | None = None,
         body: AnyValue | None = None,
@@ -246,13 +209,6 @@ def __init__(  # pylint:disable=too-many-locals
         event_name: str | None = None,
         instrumentation_scope: InstrumentationScope | None = None,
     ):
-        if trace_id or span_id or trace_flags:
-            warnings.warn(
-                "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated since 1.35.0. Use `context` instead.",
-                LogDeprecatedInitWarning,
-                stacklevel=2,
-            )
-
         if not context:
             context = get_current()
 
@@ -264,9 +220,9 @@ def __init__(  # pylint:disable=too-many-locals
                 "timestamp": timestamp,
                 "observed_timestamp": observed_timestamp,
                 "context": context,
-                "trace_id": trace_id or span_context.trace_id,
-                "span_id": span_id or span_context.span_id,
-                "trace_flags": trace_flags or span_context.trace_flags,
+                "trace_id": span_context.trace_id,
+                "span_id": span_context.span_id,
+                "trace_flags": span_context.trace_flags,
                 "severity_text": severity_text,
                 "severity_number": severity_number,
                 "body": body,
@@ -292,7 +248,7 @@ def __init__(  # pylint:disable=too-many-locals
             )
 
     def __eq__(self, other: object) -> bool:
-        if not isinstance(other, LogRecord):
+        if not isinstance(other, SDKLogRecord):
             return NotImplemented
         return self.__dict__ == other.__dict__
 
@@ -347,8 +303,8 @@ class LogRecordProcessor(abc.ABC):
     """
 
     @abc.abstractmethod
-    def on_emit(self, log_record: LogRecord):
-        """Emits the `LogRecord`"""
+    def on_emit(self, log_record: SDKLogRecord):
+        """Emits the `SDKLogRecord`"""
 
     @abc.abstractmethod
     def shutdown(self):
@@ -391,7 +347,7 @@ def add_log_record_processor(
         with self._lock:
             self._log_record_processors += (log_record_processor,)
 
-    def on_emit(self, log_record: LogRecord) -> None:
+    def on_emit(self, log_record: SDKLogRecord) -> None:
         for lp in self._log_record_processors:
             lp.on_emit(log_record)
 
@@ -465,7 +421,7 @@ def _submit_and_wait(
         for future in futures:
             future.result()
 
-    def on_emit(self, log_record: LogRecord):
+    def on_emit(self, log_record: SDKLogRecord):
         self._submit_and_wait(lambda lp: lp.on_emit, log_record)
 
     def shutdown(self):
@@ -575,7 +531,7 @@ def _get_attributes(record: logging.LogRecord) -> _ExtendedAttributes:
                 )
         return attributes
 
-    def _translate(self, record: logging.LogRecord) -> LogRecord:
+    def _translate(self, record: logging.LogRecord) -> SDKLogRecord:
         timestamp = int(record.created * 1e9)
         observered_timestamp = time_ns()
         attributes = self._get_attributes(record)
@@ -610,7 +566,7 @@ def _translate(self, record: logging.LogRecord) -> LogRecord:
         )
 
         logger = get_logger(record.name, logger_provider=self._logger_provider)
-        return LogRecord(
+        return SDKLogRecord(
             timestamp=timestamp,
             observed_timestamp=observered_timestamp,
             context=get_current() or None,
@@ -669,11 +625,22 @@ def resource(self):
         return self._resource
 
     def emit(self, record: LogRecord):
-        """Emits the :class:`LogRecord` by setting instrumentation scope
+        """Emits the :class:`SDKLogRecord` by setting instrumentation scope
         and forwarding to the processor.
         """
-        record.instrumentation_scope = self._instrumentation_scope
-        self._multi_log_record_processor.on_emit(record)
+        sdk_log_record = SDKLogRecord(
+            timestamp=record.timestamp,
+            observed_timestamp=record.observed_timestamp,
+            context=record.context,
+            severity_text=record.severity_text,
+            severity_number=record.severity_number,
+            body=record.body,
+            attributes=record.attributes,
+            event_name=record.event_name,
+            resource=self._resource,
+            instrumentation_scope=self._instrumentation_scope,
+        )
+        self._multi_log_record_processor.on_emit(sdk_log_record)
 
 
 class LoggerProvider(APILoggerProvider):