Skip to content

Commit f2d08fa

Browse files
committed
PR fixes
1 parent fff1b8d commit f2d08fa

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

packages/opentelemetry-instrumentation-groq/opentelemetry/instrumentation/groq/__init__.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def _handle_streaming_response(span, accumulated_content, tool_calls, finish_rea
185185
if should_emit_events() and event_logger:
186186
emit_streaming_response_events(accumulated_content, finish_reason, event_logger, tool_calls=tool_calls)
187187
else:
188-
set_streaming_response_attributes(span, accumulated_content, finish_reason, usage, tool_calls=tool_calls)
188+
set_streaming_response_attributes(span, accumulated_content, finish_reason, tool_calls=tool_calls)
189189

190190

191191
def _create_stream_processor(response, span, event_logger):
@@ -201,9 +201,7 @@ def _create_stream_processor(response, span, event_logger):
201201
accumulated_content += content
202202
if tool_calls_delta:
203203
_accumulate_tool_calls(accumulated_tool_calls, tool_calls_delta)
204-
for fr in chunk_finish_reasons:
205-
if fr not in accumulated_finish_reasons:
206-
accumulated_finish_reasons.append(fr)
204+
accumulated_finish_reasons.extend(chunk_finish_reasons)
207205
if chunk_usage:
208206
usage = chunk_usage
209207
yield chunk
@@ -230,9 +228,7 @@ async def _create_async_stream_processor(response, span, event_logger):
230228
accumulated_content += content
231229
if tool_calls_delta:
232230
_accumulate_tool_calls(accumulated_tool_calls, tool_calls_delta)
233-
for fr in chunk_finish_reasons:
234-
if fr not in accumulated_finish_reasons:
235-
accumulated_finish_reasons.append(fr)
231+
accumulated_finish_reasons.extend(chunk_finish_reasons)
236232
if chunk_usage:
237233
usage = chunk_usage
238234
yield chunk

packages/opentelemetry-instrumentation-groq/opentelemetry/instrumentation/groq/event_emitter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def emit_choice_events(response: ChatCompletion, event_logger):
5454
"content": choice.message.content,
5555
"role": choice.message.role or "unknown",
5656
},
57-
finish_reason=_map_groq_finish_reason(choice.finish_reason) or "",
57+
finish_reason=_map_groq_finish_reason(choice.finish_reason),
5858
tool_calls=choice.message.tool_calls or None,
5959
),
6060
event_logger=event_logger,

packages/opentelemetry-instrumentation-groq/opentelemetry/instrumentation/groq/span_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def set_model_input_attributes(span, kwargs):
161161
pass
162162

163163

164-
def set_streaming_response_attributes(span, accumulated_content, finish_reason=None, usage=None, tool_calls=None):
164+
def set_streaming_response_attributes(span, accumulated_content, finish_reason=None, tool_calls=None):
165165
"""Set gen_ai.output.messages span attribute for accumulated streaming response."""
166166
if not span.is_recording() or not should_send_prompts():
167167
return

packages/opentelemetry-instrumentation-groq/tests/traces/test_init.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,21 @@ async def test_suppression_key_skips_span(self):
360360
assert result == "async_result"
361361
tracer.start_span.assert_not_called()
362362

363+
@pytest.mark.asyncio
364+
async def test_otel_suppression_key_skips_span(self):
365+
tracer = MagicMock()
366+
wrapped = AsyncMock(return_value="async_result")
367+
wrapper = _awrap(tracer, None, None, None, None, {})
368+
369+
token = context_api.attach(context_api.set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
370+
try:
371+
result = await wrapper(wrapped, None, [], {"model": "m"})
372+
finally:
373+
context_api.detach(token)
374+
375+
assert result == "async_result"
376+
tracer.start_span.assert_not_called()
377+
363378
@pytest.mark.asyncio
364379
async def test_api_exception_records_duration_and_reraises(self):
365380
tracer = MagicMock()

0 commit comments

Comments
 (0)