Skip to content

feat(genai-util): Upgrade otel semconv and api #238

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

Draft
adityamehra wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

feat(genai-util): Upgrade otel semconv and api #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a53618d
feat(util): Upgrade otel semconv and api
adityamehra Mar 24, 2026
7555c0c
feat(genai-util): Upgrade schema
adityamehra Mar 24, 2026
dcdb2d1
feat(genai-util): Pin otel api dependency
adityamehra Mar 25, 2026
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
3 changes: 0 additions & 3 deletions instrumentation-genai/opentelemetry-instrumentation-crewai/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"opentelemetry-api ~= 1.38.0.dev0",
"opentelemetry-instrumentation ~= 0.59b0.dev0",
"opentelemetry-semantic-conventions ~= 0.59b0.dev0",
"splunk-otel-util-genai>=0.1.4",
"wrapt >= 1.14.0, < 2.0.0",
]
Expand Down
3 changes: 0 additions & 3 deletions instrumentation-genai/opentelemetry-instrumentation-fastmcp/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"opentelemetry-api ~= 1.38.0.dev0",
"opentelemetry-instrumentation ~= 0.59b0.dev0",
"opentelemetry-semantic-conventions ~= 0.59b0.dev0",
"splunk-otel-util-genai>=0.1.4",
"wrapt>=1.0.0",
]
Expand Down
3 changes: 0 additions & 3 deletions instrumentation-genai/opentelemetry-instrumentation-langchain/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"opentelemetry-api ~= 1.38.0.dev0",
"opentelemetry-instrumentation ~= 0.59b0.dev0",
"opentelemetry-semantic-conventions ~= 0.59b0.dev0",
"splunk-otel-util-genai>=0.1.4",
]

Expand Down
3 changes: 0 additions & 3 deletions instrumentation-genai/opentelemetry-instrumentation-llamaindex/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"opentelemetry-api ~= 1.38.0.dev0",
"opentelemetry-instrumentation ~= 0.59b0.dev0",
"opentelemetry-semantic-conventions ~= 0.59b0.dev0",
"splunk-otel-util-genai>=0.1.4",
]

Expand Down
3 changes: 0 additions & 3 deletions instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"opentelemetry-api >= 1.37",
"opentelemetry-instrumentation >= 0.58b0",
"opentelemetry-semantic-conventions >= 0.58b0",
"splunk-otel-util-genai >= 0.1.9"
]

Expand Down
3 changes: 0 additions & 3 deletions instrumentation-genai/opentelemetry-instrumentation-openai-v2/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"opentelemetry-api >= 1.37",
"opentelemetry-instrumentation >= 0.58b0",
"opentelemetry-semantic-conventions >= 0.58b0",
"splunk-otel-util-genai >= 0.1.9"

]
Expand Down
58 changes: 54 additions & 4 deletions instrumentation-genai/opentelemetry-instrumentation-openai-v2/tests/conftest.py
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@shuningc shuningc Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change on tests setting related to version upgrade?

Copy link
Copy Markdown
Contributor Author

@adityamehra adityamehra Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's not. It's from the other PRs related to the tests, probably agent got confused.

Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,31 @@ def fixture_meter_provider(metric_reader):

@pytest.fixture(autouse=True)
def environment():
if not os.getenv("OPENAI_API_KEY"):
original_api_key = os.environ.get("OPENAI_API_KEY")
original_evals = os.environ.get(
"OTEL_INSTRUMENTATION_GENAI_EVALS_EVALUATORS"
)

if not original_api_key:
os.environ["OPENAI_API_KEY"] = "test_openai_api_key"
os.environ["OTEL_INSTRUMENTATION_GENAI_EVALS_EVALUATORS"] = "none"
setattr(genai_handler.get_telemetry_handler, "_default_handler", None)

yield

if original_api_key is None:
os.environ.pop("OPENAI_API_KEY", None)
else:
os.environ["OPENAI_API_KEY"] = original_api_key

if original_evals is None:
os.environ.pop("OTEL_INSTRUMENTATION_GENAI_EVALS_EVALUATORS", None)
else:
os.environ["OTEL_INSTRUMENTATION_GENAI_EVALS_EVALUATORS"] = (
original_evals
)

setattr(genai_handler.get_telemetry_handler, "_default_handler", None)


@pytest.fixture
Expand All @@ -102,7 +125,7 @@ def async_openai_client():
return AsyncOpenAI()


@pytest.fixture(scope="module")
@pytest.fixture(scope="function")
def vcr_config():
return {
"filter_headers": [
Expand All @@ -113,9 +136,15 @@ def vcr_config():
],
"decode_compressed_response": True,
"before_record_response": scrub_response_headers,
"serializer": "yaml",
}


@pytest.fixture(scope="session")
def vcr_cassette_dir():
return os.path.join(os.path.dirname(__file__), "cassettes")


@pytest.fixture(scope="function")
def instrument_no_content(tracer_provider, logger_provider, meter_provider):
os.environ.update(
Expand Down Expand Up @@ -260,9 +289,30 @@ def deserialize(cassette_string):
return yaml.load(cassette_string, Loader=yaml.Loader)


@pytest.fixture(scope="module", autouse=True)
try: # pragma: no cover - optional pytest-vcr dependency
import pytest_recording # type: ignore # noqa: F401
import vcr as vcr_module # type: ignore # noqa: F401

# Register custom YAML serializer globally
vcr_module.VCR().register_serializer("yaml", PrettyPrintJSONBody)

except (
ModuleNotFoundError
): # pragma: no cover - provide stub when plugin missing

@pytest.fixture(name="vcr", scope="module")
def _noop_vcr_fixture():
class _VCRStub:
def register_serializer(self, *_args, **_kwargs):
return None

return _VCRStub()


@pytest.fixture(scope="function", autouse=True)
def fixture_vcr(vcr):
vcr.register_serializer("yaml", PrettyPrintJSONBody)
# When pytest-recording is installed, vcr is a Cassette and we don't need to do anything
# The serializer is already registered on the VCR module above
return vcr


Expand Down
6 changes: 3 additions & 3 deletions instrumentation-genai/opentelemetry-instrumentation-weaviate/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"opentelemetry-api ~= 1.38.0.dev0",
"opentelemetry-instrumentation ~= 0.59b0.dev0",
"opentelemetry-semantic-conventions ~= 0.59b0.dev0",
"opentelemetry-instrumentation ~= 0.60b1",
"opentelemetry-semantic-conventions ~= 0.60b1",
"opentelemetry-api == 1.39.1",
]

[project.optional-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions util/opentelemetry-util-genai/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"opentelemetry-instrumentation ~= 0.57b0",
"opentelemetry-semantic-conventions ~= 0.57b0",
"opentelemetry-api>=1.31.0",
"opentelemetry-instrumentation ~= 0.60b1",
"opentelemetry-semantic-conventions ~= 0.60b1",
"opentelemetry-api ~= 1.39.0",
]

[project.entry-points.opentelemetry_genai_upload_hook]
Expand Down
6 changes: 3 additions & 3 deletions util/opentelemetry-util-genai/src/opentelemetry/util/genai/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,22 +320,22 @@ def __init__(
__name__,
__version__,
tracer_provider,
schema_url=Schemas.V1_37_0.value,
schema_url=Schemas.V1_38_0.value,
)

# Logger for content events (uses Logs API, not Events API)
self._content_logger: Logger = get_logger(
__name__,
__version__,
logger_provider=logger_provider,
schema_url=Schemas.V1_37_0.value,
schema_url=Schemas.V1_38_0.value,
)
self._meter_provider = meter_provider
meter = get_meter(
__name__,
__version__,
meter_provider=meter_provider,
schema_url=Schemas.V1_37_0.value,
schema_url=Schemas.V1_38_0.value,
)

self._event_logger = _otel_events.get_event_logger(__name__)
Expand Down
Loading