feedback

Change-Id: I391b43bb0fb3b77ee7ec45910407116cf3f351e0
Co-developed-by: Cursor <[email protected]>

Author: Cirilla-zmh

util/opentelemetry-util-genai/README-loongsuite.rst

@@ -356,9 +356,6 @@ Token 使用:
   - ``gen_ai.memory.input.messages``: 原始记忆内容
   - ``gen_ai.memory.output.messages``: 查询结果
 
-操作结果:
-  - ``gen_ai.memory.result_count``: 操作结果中的记忆记录数量
-
 服务器信息:
   - ``server.address``: 服务器地址
   - ``server.port``: 服务器端口
@@ -398,7 +395,6 @@ Token 使用:
             {"memory_id": "mem1", "content": "用户喜欢苹果", "score": 0.95},
             {"memory_id": "mem2", "content": "用户喜欢橙子", "score": 0.88}
         ]
-        invocation.result_count = 2
 
     # 更新记忆
     invocation = MemoryInvocation(operation="update")
@@ -600,7 +596,6 @@ Token 使用:
         memory_inv.input_messages = "用户偏好：喜欢轻薄型笔记本电脑"
         
         # 执行添加记忆...
-        memory_inv.result_count = 1
 
     # 搜索记忆
     search_inv = MemoryInvocation(operation="search")
@@ -614,7 +609,6 @@ Token 使用:
         search_inv.output_messages = [
             {"memory_id": "mem1", "content": "用户偏好：喜欢轻薄型笔记本电脑", "score": 0.92}
         ]
-        search_inv.result_count = 1
 
 
 设计文档

util/opentelemetry-util-genai/src/opentelemetry/util/genai/_extended_memory/__init__.py

@@ -30,4 +30,3 @@
     "_apply_memory_finish_attributes",
     "_maybe_emit_memory_event",
 ]
-

util/opentelemetry-util-genai/src/opentelemetry/util/genai/_extended_memory/memory_types.py

@@ -19,6 +19,7 @@
 
 from opentelemetry.util.genai.types import ContextToken, Span
 
+
 def _new_str_any_dict() -> Dict[str, Any]:
     """Helper function to create a new empty dict for default factory."""
     return {}
@@ -53,8 +54,6 @@ class MemoryInvocation:
     # Memory content (optional, controlled by content capturing mode)
     input_messages: Any = None  # Original memory content
     output_messages: Any = None  # Query results
-    # Memory operation result
-    result_count: int | None = None
     # Server information
     server_address: str | None = None
     server_port: int | None = None

util/opentelemetry-util-genai/src/opentelemetry/util/genai/_extended_memory/memory_utils.py

@@ -26,10 +26,17 @@
 from opentelemetry.semconv._incubating.attributes import (
     gen_ai_attributes as GenAI,
 )
-from opentelemetry.semconv.attributes import error_attributes as ErrorAttributes
-from opentelemetry.semconv.attributes import server_attributes as ServerAttributes
+from opentelemetry.semconv.attributes import (
+    error_attributes as ErrorAttributes,
+)
+from opentelemetry.semconv.attributes import (
+    server_attributes as ServerAttributes,
+)
 from opentelemetry.trace import Span
 from opentelemetry.trace.propagation import set_span_in_context
+from opentelemetry.util.genai._extended_memory.memory_types import (
+    MemoryInvocation,
+)
 from opentelemetry.util.genai._extended_semconv.gen_ai_memory_attributes import (
     GEN_AI_MEMORY_AGENT_ID,
     GEN_AI_MEMORY_APP_ID,
@@ -42,7 +49,6 @@
     GEN_AI_MEMORY_PAGE,
     GEN_AI_MEMORY_PAGE_SIZE,
     GEN_AI_MEMORY_RERANK,
-    GEN_AI_MEMORY_RESULT_COUNT,
     GEN_AI_MEMORY_RUN_ID,
     GEN_AI_MEMORY_THRESHOLD,
     GEN_AI_MEMORY_TOP_K,
@@ -56,7 +62,7 @@
     is_experimental_mode,
     should_emit_event,
 )
-from opentelemetry.util.genai._extended_memory.memory_types import MemoryInvocation
+
 
 def _get_memory_common_attributes(
     invocation: MemoryInvocation,
@@ -156,15 +162,19 @@ def _get_memory_content_attributes(
 
     if invocation.input_messages is not None:
         if isinstance(invocation.input_messages, str):
-            attributes[GEN_AI_MEMORY_INPUT_MESSAGES] = invocation.input_messages
+            attributes[GEN_AI_MEMORY_INPUT_MESSAGES] = (
+                invocation.input_messages
+            )
         else:
             attributes[GEN_AI_MEMORY_INPUT_MESSAGES] = gen_ai_json_dumps(
                 invocation.input_messages
             )
 
     if invocation.output_messages is not None:
         if isinstance(invocation.output_messages, str):
-            attributes[GEN_AI_MEMORY_OUTPUT_MESSAGES] = invocation.output_messages
+            attributes[GEN_AI_MEMORY_OUTPUT_MESSAGES] = (
+                invocation.output_messages
+            )
         else:
             attributes[GEN_AI_MEMORY_OUTPUT_MESSAGES] = gen_ai_json_dumps(
                 invocation.output_messages
@@ -189,16 +199,16 @@ def _apply_memory_finish_attributes(
     attributes.update(_get_memory_parameter_attributes(invocation))
 
     # Recommended attributes
-    if invocation.result_count is not None:
-        attributes[GEN_AI_MEMORY_RESULT_COUNT] = invocation.result_count
     if invocation.server_address is not None:
         attributes[ServerAttributes.SERVER_ADDRESS] = invocation.server_address
     if invocation.server_port is not None:
         attributes[ServerAttributes.SERVER_PORT] = invocation.server_port
 
     # Content attributes (controlled by content capturing mode)
     # For spans, only capture if SPAN_ONLY or SPAN_AND_EVENT
-    attributes.update(_get_memory_content_attributes(invocation, for_span=True))
+    attributes.update(
+        _get_memory_content_attributes(invocation, for_span=True)
+    )
 
     # Custom attributes
     attributes.update(invocation.attributes)
@@ -228,7 +238,9 @@ def _maybe_emit_memory_event(
     attributes.update(_get_memory_parameter_attributes(invocation))
 
     # Content attributes for events (controlled by content capturing mode)
-    attributes.update(_get_memory_content_attributes(invocation, for_span=False))
+    attributes.update(
+        _get_memory_content_attributes(invocation, for_span=False)
+    )
 
     # Add error.type if operation ended in error
     if error is not None:

util/opentelemetry-util-genai/src/opentelemetry/util/genai/_extended_semconv/gen_ai_memory_attributes.py

@@ -100,12 +100,6 @@
 The query results returned from the memory operation.
 """
 
-# Memory operation result
-GEN_AI_MEMORY_RESULT_COUNT: Final = "gen_ai.memory.result_count"
-"""
-The number of memory records in the operation result.
-"""
-
 
 class GenAiMemoryOperationValues(Enum):
     """Memory operation type values."""
@@ -139,4 +133,3 @@ class GenAiMemoryOperationValues(Enum):
 
     DELETE_ALL = "delete_all"
     """Delete all memory records."""
-

util/opentelemetry-util-genai/tests/test_extended_handler.py

@@ -22,23 +22,10 @@
     OTEL_SEMCONV_STABILITY_OPT_IN,
     _OpenTelemetrySemanticConventionStability,
 )
-
-# Backward compatibility for InMemoryLogExporter -> InMemoryLogRecordExporter rename
-# Changed in [email protected]
-try:
-    from opentelemetry.sdk._logs.export import (  # pylint: disable=no-name-in-module
-        InMemoryLogRecordExporter,
-        SimpleLogRecordProcessor,
-    )
-except ImportError:
-    # Fallback to old name for compatibility with older SDK versions
-    from opentelemetry.sdk._logs.export import (
-        InMemoryLogExporter as InMemoryLogRecordExporter,
-    )
-    from opentelemetry.sdk._logs.export import (
-        SimpleLogRecordProcessor,
-    )
-
+from opentelemetry.sdk._logs.export import (  # pylint: disable=no-name-in-module
+    InMemoryLogRecordExporter,
+    SimpleLogRecordProcessor,
+)
 from opentelemetry.sdk._logs import LoggerProvider
 from opentelemetry.sdk.trace import ReadableSpan, TracerProvider
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor

util/opentelemetry-util-genai/tests/test_extended_memory.py

@@ -68,7 +68,6 @@
     GEN_AI_MEMORY_PAGE,
     GEN_AI_MEMORY_PAGE_SIZE,
     GEN_AI_MEMORY_RERANK,
-    GEN_AI_MEMORY_RESULT_COUNT,
     GEN_AI_MEMORY_RUN_ID,
     GEN_AI_MEMORY_THRESHOLD,
     GEN_AI_MEMORY_TOP_K,
@@ -83,9 +82,7 @@
 )
 
 
-def patch_env_vars(
-    stability_mode, content_capturing=None, emit_event=None
-):
+def patch_env_vars(stability_mode, content_capturing=None, emit_event=None):
     def decorator(test_case):
         env_vars = {
             OTEL_SEMCONV_STABILITY_OPT_IN: stability_mode,
@@ -202,7 +199,6 @@ def test_memory_search_with_parameters(self):
             invocation.threshold = 0.7
             invocation.rerank = True
             invocation.top_k = 5
-            invocation.result_count = 3
 
         span = _get_single_span(self.span_exporter)
         self.assertEqual(span.name, "memory_operation search")
@@ -217,7 +213,6 @@ def test_memory_search_with_parameters(self):
                 GEN_AI_MEMORY_THRESHOLD: 0.7,
                 GEN_AI_MEMORY_RERANK: True,
                 GEN_AI_MEMORY_TOP_K: 5,
-                GEN_AI_MEMORY_RESULT_COUNT: 3,
             },
         )
 
@@ -338,7 +333,6 @@ def test_memory_manual_start_and_stop(self):
 
         self.telemetry_handler.start_memory(invocation)
         assert invocation.span is not None
-        invocation.result_count = 5
         self.telemetry_handler.stop_memory(invocation)
 
         span = _get_single_span(self.span_exporter)
@@ -350,27 +344,26 @@ def test_memory_manual_start_and_stop(self):
                 GEN_AI_MEMORY_OPERATION: "search",
                 GEN_AI_MEMORY_USER_ID: "user_123",
                 GEN_AI_MEMORY_LIMIT: 20,
-                GEN_AI_MEMORY_RESULT_COUNT: 5,
             },
         )
 
     def test_memory_error_handling(self):
-        class MemoryError(RuntimeError):
+        class MemoryOperationError(RuntimeError):
             pass
 
-        with self.assertRaises(MemoryError):
+        with self.assertRaises(MemoryOperationError):
             invocation = MemoryInvocation(operation="add")
             with self.telemetry_handler.memory(invocation) as invocation:
                 invocation.user_id = "user_123"
-                raise MemoryError("Memory operation failed")
+                raise MemoryOperationError("Memory operation failed")
 
         span = _get_single_span(self.span_exporter)
         self.assertEqual(span.status.status_code, StatusCode.ERROR)
         span_attrs = _get_span_attributes(span)
         _assert_span_attributes(
             span_attrs,
             {
-                ErrorAttributes.ERROR_TYPE: MemoryError.__qualname__,
+                ErrorAttributes.ERROR_TYPE: MemoryOperationError.__qualname__,
             },
         )
 
@@ -385,7 +378,6 @@ def test_memory_with_content_capturing(self):
             invocation.user_id = "user_123"
             invocation.input_messages = "What does the user like?"
             invocation.output_messages = "The user likes apples"
-            invocation.result_count = 1
 
         span = _get_single_span(self.span_exporter)
         span_attrs = _get_span_attributes(span)
@@ -394,7 +386,8 @@ def test_memory_with_content_capturing(self):
         self.assertIn(GEN_AI_MEMORY_INPUT_MESSAGES, span_attrs)
         self.assertIn(GEN_AI_MEMORY_OUTPUT_MESSAGES, span_attrs)
         self.assertEqual(
-            span_attrs[GEN_AI_MEMORY_INPUT_MESSAGES], "What does the user like?"
+            span_attrs[GEN_AI_MEMORY_INPUT_MESSAGES],
+            "What does the user like?",
         )
         self.assertEqual(
             span_attrs[GEN_AI_MEMORY_OUTPUT_MESSAGES], "The user likes apples"
@@ -428,7 +421,6 @@ def test_memory_emits_event(self):
             invocation.agent_id = "agent_456"
             invocation.input_messages = "What does the user like?"
             invocation.output_messages = "The user likes apples"
-            invocation.result_count = 1
 
         # Check that event was emitted
         logs = self.log_exporter.get_finished_logs()
@@ -444,7 +436,9 @@ def test_memory_emits_event(self):
         # Verify event attributes
         attrs = log_record.attributes
         self.assertIsNotNone(attrs)
-        self.assertEqual(attrs[GenAI.GEN_AI_OPERATION_NAME], "memory_operation")
+        self.assertEqual(
+            attrs[GenAI.GEN_AI_OPERATION_NAME], "memory_operation"
+        )
         self.assertEqual(attrs[GEN_AI_MEMORY_OPERATION], "search")
         self.assertEqual(attrs[GEN_AI_MEMORY_USER_ID], "user_123")
         self.assertEqual(attrs[GEN_AI_MEMORY_AGENT_ID], "agent_456")
@@ -462,7 +456,6 @@ def test_memory_emits_event_and_span(self):
         with self.telemetry_handler.memory(invocation) as invocation:
             invocation.user_id = "user_123"
             invocation.input_messages = "User likes apples"
-            invocation.result_count = 1
 
         # Check span was created
         span = _get_single_span(self.span_exporter)
@@ -487,15 +480,15 @@ def test_memory_emits_event_and_span(self):
     def test_memory_emits_event_with_error(self):
         """Test that memory operation emits event with error when operation fails."""
 
-        class MemoryError(RuntimeError):
+        class MemoryOperationError(RuntimeError):
             pass
 
-        with self.assertRaises(MemoryError):
+        with self.assertRaises(MemoryOperationError):
             invocation = MemoryInvocation(operation="add")
             with self.telemetry_handler.memory(invocation) as invocation:
                 invocation.user_id = "user_123"
                 invocation.input_messages = "Test memory"
-                raise MemoryError("Memory operation failed")
+                raise MemoryOperationError("Memory operation failed")
 
         # Check event was emitted
         logs = self.log_exporter.get_finished_logs()
@@ -506,9 +499,11 @@ class MemoryError(RuntimeError):
         # Verify error attribute is present
         self.assertEqual(
             attrs[ErrorAttributes.ERROR_TYPE],
-            MemoryError.__qualname__,
+            MemoryOperationError.__qualname__,
+        )
+        self.assertEqual(
+            attrs[GenAI.GEN_AI_OPERATION_NAME], "memory_operation"
         )
-        self.assertEqual(attrs[GenAI.GEN_AI_OPERATION_NAME], "memory_operation")
 
     def test_memory_does_not_emit_event_when_disabled(self):
         """Test that memory operation does not emit event when emit_event is disabled."""
@@ -526,7 +521,6 @@ def test_memory_batch_update_operation(self):
         with self.telemetry_handler.memory(invocation) as invocation:
             invocation.user_id = "user_123"
             invocation.agent_id = "agent_456"
-            invocation.result_count = 5
 
         span = _get_single_span(self.span_exporter)
         span_attrs = _get_span_attributes(span)
@@ -536,7 +530,6 @@ def test_memory_batch_update_operation(self):
                 GEN_AI_MEMORY_OPERATION: "batch_update",
                 GEN_AI_MEMORY_USER_ID: "user_123",
                 GEN_AI_MEMORY_AGENT_ID: "agent_456",
-                GEN_AI_MEMORY_RESULT_COUNT: 5,
             },
         )
 
@@ -561,7 +554,6 @@ def test_memory_batch_delete_operation(self):
         invocation = MemoryInvocation(operation="batch_delete")
         with self.telemetry_handler.memory(invocation) as invocation:
             invocation.user_id = "user_123"
-            invocation.result_count = 3
 
         span = _get_single_span(self.span_exporter)
         span_attrs = _get_span_attributes(span)
@@ -570,7 +562,6 @@ def test_memory_batch_delete_operation(self):
             {
                 GEN_AI_MEMORY_OPERATION: "batch_delete",
                 GEN_AI_MEMORY_USER_ID: "user_123",
-                GEN_AI_MEMORY_RESULT_COUNT: 3,
             },
         )
 
@@ -618,4 +609,3 @@ def test_memory_with_json_input_output(self):
         # Should be JSON strings
         self.assertIsInstance(span_attrs[GEN_AI_MEMORY_INPUT_MESSAGES], str)
         self.assertIsInstance(span_attrs[GEN_AI_MEMORY_OUTPUT_MESSAGES], str)
-