From 200309b5382612905404797abf891156ed1410f2 Mon Sep 17 00:00:00 2001 From: "fangyaozheng@bytedance.com" Date: Fri, 12 Sep 2025 12:21:26 +0800 Subject: [PATCH 1/4] fix(tls): remove strong deps --- veadk/integrations/ve_tls/ve_tls.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/veadk/integrations/ve_tls/ve_tls.py b/veadk/integrations/ve_tls/ve_tls.py index f9c42ac3..bf0e824a 100644 --- a/veadk/integrations/ve_tls/ve_tls.py +++ b/veadk/integrations/ve_tls/ve_tls.py @@ -15,7 +15,6 @@ import os from veadk.consts import DEFAULT_TLS_LOG_PROJECT_NAME, DEFAULT_TLS_TRACING_INSTANCE_NAME -from veadk.integrations.ve_tls.utils import ve_tls_request from veadk.utils.logger import get_logger logger = get_logger(__name__) @@ -30,11 +29,15 @@ def __init__( ): try: from volcengine.tls.TLSService import TLSService + + from veadk.integrations.ve_tls.utils import ve_tls_request except ImportError: raise ImportError( "Please install volcengine SDK before init VeTLS: pip install volcengine" ) + self._ve_tls_request = ve_tls_request + self.access_key = ( access_key if access_key else os.getenv("VOLCENGINE_ACCESS_KEY", "") ) @@ -68,7 +71,7 @@ def get_project_id_by_name(self, project_name: str) -> str: try: res = None - res = ve_tls_request( + res = self._ve_tls_request( client=self._client, api="DescribeProjects", body=request_body, @@ -100,7 +103,7 @@ def create_log_project(self, project_name: str) -> str: "Tags": [{"Key": "provider", "Value": "VeADK"}], } try: - res = ve_tls_request( + res = self._ve_tls_request( client=self._client, api="CreateProject", body=request_body ) @@ -123,7 +126,7 @@ def get_trace_instance_by_name(self, log_project_id: str, trace_instance_name: s "TraceInstanceName": trace_instance_name, } try: - res = ve_tls_request( + res = self._ve_tls_request( client=self._client, api="DescribeTraceInstances", body=request_body, @@ -155,7 +158,7 @@ def create_tracing_instance(self, log_project_id: str, trace_instance_name: str) try: res = None - res = ve_tls_request( + res = self._ve_tls_request( client=self._client, api="CreateTraceInstance", body=request_body, @@ -170,7 +173,7 @@ def create_tracing_instance(self, log_project_id: str, trace_instance_name: str) ) # after creation, get the trace instance details - res = ve_tls_request( + res = self._ve_tls_request( client=self._client, api="DescribeTraceInstance", body={"TraceInstanceID": res["TraceInstanceID"]}, From 7667127ddd9766d33020f5436db6d149fedf4a1a Mon Sep 17 00:00:00 2001 From: "fangyaozheng@bytedance.com" Date: Fri, 12 Sep 2025 12:27:06 +0800 Subject: [PATCH 2/4] remove typer --- veadk/integrations/ve_faas/ve_faas.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/veadk/integrations/ve_faas/ve_faas.py b/veadk/integrations/ve_faas/ve_faas.py index 70cf45fd..aee36f8c 100644 --- a/veadk/integrations/ve_faas/ve_faas.py +++ b/veadk/integrations/ve_faas/ve_faas.py @@ -17,7 +17,6 @@ import time import requests -import typer import volcenginesdkcore import volcenginesdkvefaas from volcenginesdkvefaas.models.env_for_create_function_input import ( @@ -378,12 +377,7 @@ def delete(self, app_id: str): host="open.volcengineapi.com", ) except Exception as e: - typer.echo( - typer.style( - f"Delete application failed. Response: {e}", - fg=typer.colors.BRIGHT_RED, - ) - ) + logger.error(f"Delete application failed. Response: {e}") def deploy( self, From 86186cbf20f420a5eecfbabae29350a3260c0059 Mon Sep 17 00:00:00 2001 From: "fangyaozheng@bytedance.com" Date: Fri, 12 Sep 2025 15:43:02 +0800 Subject: [PATCH 3/4] fix add span attr bugs --- veadk/tracing/telemetry/telemetry.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/veadk/tracing/telemetry/telemetry.py b/veadk/tracing/telemetry/telemetry.py index 3f882f4e..73397438 100644 --- a/veadk/tracing/telemetry/telemetry.py +++ b/veadk/tracing/telemetry/telemetry.py @@ -180,7 +180,12 @@ def set_common_attributes_on_tool_span(current_span: _Span) -> None: if span.context.span_id == parent_span_id: common_attributes = ATTRIBUTES.get("common", {}) for attr_name in common_attributes.keys(): - current_span.set_attribute(attr_name, span.attributes[attr_name]) + if hasattr(span.attributes, attr_name): + current_span.set_attribute(attr_name, span.attributes[attr_name]) + else: + logger.error( + f"Parent span {span.name} does not have attribute {attr_name}" + ) def trace_send_data(): ... From 22c425b0a1f6e3f14e3e80e1c473e11e7fd40078 Mon Sep 17 00:00:00 2001 From: "fangyaozheng@bytedance.com" Date: Fri, 12 Sep 2025 15:46:25 +0800 Subject: [PATCH 4/4] fix bugs --- veadk/tracing/telemetry/telemetry.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/veadk/tracing/telemetry/telemetry.py b/veadk/tracing/telemetry/telemetry.py index 73397438..68d2e586 100644 --- a/veadk/tracing/telemetry/telemetry.py +++ b/veadk/tracing/telemetry/telemetry.py @@ -183,9 +183,7 @@ def set_common_attributes_on_tool_span(current_span: _Span) -> None: if hasattr(span.attributes, attr_name): current_span.set_attribute(attr_name, span.attributes[attr_name]) else: - logger.error( - f"Parent span {span.name} does not have attribute {attr_name}" - ) + logger.error(f"Parent span does not have attribute {attr_name}") def trace_send_data(): ...