fix(google-genai): Set agent name

[sentrivana]

Description

Cherry-picked off of #5030

Issues

Ref https://linear.app/getsentry/issue/TET-1293/make-sure-that-agent-name-is-set-on-all-of-its-gen-ai-children

Reminders

• Please add tests to validate your changes, and lint your code using tox -e linters.
• Add GH Issue ID & Linear ID (if applicable)
• PR title should use conventional commit style (feat:, fix:, ref:, meta:)
• For external contributors: CONTRIBUTING.md, Sentry SDK development docs, Discord community

[linear]

TET-1293 Make sure that agent name is set on all of its gen_ai.* children

[cursor]

Bug: Agent Name Missing in Async Non-Streaming Wrapper

The _wrap_async_generate_content function is missing the line that sets SPANDATA.GEN_AI_AGENT_NAME on the chat_span. This line was added to the other three wrapper functions (_wrap_generate_content_stream, _wrap_async_generate_content_stream, and _wrap_generate_content), but was not added here. This causes the async non-streaming variant to be inconsistent with the other implementations and fails to meet the PR's goal of ensuring agent name is set on all gen_ai children.

sentry_sdk/integrations/google_genai/__init__.py#L257-L301

sentry-python/sentry_sdk/integrations/google_genai/__init__.py

Lines 257 to 301 in 0e23407

	def _wrap_async_generate_content(f):
	# type: (Callable[..., Any]) -> Callable[..., Any]
	@wraps(f)
	async def new_async_generate_content(self, *args, **kwargs):
	# type: (Any, Any, Any) -> Any
	integration = sentry_sdk.get_client().get_integration(GoogleGenAIIntegration)
	if integration is None:
	return await f(self, *args, **kwargs)
	model, contents, model_name = prepare_generate_content_args(args, kwargs)
	with get_start_span_function()(
	op=OP.GEN_AI_INVOKE_AGENT,
	name="invoke_agent",
	origin=ORIGIN,
	) as span:
	span.set_data(SPANDATA.GEN_AI_AGENT_NAME, model_name)
	span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "invoke_agent")
	set_span_data_for_request(span, integration, model_name, contents, kwargs)
	with sentry_sdk.start_span(
	op=OP.GEN_AI_CHAT,
	name=f"chat {model_name}",
	origin=ORIGIN,
	) as chat_span:
	chat_span.set_data(SPANDATA.GEN_AI_OPERATION_NAME, "chat")
	chat_span.set_data(SPANDATA.GEN_AI_SYSTEM, GEN_AI_SYSTEM)
	chat_span.set_data(SPANDATA.GEN_AI_REQUEST_MODEL, model_name)
	set_span_data_for_request(
	chat_span, integration, model_name, contents, kwargs
	)
	try:
	response = await f(self, *args, **kwargs)
	except Exception as exc:
	_capture_exception(exc)
	chat_span.set_status(SPANSTATUS.ERROR)
	raise
	set_span_data_for_response(chat_span, integration, response)
	set_span_data_for_response(span, integration, response)
	return response
	return new_async_generate_content

 

---

[sentry]

Bug: _wrap_async_generate_content omits setting SPANDATA.GEN_AI_AGENT_NAME on the chat span.
_{Severity: HIGH | Confidence: 1.00}

🔍 Detailed Analysis

The _wrap_async_generate_content function fails to set the SPANDATA.GEN_AI_AGENT_NAME on the chat span. This omission occurs when handling async non-streaming generate_content calls, leading to inconsistent span data compared to other wrapper functions which correctly set this attribute. Consequently, monitoring attributes for these specific calls will be incomplete.

💡 Suggested Fix

Add chat_span.set_data(SPANDATA.GEN_AI_AGENT_NAME, model_name) within the _wrap_async_generate_content function, specifically after setting SPANDATA.GEN_AI_REQUEST_MODEL.

🤖 Prompt for AI Agent

Review the code at the location below. A potential bug has been identified by an AI
agent.
Verify if this is a real issue. If it is, propose a fix; if not, explain why it's not
valid.

Location: sentry_sdk/integrations/google_genai/__init__.py#L235-L241

Potential issue: The `_wrap_async_generate_content` function fails to set the
`SPANDATA.GEN_AI_AGENT_NAME` on the chat span. This omission occurs when handling async
non-streaming `generate_content` calls, leading to inconsistent span data compared to
other wrapper functions which correctly set this attribute. Consequently, monitoring
attributes for these specific calls will be incomplete.

_{Did we get this right? 👍 / 👎 to inform future reviews.}

[codecov]

Codecov Report

❌ Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 83.96%. Comparing base (b3b2eb6) to head (0e23407).
⚠️ Report is 1 commits behind head on master.
✅ All tests successful. No failed tests found.

Files with missing lines	Patch %	Lines
sentry_sdk/integrations/google_genai/__init__.py	66.66%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #5038      +/-   ##
==========================================
+ Coverage   83.93%   83.96%   +0.03%     
==========================================
  Files         179      179              
  Lines       17887    17890       +3     
  Branches     3181     3181              
==========================================
+ Hits        15014    15022       +8     
+ Misses       1908     1902       -6     
- Partials      965      966       +1     

Files with missing lines	Coverage Δ
sentry_sdk/integrations/google_genai/__init__.py	52.94% <66.66%> (+0.24%)	⬆️

... and 3 files with indirect coverage changes