Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions veadk/integrations/ve_faas/ve_faas.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import time

import requests
import typer
import volcenginesdkcore
import volcenginesdkvefaas
from volcenginesdkvefaas.models.env_for_create_function_input import (
Expand Down Expand Up @@ -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,
Expand Down
15 changes: 9 additions & 6 deletions veadk/integrations/ve_tls/ve_tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand All @@ -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", "")
)
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
)

Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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"]},
Expand Down
5 changes: 4 additions & 1 deletion veadk/tracing/telemetry/telemetry.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,10 @@ 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 does not have attribute {attr_name}")


def trace_send_data(): ...
Expand Down