Update after merge

Author: hectorhdzg

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

@@ -66,7 +66,6 @@ def _encode_log(readable_log_record: ReadableLogRecord) -> PB2LogRecord:
         severity_number=getattr(
             readable_log_record.log_record.severity_number, "value", None
         ),
-        severity_number=readable_log_record.log_record.severity_number.value,
         event_name=readable_log_record.log_record.event_name,
     )
 

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

@@ -247,7 +247,7 @@ def to_json(self, indent: int | None = 4) -> str:
                     else None
                 ),
                 "dropped_attributes": self.dropped_attributes,
-                "timestamp": ns_to_iso_str(self.log_record.timestamp),
+                "timestamp": ns_to_iso_str(self.log_record.timestamp)
                 if self.log_record.timestamp is not None
                 else None,
                 "observed_timestamp": ns_to_iso_str(
@@ -265,7 +265,9 @@ def to_json(self, indent: int | None = 4) -> str:
                 ),
                 "trace_flags": self.log_record.trace_flags,
                 "resource": json.loads(self.resource.to_json()),
-                "event_name": self.log_record.event_name or "",
+                "event_name": self.log_record.event_name
+                if self.log_record.event_name
+                else "",
             },
             indent=indent,
             cls=BytesEncoder,
@@ -279,21 +281,16 @@ def dropped_attributes(self) -> int:
 
     @classmethod
     def _from_api_log_record(
-        cls, *, record: APILogRecord, resource: Resource
-    ) -> LogRecord:
+        cls,
+        *,
+        record: LogRecord,
+        resource: Resource,
+        instrumentation_scope: InstrumentationScope | None = None,
+    ) -> ReadWriteLogRecord:
         return cls(
-            timestamp=record.timestamp,
-            observed_timestamp=record.observed_timestamp,
-            context=record.context,
-            trace_id=record.trace_id,
-            span_id=record.span_id,
-            trace_flags=record.trace_flags,
-            severity_text=record.severity_text,
-            severity_number=record.severity_number,
-            body=record.body,
-            attributes=record.attributes,
-            event_name=record.event_name,
+            log_record=record,
             resource=resource,
+            instrumentation_scope=instrumentation_scope,
         )
 
 
@@ -631,16 +628,12 @@ def emit(self, record: LogRecord):
         """
         if not isinstance(record, ReadWriteLogRecord):
             # pylint:disable=protected-access
-            record = LogRecord._from_api_log_record(
-            record=record, resource=self._resource
-        )
-            
-        log_record = ReadWriteLogRecord(
-            log_record=record,
-            resource=self._resource,
-            instrumentation_scope=self._instrumentation_scope,
-        )
-        self._multi_log_record_processor.on_emit(log_record)
+            record = ReadWriteLogRecord._from_api_log_record(
+                record=record,
+                resource=self._resource,
+                instrumentation_scope=self._instrumentation_scope,
+            )
+        self._multi_log_record_processor.on_emit(record)
 
 
 class LoggerProvider(APILoggerProvider):

opentelemetry-sdk/tests/logs/test_log_record.py

@@ -18,12 +18,14 @@
 
 from opentelemetry._logs import LogRecord, SeverityNumber
 from opentelemetry.attributes import BoundedAttributes
+from opentelemetry.context import get_current
 from opentelemetry.sdk._logs import (
     LogDroppedAttributesWarning,
     LogLimits,
     ReadWriteLogRecord,
 )
 from opentelemetry.sdk.resources import Resource
+from opentelemetry.trace.span import TraceFlags
 
 
 class TestLogRecord(unittest.TestCase):
@@ -64,9 +66,11 @@ def test_log_record_to_json_serializes_severity_number_as_int(self):
         self.assertEqual(SeverityNumber.WARN.value, decoded["severity_number"])
 
     def test_log_record_to_json_serializes_null_severity_number(self):
-        actual = LogRecord(
-            observed_timestamp=0,
-            body="a log line",
+        actual = ReadWriteLogRecord(
+            LogRecord(
+                observed_timestamp=0,
+                body="a log line",
+            ),
             resource=Resource({"service.name": "foo"}),
         )
 
@@ -183,34 +187,9 @@ def test_log_record_dropped_attributes_unset_limits(self):
         self.assertTrue(result.dropped_attributes == 0)
         self.assertEqual(attr, result.log_record.attributes)
 
-    def test_log_record_deprecated_init_warning(self):
-        test_cases = [
-            {"trace_id": 123},
-            {"span_id": 123},
-            {"trace_flags": TraceFlags(0x01)},
-        ]
-
-        for params in test_cases:
-            with self.subTest(params=params):
-                with warnings.catch_warnings(record=True) as cw:
-                    for _ in range(10):
-                        LogRecord(**params)
-
-                self.assertEqual(len(cw), 1)
-                self.assertIsInstance(cw[-1].message, LogDeprecatedInitWarning)
-                self.assertIn(
-                    "LogRecord init with `trace_id`, `span_id`, and/or `trace_flags` is deprecated since 1.35.0. Use `context` instead.",
-                    str(cw[-1].message),
-                )
-
-        with warnings.catch_warnings(record=True) as cw:
-            for _ in range(10):
-                LogRecord(context=get_current())
-        self.assertEqual(len(cw), 0)
-
     # pylint:disable=protected-access
     def test_log_record_from_api_log_record(self):
-        api_log_record = APILogRecord(
+        api_log_record = LogRecord(
             timestamp=1,
             observed_timestamp=2,
             context=get_current(),
@@ -225,19 +204,21 @@ def test_log_record_from_api_log_record(self):
         )
 
         resource = Resource.create({})
-        record = LogRecord._from_api_log_record(
+        record = ReadWriteLogRecord._from_api_log_record(
             record=api_log_record, resource=resource
         )
 
-        self.assertEqual(record.timestamp, 1)
-        self.assertEqual(record.observed_timestamp, 2)
-        self.assertEqual(record.context, get_current())
-        self.assertEqual(record.trace_id, 123)
-        self.assertEqual(record.span_id, 456)
-        self.assertEqual(record.trace_flags, TraceFlags(0x01))
-        self.assertEqual(record.severity_text, "WARN")
-        self.assertEqual(record.severity_number, SeverityNumber.WARN)
-        self.assertEqual(record.body, "a log line")
-        self.assertEqual(record.attributes, {"a": "b"})
-        self.assertEqual(record.event_name, "an.event")
+        self.assertEqual(record.log_record.timestamp, 1)
+        self.assertEqual(record.log_record.observed_timestamp, 2)
+        self.assertEqual(record.log_record.context, get_current())
+        self.assertEqual(record.log_record.trace_id, 123)
+        self.assertEqual(record.log_record.span_id, 456)
+        self.assertEqual(record.log_record.trace_flags, TraceFlags(0x01))
+        self.assertEqual(record.log_record.severity_text, "WARN")
+        self.assertEqual(
+            record.log_record.severity_number, SeverityNumber.WARN
+        )
+        self.assertEqual(record.log_record.body, "a log line")
+        self.assertEqual(record.log_record.attributes, {"a": "b"})
+        self.assertEqual(record.log_record.event_name, "an.event")
         self.assertEqual(record.resource, resource)

opentelemetry-sdk/tests/logs/test_logs.py

@@ -18,7 +18,7 @@
 from unittest.mock import Mock, patch
 
 from opentelemetry._logs import LogRecord, SeverityNumber
-from opentelemetry.sdk._logs import LoggerProvider, ReadableLogRecord
+from opentelemetry.sdk._logs import Logger, LoggerProvider, ReadableLogRecord
 from opentelemetry.sdk._logs._internal import (
     NoOpLogger,
     SynchronousMultiLogRecordProcessor,
@@ -88,6 +88,7 @@ def test_logger_provider_init(self, resource_patch):
         )
         self.assertIsNotNone(logger_provider._at_exit_handler)
 
+
 class TestReadableLogRecord(unittest.TestCase):
     def setUp(self):
         self.log_record = LogRecord(
@@ -128,6 +129,7 @@ def test_readable_log_record_can_read_attributes(self):
             "test-service",
         )
 
+
 class TestLogger(unittest.TestCase):
     @staticmethod
     def _get_logger():
@@ -158,7 +160,7 @@ def test_can_emit_logrecord(self):
 
     def test_can_emit_api_logrecord(self):
         logger, log_record_processor_mock = self._get_logger()
-        api_log_record = APILogRecord(
+        api_log_record = LogRecord(
             observed_timestamp=0,
             body="a log line",
         )