From ea44bbfef3f83ab7a315c9f3a4b451a8939a8baf Mon Sep 17 00:00:00 2001 From: Nicolas Date: Wed, 30 Jul 2025 09:42:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Ddevsvc=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1OpenTelemetry=E9=85=8D=E7=BD=AE=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修复transform处理器中访问不存在log.attributes字段的问题 - 将配置更新为与其他服务一致的格式 - 确保ArgoCD能够成功同步devsvc服务配置 --- .../devsvc/templates/devsvc/opentelemetry.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml index 687b5edf..f148ea00 100644 --- a/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml +++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/opentelemetry.yaml @@ -86,11 +86,16 @@ spec: - set(resource.attributes["kubernetes_pod_ip"], resource.attributes["k8s.pod.ip"]) - set(resource.attributes["kubernetes_deployment_name"], resource.attributes["k8s.deployment.name"]) - set(resource.attributes["kubernetes_namespace"], resource.attributes["k8s.namespace.name"]) - - set(resource.attributes["log_level"], log.attributes["level"]) - - set(resource.attributes["log_timestamp"], log.attributes["timestamp"]) - - set(resource.attributes["log_text"], log.attributes["text"]) - - set(resource.attributes["log_fields"], log.attributes["fields"]) - - set(resource.attributes["log_context"], log.attributes["context"]) + - set(resource.attributes["body_json"], ParseJSON(log.body)) + - set(resource.attributes["body_json"]["kubernetes"]["pod"], resource.attributes["k8s.pod.name"]) + - set(resource.attributes["body_json"]["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"]) + - set(resource.attributes["body_json"]["kubernetes"]["pod_ip"], resource.attributes["k8s.pod.ip"]) + - set(resource.attributes["body_json"]["kubernetes"]["pod_uid"], resource.attributes["k8s.pod.uid"]) + - set(resource.attributes["body_json"]["kubernetes"]["deployment"], resource.attributes["k8s.deployment.name"]) + - set(resource.attributes["body_json"]["kubernetes"]["node"], resource.attributes["k8s.node.name"]) + - set(resource.attributes["body_json"]["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"]) + - set(log.body, resource.attributes["body_json"]) + - delete_key(resource.attributes, "body_json") batch: send_batch_size: 5 timeout: 10s