Refactor more logic around attributes

Signed-off-by: Douglas Camata <159076+douglascamata@users.noreply.github.com>

Author: douglascamata

charts/opentelemetry-collector/examples/host-entity/rendered/configmap-agent.yaml

@@ -35,7 +35,7 @@ data:
             cx.agent.type: agent
             cx.cluster.name: test
             cx.integrationID: test
-            k8s.node.name: ${env:KUBE_NODE_NAME}
+            service.name: opentelemetry-collector
         server:
           http:
             endpoint: https://ingress.coralogix.com/opamp/v1

charts/opentelemetry-collector/examples/host-entity/rendered/daemonset.yaml

@@ -23,7 +23,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/config: d12e3e427724f4d10a9755c86f432cb1cfdb737054eff1aef13d78c59fe60a23
+        checksum/config: b5a5fb063c498596d37f8104ecc6a651b17a5572692dae540c4b81beb5ef74f1
 
       labels:
         app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/templates/_config.tpl

@@ -1028,16 +1028,10 @@ extensions:
             Authorization: "Bearer ${env:CORALOGIX_PRIVATE_KEY}"
       agent_description:
         non_identifying_attributes:
-        {{- if .Values.presets.fleetManagement.agentType }}
-          cx.agent.type: "{{.Values.presets.fleetManagement.agentType}}"
+        {{- if .Values.presets.k8sResourceAttributes.enabled }}
+          {{- include "opentelemetry-collector.k8sResourceAttributes" . | nindent 10 }}
         {{- end }}
-        {{- if .Values.presets.fleetManagement.clusterName }}
-          cx.cluster.name: "{{.Values.presets.fleetManagement.clusterName}}"
-        {{- end }}
-        {{- if .Values.presets.fleetManagement.integrationID }}
-          cx.integrationID: "{{.Values.presets.fleetManagement.integrationID}}"
-        {{- end }}
-          k8s.node.name: ${env:KUBE_NODE_NAME}
+        {{- include "opentelemetry-collector.fleetAttributes" . | nindent 10 }}
 {{- end }}
 
 {{- define "opentelemetry-collector.applyK8sResourceAttributesConfig" -}}
@@ -1050,7 +1044,7 @@ service:
   telemetry:
     resource:
 {{ include "opentelemetry-collector.k8sResourceAttributes" . | indent 6 }}
-{{ include "opentelemetry-collector.resourceAttributes" . | indent 6 }}
+{{ include "opentelemetry-collector.fleetAttributes" . | indent 6 }}
 {{- end }}
 
 {{- define "opentelemetry-collector.k8sResourceAttributes" -}}
@@ -1067,7 +1061,7 @@ k8s.node.name: ${env:KUBE_NODE_NAME}
 k8s.pod.name: ${env:KUBE_POD_NAME}
 {{- end -}}
 
-{{- define "opentelemetry-collector.resourceAttributes" -}}
+{{- define "opentelemetry-collector.fleetAttributes" -}}
 service.name: "opentelemetry-collector"
 {{- if or .Values.presets.fleetManagement.agentType .Values.presets.k8sResourceAttributes.agentType }}
 cx.agent.type: "{{.Values.presets.fleetManagement.agentType | default .Values.presets.k8sResourceAttributes.agentType}}"

charts/opentelemetry-collector/templates/configmap-supervisor.yaml

@@ -43,7 +43,7 @@ data:
         {{- if .Values.presets.k8sResourceAttributes.enabled }}
           {{- include "opentelemetry-collector.k8sResourceAttributes" . | nindent 10 }}
         {{- end }}
-        {{- include "opentelemetry-collector.resourceAttributes" . | nindent 10 }}
+        {{- include "opentelemetry-collector.fleetAttributes" . | nindent 10 }}
 
     # The storage can be used for many things:
     # - It stores configuration sent by the OpAMP server so that new collector