Fix overwritten log attributes in vertexai instrumentation

Author: aabmass

instrumentation-genai/opentelemetry-instrumentation-vertexai/src/opentelemetry/instrumentation/vertexai/patch.py

@@ -172,14 +172,15 @@ def handle_response(
                 | prediction_service_v1beta1.GenerateContentResponse
                 | None,
             ) -> None:
-                event = LogRecord(
-                    event_name="gen_ai.client.inference.operation.details",
-                )
                 attributes = (
                     get_server_attributes(instance.api_endpoint)  # type: ignore[reportUnknownMemberType]
                     | request_attributes
                     | get_genai_response_attributes(response)
                 )
+                event = LogRecord(
+                    event_name="gen_ai.client.inference.operation.details",
+                )
+                event.attributes = attributes.copy()
                 system_instructions, inputs, outputs = [], [], []
                 if params.system_instruction:
                     system_instructions = convert_content_to_message_parts(
@@ -237,7 +238,6 @@ def handle_response(
                                 for k, v in content_attributes.items()
                             }
                         )
-                event.attributes = attributes
                 if capture_content in (
                     ContentCapturingMode.SPAN_AND_EVENT,
                     ContentCapturingMode.EVENT_ONLY,

instrumentation-genai/opentelemetry-instrumentation-vertexai/tests/test_function_calling_experimental.py

@@ -1,5 +1,4 @@
 import json
-import time
 from typing import Any
 
 import fsspec
@@ -274,6 +273,14 @@ def test_tool_events_with_completion_hook(
     assert len(logs) == 1
     # File upload takes a few seconds sometimes.
     time.sleep(3)
+
+    # Both log and span have the same reference attributes from upload hook
+    for key in "gen_ai.input.messages_ref", "gen_ai.output.messages_ref":
+        assert spans[0].attributes.get(key) is not None
+        assert logs[0].log_record.attributes.get(key) is not None
+
+        assert spans[0].attributes[key] == logs[0].log_record.attributes[key]
+
     assert_fsspec_equal(
         spans[0].attributes["gen_ai.output.messages_ref"],
         [