Depend on util-genai helpers

Author: nagkumar91

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/pyproject.toml

@@ -26,7 +26,8 @@ classifiers = [
 dependencies = [
   "opentelemetry-api >= 1.37",
   "opentelemetry-instrumentation >= 0.58b0",
-  "opentelemetry-semantic-conventions >= 0.58b0"
+  "opentelemetry-semantic-conventions >= 0.58b0",
+  "opentelemetry-util-genai"
 ]
 
 [project.optional-dependencies]

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/src/opentelemetry/instrumentation/openai_agents/span_processor.py

@@ -15,21 +15,14 @@
 from __future__ import annotations
 
 import importlib
-import json
 import logging
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Dict, Iterator, Optional, Sequence
 from urllib.parse import urlparse
 
-try:  # pragma: no cover - optional dependency
-    from opentelemetry.util.genai.utils import gen_ai_json_dumps
-except Exception:  # pragma: no cover - fallback when util not available
-
-    def gen_ai_json_dumps(value: Any) -> str:
-        return json.dumps(value, ensure_ascii=False, default=str)
-
+from opentelemetry.util.genai.utils import gen_ai_json_dumps
 
 try:
     from agents.tracing import Span, Trace, TracingProcessor

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/tests/conftest.py

@@ -11,6 +11,7 @@
 for path in (
     PROJECT_ROOT / "opentelemetry-instrumentation" / "src",
     GENAI_ROOT / "src",
+    PROJECT_ROOT / "util" / "opentelemetry-util-genai" / "src",
     REPO_ROOT / "openai_agents_lib",
     REPO_ROOT / "openai_lib",
     TESTS_ROOT / "stubs",

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/tests/stubs/wrapt.py

@@ -0,0 +1,17 @@
+class ObjectProxy:
+    """Minimal stand-in for wrapt.ObjectProxy used in tests."""
+
+    def __init__(self, wrapped):
+        self.__wrapped__ = wrapped
+
+    def __getattr__(self, item):
+        return getattr(self.__wrapped__, item)
+
+    def __setattr__(self, key, value):
+        if key == "__wrapped__":
+            super().__setattr__(key, value)
+        else:
+            setattr(self.__wrapped__, key, value)
+
+    def __call__(self, *args, **kwargs):
+        return self.__wrapped__(*args, **kwargs)

instrumentation-genai/opentelemetry-instrumentation-openai-agents-v2/tests/test_z_span_processor_unit.py

@@ -114,10 +114,8 @@ class Fallback:
         def __str__(self) -> str:
             return "fallback"
 
-    assert sp.safe_json_dumps({"foo": "bar"}) == json.dumps(
-        {"foo": "bar"}, ensure_ascii=False, default=str
-    )
-    assert json.loads(sp.safe_json_dumps(Fallback())) == "fallback"
+    assert sp.safe_json_dumps({"foo": "bar"}) == '{"foo":"bar"}'
+    assert sp.safe_json_dumps(Fallback()) == "fallback"
 
 
 def test_infer_server_attributes_variants(monkeypatch):