Fix broken tests

Author: DylanRussell

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

@@ -119,9 +119,7 @@ def _instrument(self, **kwargs: Any):
             logger_provider=logger_provider,
         )
 
-        method_wrappers = MethodWrappers(
-            tracer, logger, is_content_enabled()
-        )
+        method_wrappers = MethodWrappers(tracer, logger, is_content_enabled())
         for client_class, method_name, wrapper in _methods_to_wrap(
             method_wrappers
         ):

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

@@ -93,9 +93,7 @@ def vertexai_init(vcr: VCR) -> None:
 
 
 @pytest.fixture
-def instrument_no_content(
-    tracer_provider, logger_provider, meter_provider
-):
+def instrument_no_content(tracer_provider, logger_provider, meter_provider):
     os.environ.update(
         {OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT: "False"}
     )
@@ -114,9 +112,7 @@ def instrument_no_content(
 
 
 @pytest.fixture
-def instrument_with_content(
-    tracer_provider, logger_provider, meter_provider
-):
+def instrument_with_content(tracer_provider, logger_provider, meter_provider):
     os.environ.update(
         {OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT: "True"}
     )

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

@@ -78,10 +78,8 @@ def test_generate_content(
     assert user_log.trace_id == span_context.trace_id
     assert user_log.span_id == span_context.span_id
     assert user_log.trace_flags == span_context.trace_flags
-    assert user_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert user_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert user_log.event_name == "gen_ai.user.message"
     assert user_log.body == {
         "content": [{"text": "Say this is a test"}],
         "role": "user",
@@ -90,10 +88,8 @@ def test_generate_content(
     assert choice_log.trace_id == span_context.trace_id
     assert choice_log.span_id == span_context.span_id
     assert choice_log.trace_flags == span_context.trace_flags
-    assert choice_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.choice",
-    }
+    assert choice_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert choice_log.event_name == "gen_ai.choice"
     assert choice_log.body == {
         "finish_reason": "stop",
         "index": 0,
@@ -143,16 +139,12 @@ def test_generate_content_without_events(
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
     user_log, choice_log = [log_data.log_record for log_data in logs]
-    assert user_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert user_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert user_log.event_name == "gen_ai.user.message"
     assert user_log.body == {"role": "user"}
 
-    assert choice_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.choice",
-    }
+    assert choice_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert choice_log.event_name == "gen_ai.choice"
     assert choice_log.body == {
         "finish_reason": "stop",
         "index": 0,
@@ -285,10 +277,8 @@ def test_generate_content_invalid_role(
     # Emits the faulty content which caused the request to fail
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 1
-    assert logs[0].log_record.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert logs[0].log_record.attributes == {"gen_ai.system": "vertex_ai"}
+    assert logs[0].log_record.event_name == "gen_ai.user.message"
     assert logs[0].log_record.body == {
         "content": [{"text": "Say this is a test"}],
         "role": "invalid_role",
@@ -418,47 +408,37 @@ def generate_content_all_input_events(
         log_data.log_record for log_data in logs
     ]
 
-    assert system_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.system.message",
-    }
+    assert system_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert system_log.event_name == "gen_ai.system.message"
     assert system_log.body == {
         "content": [{"text": "You are a clever language model"}],
         # The API only allows user and model, so system instruction is considered a user role
         "role": "user",
     }
 
-    assert user_log1.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert user_log1.attributes == {"gen_ai.system": "vertex_ai"}
+    assert user_log1.event_name == "gen_ai.user.message"
     assert user_log1.body == {
         "content": [{"text": "My name is OpenTelemetry"}],
         "role": "user",
     }
 
-    assert assistant_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.assistant.message",
-    }
+    assert assistant_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert assistant_log.event_name == "gen_ai.assistant.message"
     assert assistant_log.body == {
         "content": [{"text": "Hello OpenTelemetry!"}],
         "role": "model",
     }
 
-    assert user_log2.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert user_log2.attributes == {"gen_ai.system": "vertex_ai"}
+    assert user_log2.event_name == "gen_ai.user.message"
     assert user_log2.body == {
         "content": [{"text": "Address me by name and say this is a test"}],
         "role": "user",
     }
 
-    assert choice_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.choice",
-    }
+    assert choice_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert choice_log.event_name == "gen_ai.choice"
     assert choice_log.body == {
         "finish_reason": "stop",
         "index": 0,

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

@@ -44,21 +44,17 @@ def test_function_call_choice(
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
     user_log, choice_log = [log_data.log_record for log_data in logs]
-    assert user_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert user_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert user_log.event_name == "gen_ai.user.message"
     assert user_log.body == {
         "content": [
             {"text": "Get weather details in New Delhi and San Francisco?"}
         ],
         "role": "user",
     }
 
-    assert choice_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.choice",
-    }
+    assert choice_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert choice_log.event_name == "gen_ai.choice"
     assert choice_log.body == {
         "finish_reason": "stop",
         "index": 0,
@@ -111,18 +107,14 @@ def test_function_call_choice_no_content(
     logs = log_exporter.get_finished_logs()
     assert len(logs) == 2
     user_log, choice_log = [log_data.log_record for log_data in logs]
-    assert user_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert user_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert user_log.event_name == "gen_ai.user.message"
     assert user_log.body == {
         "role": "user",
     }
 
-    assert choice_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.choice",
-    }
+    assert choice_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert choice_log.event_name == "gen_ai.choice"
     assert choice_log.body == {
         "finish_reason": "stop",
         "index": 0,
@@ -172,21 +164,17 @@ def test_tool_events(
     user_log, assistant_log, tool_log1, tool_log2, choice_log = [
         log_data.log_record for log_data in logs
     ]
-    assert user_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert user_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert user_log.event_name == "gen_ai.user.message"
     assert user_log.body == {
         "content": [
             {"text": "Get weather details in New Delhi and San Francisco?"}
         ],
         "role": "user",
     }
 
-    assert assistant_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.assistant.message",
-    }
+    assert assistant_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert assistant_log.event_name == "gen_ai.assistant.message"
     assert assistant_log.body == {
         "role": "model",
         "content": [
@@ -205,31 +193,25 @@ def test_tool_events(
         ],
     }
 
-    assert tool_log1.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.tool.message",
-    }
+    assert tool_log1.attributes == {"gen_ai.system": "vertex_ai"}
+    assert tool_log1.event_name == "gen_ai.tool.message"
 
     assert tool_log1.body == {
         "role": "user",
         "id": "get_current_weather_0",
         "content": {"content": '{"temperature": 35, "unit": "C"}'},
     }
 
-    assert tool_log2.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.tool.message",
-    }
+    assert tool_log2.attributes == {"gen_ai.system": "vertex_ai"}
+    assert tool_log2.event_name == "gen_ai.tool.message"
     assert tool_log2.body == {
         "role": "user",
         "id": "get_current_weather_1",
         "content": {"content": '{"temperature": 25, "unit": "C"}'},
     }
 
-    assert choice_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.choice",
-    }
+    assert choice_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert choice_log.event_name == "gen_ai.choice"
     assert choice_log.body == {
         "finish_reason": "stop",
         "index": 0,
@@ -274,34 +256,25 @@ def test_tool_events_no_content(
     user_log, assistant_log, tool_log1, tool_log2, choice_log = [
         log_data.log_record for log_data in logs
     ]
-    assert user_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.user.message",
-    }
+    assert user_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert user_log.event_name == "gen_ai.user.message"
     assert user_log.body == {"role": "user"}
 
-    assert assistant_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.assistant.message",
-    }
+    assert assistant_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert assistant_log.event_name == "gen_ai.assistant.message"
     assert assistant_log.body == {"role": "model"}
 
-    assert tool_log1.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.tool.message",
-    }
+    assert tool_log1.attributes == {"gen_ai.system": "vertex_ai"}
+    assert tool_log1.event_name == "gen_ai.tool.message"
+
     assert tool_log1.body == {"role": "user", "id": "get_current_weather_0"}
 
-    assert tool_log2.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.tool.message",
-    }
+    assert tool_log2.attributes == {"gen_ai.system": "vertex_ai"}
+    assert tool_log2.event_name == "gen_ai.tool.message"
     assert tool_log2.body == {"role": "user", "id": "get_current_weather_1"}
 
-    assert choice_log.attributes == {
-        "gen_ai.system": "vertex_ai",
-        "event.name": "gen_ai.choice",
-    }
+    assert choice_log.attributes == {"gen_ai.system": "vertex_ai"}
+    assert choice_log.event_name == "gen_ai.choice"
     assert choice_log.body == {
         "finish_reason": "stop",
         "index": 0,