Use LogRecord from APi instead of Events

Author: DylanRussell

instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/extensions/bedrock_utils.py

@@ -21,8 +21,9 @@
 
 from botocore.eventstream import EventStream, EventStreamError
 from wrapt import ObjectProxy
+from opentelemetry.context import get_current
+from opentelemetry._logs import LogRecord
 
-from opentelemetry.sdk._logs import LogRecord
 from opentelemetry.instrumentation.botocore.environment_variables import (
     OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT,
 )
@@ -511,12 +512,14 @@ def message_to_event(
                 event_name="gen_ai.tool.message",
                 attributes=attributes,
                 body=tool_body,
+                context = get_current(),
             )
 
     yield LogRecord(
         event_name=f"gen_ai.{role}.message",
         attributes=attributes,
         body=body if body else None,
+        context = get_current(),
     )
 
 
@@ -620,8 +623,9 @@ def _to_body_dict(self) -> dict[str, Any]:
     def to_choice_event(self, **event_kwargs) -> LogRecord:
         attributes = {GEN_AI_SYSTEM: GenAiSystemValues.AWS_BEDROCK.value}
         return LogRecord(
-            name="gen_ai.choice",
+            event_name="gen_ai.choice",
             attributes=attributes,
             body=self._to_body_dict(),
             **event_kwargs,
+            context = get_current(),
         )

instrumentation/opentelemetry-instrumentation-botocore/tests/bedrock_utils.py

@@ -282,17 +282,15 @@ def remove_none_values(body):
 
 def assert_log_parent(log, span):
     if span:
-        assert log.log_record.trace_id == span.get_span_context().trace_id
+        assert log.log_record.trace_id == span.get_span_context().trace_id, "{} does not equal {}".format(span.get_span_context().trace_id, log.log_record.trace_id)
         assert log.log_record.span_id == span.get_span_context().span_id
         assert (
             log.log_record.trace_flags == span.get_span_context().trace_flags
         )
 
 
 def assert_message_in_logs(log, event_name, expected_content, parent_span):
-    assert (
-        log.log_record.attributes[EventAttributes.EVENT_NAME] == event_name
-    )
+    assert log.log_record.event_name == event_name, log.log_record.event_name
     assert (
         log.log_record.attributes[GenAIAttributes.GEN_AI_SYSTEM]
         == GenAIAttributes.GenAiSystemValues.AWS_BEDROCK.value

instrumentation/opentelemetry-instrumentation-botocore/tests/conftest.py

@@ -58,7 +58,6 @@ def fixture_tracer_provider(span_exporter):
 def fixture_logger_provider(log_exporter):
     provider = LoggerProvider()
     provider.add_log_record_processor(SimpleLogRecordProcessor(log_exporter))
-
     return provider