Skip to content

fix(otel): fall back user.id onto span extras when EVENT_ONLY key is missing #6362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DmitriiK wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −10
Open

fix(otel): fall back user.id onto span extras when EVENT_ONLY key is missing #6362

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions src/google/adk/telemetry/tracing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,20 +685,29 @@ def _use_extra_generate_content_attributes(

return

ctx = otel_context.set_value(
GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY, extra_attributes
)
# When EVENT_ONLY key is missing from opentelemetry-instrumentation-google-genai
# (through 1.0b0), fall back to merging log-only attrs (incl. user.id) into the
# span extras channel so they still reach generate_content spans.
# See https://github.com/google/adk-python/issues/6361
span_attrs = dict(extra_attributes)
event_only_key = None
if log_only_extra_attributes:
try:
from opentelemetry.instrumentation.google_genai import GENERATE_CONTENT_EVENT_ONLY_EXTRA_ATTRIBUTES_CONTEXT_KEY

ctx = otel_context.set_value(
GENERATE_CONTENT_EVENT_ONLY_EXTRA_ATTRIBUTES_CONTEXT_KEY,
log_only_extra_attributes,
context=ctx,
from opentelemetry.instrumentation.google_genai import (
GENERATE_CONTENT_EVENT_ONLY_EXTRA_ATTRIBUTES_CONTEXT_KEY as event_only_key,
)
except (ImportError, AttributeError):
pass
span_attrs.update(log_only_extra_attributes)

ctx = otel_context.set_value(
GENERATE_CONTENT_EXTRA_ATTRIBUTES_CONTEXT_KEY, span_attrs
)
if log_only_extra_attributes and event_only_key is not None:
ctx = otel_context.set_value(
event_only_key,
log_only_extra_attributes,
context=ctx,
)

tok = otel_context.attach(ctx)
try:
Expand Down