Skip to content

Commit b3efc66

Browse files
fix(tls): remove strong deps (#162)
* fix(tls): remove strong deps * remove typer * fix add span attr bugs * fix bugs
1 parent b682bb2 commit b3efc66

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

veadk/integrations/ve_faas/ve_faas.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import time
1818

1919
import requests
20-
import typer
2120
import volcenginesdkcore
2221
import volcenginesdkvefaas
2322
from volcenginesdkvefaas.models.env_for_create_function_input import (
@@ -378,12 +377,7 @@ def delete(self, app_id: str):
378377
host="open.volcengineapi.com",
379378
)
380379
except Exception as e:
381-
typer.echo(
382-
typer.style(
383-
f"Delete application failed. Response: {e}",
384-
fg=typer.colors.BRIGHT_RED,
385-
)
386-
)
380+
logger.error(f"Delete application failed. Response: {e}")
387381

388382
def deploy(
389383
self,

veadk/integrations/ve_tls/ve_tls.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import os
1616

1717
from veadk.consts import DEFAULT_TLS_LOG_PROJECT_NAME, DEFAULT_TLS_TRACING_INSTANCE_NAME
18-
from veadk.integrations.ve_tls.utils import ve_tls_request
1918
from veadk.utils.logger import get_logger
2019

2120
logger = get_logger(__name__)
@@ -30,11 +29,15 @@ def __init__(
3029
):
3130
try:
3231
from volcengine.tls.TLSService import TLSService
32+
33+
from veadk.integrations.ve_tls.utils import ve_tls_request
3334
except ImportError:
3435
raise ImportError(
3536
"Please install volcengine SDK before init VeTLS: pip install volcengine"
3637
)
3738

39+
self._ve_tls_request = ve_tls_request
40+
3841
self.access_key = (
3942
access_key if access_key else os.getenv("VOLCENGINE_ACCESS_KEY", "")
4043
)
@@ -68,7 +71,7 @@ def get_project_id_by_name(self, project_name: str) -> str:
6871

6972
try:
7073
res = None
71-
res = ve_tls_request(
74+
res = self._ve_tls_request(
7275
client=self._client,
7376
api="DescribeProjects",
7477
body=request_body,
@@ -100,7 +103,7 @@ def create_log_project(self, project_name: str) -> str:
100103
"Tags": [{"Key": "provider", "Value": "VeADK"}],
101104
}
102105
try:
103-
res = ve_tls_request(
106+
res = self._ve_tls_request(
104107
client=self._client, api="CreateProject", body=request_body
105108
)
106109

@@ -123,7 +126,7 @@ def get_trace_instance_by_name(self, log_project_id: str, trace_instance_name: s
123126
"TraceInstanceName": trace_instance_name,
124127
}
125128
try:
126-
res = ve_tls_request(
129+
res = self._ve_tls_request(
127130
client=self._client,
128131
api="DescribeTraceInstances",
129132
body=request_body,
@@ -155,7 +158,7 @@ def create_tracing_instance(self, log_project_id: str, trace_instance_name: str)
155158

156159
try:
157160
res = None
158-
res = ve_tls_request(
161+
res = self._ve_tls_request(
159162
client=self._client,
160163
api="CreateTraceInstance",
161164
body=request_body,
@@ -170,7 +173,7 @@ def create_tracing_instance(self, log_project_id: str, trace_instance_name: str)
170173
)
171174

172175
# after creation, get the trace instance details
173-
res = ve_tls_request(
176+
res = self._ve_tls_request(
174177
client=self._client,
175178
api="DescribeTraceInstance",
176179
body={"TraceInstanceID": res["TraceInstanceID"]},

veadk/tracing/telemetry/telemetry.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,10 @@ def set_common_attributes_on_tool_span(current_span: _Span) -> None:
180180
if span.context.span_id == parent_span_id:
181181
common_attributes = ATTRIBUTES.get("common", {})
182182
for attr_name in common_attributes.keys():
183-
current_span.set_attribute(attr_name, span.attributes[attr_name])
183+
if hasattr(span.attributes, attr_name):
184+
current_span.set_attribute(attr_name, span.attributes[attr_name])
185+
else:
186+
logger.error(f"Parent span does not have attribute {attr_name}")
184187

185188

186189
def trace_send_data(): ...

0 commit comments

Comments
 (0)