From ebeea26864a45fc6d1c9d364e11752f5b967cd48 Mon Sep 17 00:00:00 2001 From: zhenyus Date: Mon, 21 Apr 2025 20:01:45 +0800 Subject: [PATCH] fix(opentelemetry): enhance log body processing by restructuring Kubernetes attributes handling Signed-off-by: zhenyus --- .../authentication/opentelemetry.yaml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml index 927b2fa2..f3660b61 100644 --- a/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml +++ b/freeleaps/helm-pkg/authentication/templates/authentication/opentelemetry.yaml @@ -85,14 +85,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(log.body["kubernetes"]["pod"], resource.attributes["k8s.pod.name"]) - - set(log.body["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"]) - - set(log.body["kubernetes"]["pod_ip"], resource.attributes["k8s.pod.ip"]) - - set(log.body["kubernetes"]["pod_uid"], resource.attributes["k8s.pod.uid"]) - - set(log.body["kubernetes"]["deployment"], resource.attributes["k8s.deployment.name"]) - - set(log.body["kubernetes"]["node"], resource.attributes["k8s.node.name"]) - - set(log.body["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"]) - batch: + - 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, String(merge_maps(ParseJSON(log.body), resource.attributes["body_json"], "upsert"))) + - delete_key(resource.attributes, "body_json") send_batch_size: 5 timeout: 10s exporters: