-
Notifications
You must be signed in to change notification settings - Fork 642
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.
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
Add common gen AI utils into opentelemetry-instrumentation #3188
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,53 @@ | ||||||||||||||||||||
# Copyright The OpenTelemetry Authors | ||||||||||||||||||||
# | ||||||||||||||||||||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||||||||||||||||||||
# you may not use this file except in compliance with the License. | ||||||||||||||||||||
# You may obtain a copy of the License at | ||||||||||||||||||||
# | ||||||||||||||||||||
# http://www.apache.org/licenses/LICENSE-2.0 | ||||||||||||||||||||
# | ||||||||||||||||||||
# Unless required by applicable law or agreed to in writing, software | ||||||||||||||||||||
# distributed under the License is distributed on an "AS IS" BASIS, | ||||||||||||||||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||||||||||||||||
# See the License for the specific language governing permissions and | ||||||||||||||||||||
# limitations under the License. | ||||||||||||||||||||
|
||||||||||||||||||||
from os import environ | ||||||||||||||||||||
from typing import Mapping | ||||||||||||||||||||
|
||||||||||||||||||||
from opentelemetry.semconv._incubating.attributes import ( | ||||||||||||||||||||
gen_ai_attributes as GenAIAttributes, | ||||||||||||||||||||
) | ||||||||||||||||||||
from opentelemetry.semconv.attributes import ( | ||||||||||||||||||||
error_attributes as ErrorAttributes, | ||||||||||||||||||||
) | ||||||||||||||||||||
from opentelemetry.trace import Span | ||||||||||||||||||||
from opentelemetry.trace.status import Status, StatusCode | ||||||||||||||||||||
from opentelemetry.util.types import AttributeValue | ||||||||||||||||||||
|
||||||||||||||||||||
OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT = ( | ||||||||||||||||||||
"OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT" | ||||||||||||||||||||
) | ||||||||||||||||||||
|
||||||||||||||||||||
|
||||||||||||||||||||
def is_content_enabled() -> bool: | ||||||||||||||||||||
capture_content = environ.get( | ||||||||||||||||||||
OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT, "false" | ||||||||||||||||||||
) | ||||||||||||||||||||
|
||||||||||||||||||||
return capture_content.lower() == "true" | ||||||||||||||||||||
|
||||||||||||||||||||
|
||||||||||||||||||||
def get_span_name(span_attributes: Mapping[str, AttributeValue]) -> str: | ||||||||||||||||||||
name = span_attributes.get(GenAIAttributes.GEN_AI_OPERATION_NAME, "") | ||||||||||||||||||||
model = span_attributes.get(GenAIAttributes.GEN_AI_REQUEST_MODEL, "") | ||||||||||||||||||||
return f"{name} {model}" | ||||||||||||||||||||
|
||||||||||||||||||||
|
||||||||||||||||||||
def handle_span_exception(span: Span, error: Exception) -> None: | ||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe
Suggested change
? we're not handling anything, right? BTW - there is nothing gen-ai specific here, should we move it to common instrumentation helpers? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Tbh I'm kind of just mechanically copying from openai-v2: Lines 232 to 238 in a716949
Actually, the API/SDK has a mechanism here when used in cc @lzchen @alizenhom do you know why OpenAI doesn't just use the existing mechanism? |
||||||||||||||||||||
span.set_status(Status(StatusCode.ERROR, str(error))) | ||||||||||||||||||||
lmolkova marked this conversation as resolved.
Show resolved
Hide resolved
|
||||||||||||||||||||
if span.is_recording(): | ||||||||||||||||||||
span.set_attribute( | ||||||||||||||||||||
ErrorAttributes.ERROR_TYPE, type(error).__qualname__ | ||||||||||||||||||||
) | ||||||||||||||||||||
span.end() |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
# Copyright The OpenTelemetry Authors | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from unittest.mock import patch | ||
|
||
from opentelemetry.instrumentation.genai_utils import ( | ||
OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT, | ||
get_span_name, | ||
handle_span_exception, | ||
is_content_enabled, | ||
) | ||
from opentelemetry.sdk.trace import ReadableSpan | ||
from opentelemetry.test.test_base import TestBase | ||
from opentelemetry.trace.status import StatusCode | ||
|
||
|
||
class MyTestException(Exception): | ||
pass | ||
|
||
|
||
class TestGenaiUtils(TestBase): | ||
@patch.dict( | ||
"os.environ", | ||
{}, | ||
) | ||
def test_is_content_enabled_default(self): | ||
self.assertFalse(is_content_enabled()) | ||
|
||
def test_is_content_enabled_true(self): | ||
for env_value in "true", "TRUE", "True", "tRue": | ||
with patch.dict( | ||
"os.environ", | ||
{ | ||
OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT: env_value | ||
}, | ||
): | ||
self.assertTrue(is_content_enabled()) | ||
|
||
def test_is_content_enabled_false(self): | ||
for env_value in "false", "FALSE", "False", "fAlse": | ||
with patch.dict( | ||
"os.environ", | ||
{ | ||
OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT: env_value | ||
}, | ||
): | ||
self.assertFalse(is_content_enabled()) | ||
|
||
def test_get_span_name(self): | ||
span_attributes = { | ||
"gen_ai.operation.name": "chat", | ||
"gen_ai.request.model": "mymodel", | ||
} | ||
self.assertEqual(get_span_name(span_attributes), "chat mymodel") | ||
|
||
span_attributes = { | ||
"gen_ai.operation.name": "chat", | ||
} | ||
self.assertEqual(get_span_name(span_attributes), "chat ") | ||
|
||
span_attributes = { | ||
"gen_ai.request.model": "mymodel", | ||
} | ||
self.assertEqual(get_span_name(span_attributes), " mymodel") | ||
|
||
span_attributes = {} | ||
self.assertEqual(get_span_name(span_attributes), " ") | ||
|
||
def test_handle_span_exception(self): | ||
tracer = self.tracer_provider.get_tracer("test_handle_span_exception") | ||
with tracer.start_as_current_span("foo") as span: | ||
handle_span_exception(span, MyTestException()) | ||
|
||
self.assertEqual(len(self.get_finished_spans()), 1) | ||
finished_span: ReadableSpan = self.get_finished_spans()[0] | ||
self.assertEqual(finished_span.name, "foo") | ||
self.assertIs(finished_span.status.status_code, StatusCode.ERROR) | ||
self.assertEqual( | ||
finished_span.attributes["error.type"], "MyTestException" | ||
) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
model name is not always available, we should return
name
in this case