Remember to add resource when emitting

Author: xrmx

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

@@ -633,8 +633,6 @@ def _translate(self, record: logging.LogRecord) -> LogRecord:
             "WARN" if record.levelname == "WARNING" else record.levelname
         )
 
-        # FIXME: what to do with the resource?
-        # logger = get_logger(record.name, logger_provider=self._logger_provider)
         return dict(
             timestamp=timestamp,
             observed_timestamp=observered_timestamp,
@@ -643,7 +641,6 @@ def _translate(self, record: logging.LogRecord) -> LogRecord:
             severity_number=severity_number,
             body=body,
             attributes=attributes,
-            # resource=logger.resource,
         )
 
     def emit(self, record: logging.LogRecord) -> None:
@@ -744,6 +741,7 @@ def emit(
                 body=body,
                 attributes=attributes,
                 event_name=event_name,
+                resource=self._resource,
             )
         elif not isinstance(record, LogRecord):
             # pylint:disable=protected-access

opentelemetry-sdk/tests/logs/test_logs.py

@@ -122,6 +122,7 @@ def test_can_emit_logrecord(self):
         log_record_processor_mock.on_emit.assert_called_once()
         log_data = log_record_processor_mock.on_emit.call_args.args[0]
         self.assertTrue(isinstance(log_data.log_record, LogRecord))
+        self.assertTrue(log_data.log_record is log_record)
 
     def test_can_emit_api_logrecord(self):
         logger, log_record_processor_mock = self._get_logger()
@@ -132,7 +133,17 @@ def test_can_emit_api_logrecord(self):
         logger.emit(api_log_record)
         log_record_processor_mock.on_emit.assert_called_once()
         log_data = log_record_processor_mock.on_emit.call_args.args[0]
-        self.assertTrue(isinstance(log_data.log_record, LogRecord))
+        log_record = log_data.log_record
+        self.assertTrue(isinstance(log_record, LogRecord))
+        self.assertEqual(log_record.timestamp, None)
+        self.assertEqual(log_record.observed_timestamp, 0)
+        self.assertEqual(log_record.context, {})
+        self.assertEqual(log_record.severity_number, None)
+        self.assertEqual(log_record.severity_text, None)
+        self.assertEqual(log_record.body, "a log line")
+        self.assertEqual(log_record.attributes, {})
+        self.assertEqual(log_record.event_name, None)
+        self.assertEqual(log_record.resource, logger.resource)
 
     def test_can_emit_with_keywords_arguments(self):
         logger, log_record_processor_mock = self._get_logger()
@@ -159,3 +170,4 @@ def test_can_emit_with_keywords_arguments(self):
         self.assertEqual(log_record.body, "a body")
         self.assertEqual(log_record.attributes, {"some": "attributes"})
         self.assertEqual(log_record.event_name, "event_name")
+        self.assertEqual(log_record.resource, logger.resource)