update attributes

Author: yaozheng-fang

veadk/integrations/ve_faas/template/{{cookiecutter.local_dir_name}}/src/app.py

@@ -70,9 +70,7 @@ def load_tracer() -> None:
             else:
                 exporters.append(exporter_cls())
 
-    tracer = OpentelemetryTracer(
-        name="veadk_tracer", app_name=agent_run_config.app_name, exporters=exporters
-    )
+    tracer = OpentelemetryTracer(name="veadk_tracer", exporters=exporters)
     agent_run_config.agent.tracers.extend([tracer])
 
 

veadk/tracing/telemetry/attributes/extractors/llm_attributes_extractors.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import json
+from xml.etree.ElementTree import VERSION
 
 from veadk.tracing.telemetry.attributes.extractors.types import (
     ExtractorResponse,
@@ -359,6 +360,12 @@ def llm_gen_ai_choice(params: LLMAttributesParams) -> ExtractorResponse:
     return ExtractorResponse(type="event", content=message)
 
 
+def llm_openinference_instrumentation_veadk(
+    params: LLMAttributesParams,
+) -> ExtractorResponse:
+    return ExtractorResponse(content=VERSION)
+
+
 LLM_ATTRIBUTES = {
     "gen_ai.request.model": llm_gen_ai_request_model,
     "gen_ai.request.type": llm_gen_ai_request_type,
@@ -381,4 +388,5 @@ def llm_gen_ai_choice(params: LLMAttributesParams) -> ExtractorResponse:
     "gen_ai.user.message": llm_gen_ai_user_message,
     "gen_ai.assistant.message": llm_gen_ai_assistant_message,
     "gen_ai.choice": llm_gen_ai_choice,
+    "openinference.instrumentation.veadk": llm_openinference_instrumentation_veadk,
 }

veadk/tracing/telemetry/attributes/extractors/tool_attributes_extractors.py

@@ -39,17 +39,27 @@ def tool_gen_ai_tool_message(params: ToolAttributesParams) -> ExtractorResponse:
     return ExtractorResponse(type="event", content=tool_input)
 
 
-# def tool_gen_ai_tool_message(params: ToolAttributesParams) -> ExtractorResponse:
-#     # tool_output = {
-#     #     "id": params.function_response_event.,
-#     #     "name": ...,
-#     #     "response": ...,
-#     # }
-#     print(params.function_response_event)
-#     # return ExtractorResponse(content=json.dumps(tool_output) or "<unknown_tool_output>")
+def tool_cozeloop_input(params: ToolAttributesParams) -> ExtractorResponse:
+    tool_input = {
+        "name": params.tool.name,
+        "description": params.tool.description,
+        "parameters": params.args,
+    }
+    return ExtractorResponse(content=json.dumps(tool_input) or "<unknown_tool_input>")
+
+
+def tool_cozeloop_output(params: ToolAttributesParams) -> ExtractorResponse:
+    function_response = params.function_response_event.get_function_responses()[0]
+    tool_output = {
+        "id": function_response.id,
+        "name": function_response.name,
+        "response": function_response.response,
+    }
+    return ExtractorResponse(content=json.dumps(tool_output) or "<unknown_tool_output>")
 
 
 TOOL_ATTRIBUTES = {
     "gen_ai.operation.name": tool_gen_ai_operation_name,
-    "gen_ai.tool.message": tool_gen_ai_tool_message,
+    "cozeloop.input": tool_cozeloop_input,  # CozeLoop required
+    "cozeloop.output": tool_cozeloop_output,  # CozeLoop required
 }

veadk/tracing/telemetry/exporters/apmplus_exporter.py

@@ -83,7 +83,7 @@ def _init_meter_uploader(self, exporter_id: str) -> MeterUploader:
             endpoint=self.config.endpoint, headers=self.headers
         )
         metric_reader = PeriodicExportingMetricReader(exporter)
-        # set provider
+
         metrics_api.set_meter_provider(
             metrics_sdk.MeterProvider(metric_readers=[metric_reader], resource=resource)
         )

veadk/tracing/telemetry/metrics/opentelemetry_metrics.py

@@ -11,7 +11,8 @@
 # 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 google.adk.models import LlmResponse
+
+from google.adk.models.llm_response import LlmResponse
 from opentelemetry import metrics
 from opentelemetry.metrics._internal import Meter
 

veadk/tracing/telemetry/telemetry.py

@@ -33,12 +33,17 @@
 logger = get_logger(__name__)
 
 
-def upload_metrics(invocation_context: InvocationContext, llm_response: LlmResponse):
-    tracers = invocation_context.agent.tracers
-    for tracer in tracers:
-        for exporter in getattr(tracer, "exporters", []):
-            if getattr(exporter, "meter_uploader", None):
-                exporter.meter_uploader.record(llm_response)
+def upload_metrics(
+    invocation_context: InvocationContext, llm_response: LlmResponse
+) -> None:
+    from veadk.agent import Agent
+
+    if isinstance(invocation_context.agent, Agent):
+        tracers = invocation_context.agent.tracers
+        for tracer in tracers:
+            for exporter in getattr(tracer, "exporters", []):
+                if getattr(exporter, "meter_uploader", None):
+                    exporter.meter_uploader.record(llm_response)
 
 
 def trace_send_data(): ...
@@ -139,5 +144,4 @@ def trace_call_llm(
         response: ExtractorResponse = attr_extractor(params)
         ExtractorResponse.update_span(span, attr_name, response)
 
-    # Report meter
     upload_metrics(invocation_context, llm_response)