Skip to content

Commit 4adef35

Browse files
committed
Remove square brackets from model name in span name per PR feedback.
1 parent 25aa401 commit 4adef35

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/generate_content.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ def __init__(
201201

202202
def start_span_as_current_span(self, model_name, function_name):
203203
return self._otel_wrapper.start_as_current_span(
204-
f"generate_content [{model_name}]",
204+
f"generate_content {model_name}",
205205
start_time=self._start_time,
206206
attributes={
207207
code_attributes.CODE_FUNCTION_NAME: function_name,

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/nonstreaming_base.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,23 +86,23 @@ def test_generates_span(self):
8686
model="gemini-2.0-flash", contents="Does this work?"
8787
)
8888
self.assertEqual(response.text, "Yep, it works!")
89-
self.otel.assert_has_span_named("generate_content [gemini-2.0-flash]")
89+
self.otel.assert_has_span_named("generate_content gemini-2.0-flash")
9090

9191
def test_model_reflected_into_span_name(self):
9292
self.configure_valid_response(response_text="Yep, it works!")
9393
response = self.generate_content(
9494
model="gemini-1.5-flash", contents="Does this work?"
9595
)
9696
self.assertEqual(response.text, "Yep, it works!")
97-
self.otel.assert_has_span_named("generate_content [gemini-1.5-flash]")
97+
self.otel.assert_has_span_named("generate_content gemini-1.5-flash")
9898

9999
def test_generated_span_has_minimal_genai_attributes(self):
100100
self.configure_valid_response(response_text="Yep, it works!")
101101
self.generate_content(
102102
model="gemini-2.0-flash", contents="Does this work?"
103103
)
104-
self.otel.assert_has_span_named("generate_content [gemini-2.0-flash]")
105-
span = self.otel.get_span_named("generate_content [gemini-2.0-flash]")
104+
self.otel.assert_has_span_named("generate_content gemini-2.0-flash")
105+
span = self.otel.get_span_named("generate_content gemini-2.0-flash")
106106
self.assertEqual(span.attributes["gen_ai.system"], "gemini")
107107
self.assertEqual(
108108
span.attributes["gen_ai.operation.name"], "GenerateContent"
@@ -113,8 +113,8 @@ def test_generated_span_has_correct_function_name(self):
113113
self.generate_content(
114114
model="gemini-2.0-flash", contents="Does this work?"
115115
)
116-
self.otel.assert_has_span_named("generate_content [gemini-2.0-flash]")
117-
span = self.otel.get_span_named("generate_content [gemini-2.0-flash]")
116+
self.otel.assert_has_span_named("generate_content gemini-2.0-flash")
117+
span = self.otel.get_span_named("generate_content gemini-2.0-flash")
118118
self.assertEqual(
119119
span.attributes["code.function.name"], self.expected_function_name
120120
)
@@ -125,8 +125,8 @@ def test_generated_span_has_vertex_ai_system_when_configured(self):
125125
self.generate_content(
126126
model="gemini-2.0-flash", contents="Does this work?"
127127
)
128-
self.otel.assert_has_span_named("generate_content [gemini-2.0-flash]")
129-
span = self.otel.get_span_named("generate_content [gemini-2.0-flash]")
128+
self.otel.assert_has_span_named("generate_content gemini-2.0-flash")
129+
span = self.otel.get_span_named("generate_content gemini-2.0-flash")
130130
self.assertEqual(span.attributes["gen_ai.system"], "vertex_ai")
131131
self.assertEqual(
132132
span.attributes["gen_ai.operation.name"], "GenerateContent"
@@ -135,8 +135,8 @@ def test_generated_span_has_vertex_ai_system_when_configured(self):
135135
def test_generated_span_counts_tokens(self):
136136
self.configure_valid_response(input_tokens=123, output_tokens=456)
137137
self.generate_content(model="gemini-2.0-flash", contents="Some input")
138-
self.otel.assert_has_span_named("generate_content [gemini-2.0-flash]")
139-
span = self.otel.get_span_named("generate_content [gemini-2.0-flash]")
138+
self.otel.assert_has_span_named("generate_content gemini-2.0-flash")
139+
span = self.otel.get_span_named("generate_content gemini-2.0-flash")
140140
self.assertEqual(span.attributes["gen_ai.usage.input_tokens"], 123)
141141
self.assertEqual(span.attributes["gen_ai.usage.output_tokens"], 456)
142142

0 commit comments

Comments
 (0)