Restore values of service.name resource attribute

The value of `service.name` resource attribute was changed to `otelcol` in version 0.120.0 due to a library upgrade in the Prometheus receiver. This change restores the values that were set before the based on the collector mode: `otel-agent`, `otel-collector` or `otel-k8s-cluster-receiver`.

Author: dmitryax

.chloggen/restore-service-name-values.yaml

@@ -0,0 +1,15 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+# The name of the component, or a single word describing the area of concern, (e.g. agent, clusterReceiver, gateway, operator, chart, other)
+component: all
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Restore values of `service.name` resource attribute for internal metrics changed in 0.120.0"
+# One or more tracking issues related to the change
+issues: [1692]
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  The value of `service.name` resource attribute was changed to `otelcol` due to a library upgrade 
+  in the Prometheus receiver. This change restores the values that were set before the based on the
+  collector mode: `otel-agent`, `otel-collector` or `otel-k8s-cluster-receiver`.

examples/add-filter-processor/rendered_manifests/configmap-agent.yaml

@@ -504,3 +504,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/add-filter-processor/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/add-filter-processor/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: bb0569318e2bd629678bb47f463e2af6290909306a1cc22fd536614206ecc4cb
+        checksum/config: 88a61f772a830d7b57eff3b987ad81767b8d308fa5e7c085269290ab11e61f2f
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/add-kafkametrics-receiver/rendered_manifests/configmap-agent.yaml

@@ -454,3 +454,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/add-kafkametrics-receiver/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/add-kafkametrics-receiver/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 87dfed92a17c2c4fde4c5074e9367b461a13eec19a30615415dd43e0b495af20
+        checksum/config: ca2b22ef8f9466d7111bbad9daeed320335577ba85fd97d2d0beac8f4cbcd684
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/add-kafkametrics-receiver/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/add-receiver-creator/rendered_manifests/configmap-agent.yaml

@@ -332,3 +332,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/add-receiver-creator/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/add-receiver-creator/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 1dc9bae1dbf9b66d7e05ce5335b27944d45a28af7df54c2ed30b9c995c78c82c
+        checksum/config: d0aea86f9a62115d00707bdc1ff000ef11b851e12cae92295bc42c35f5c459c8
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/add-sampler/rendered_manifests/configmap-agent.yaml

@@ -321,3 +321,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/add-sampler/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/add-sampler/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 152c52ad8af64b715e6d2b673a73ede2c2efde5677a10cbbb40c0ddbb19c28a2
+        checksum/config: 5e2f822c7db380709011a3df11ea21d4ded6ca72af2f0b19debb813f9a840aa1
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/autodetect-istio/rendered_manifests/configmap-agent.yaml

@@ -496,3 +496,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/autodetect-istio/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/autodetect-istio/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: d9f18e3f656d7db7f250d4a02bebb8b14b7e074914e989a568eb7617ab3f08ba
+        checksum/config: 2090721bf75a3bd5b7319ff2af77539bc870aa0a4cfab743873f9a975e52c384
         kubectl.kubernetes.io/default-container: otel-collector
         sidecar.istio.io/inject: "false"
     spec:

examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
         sidecar.istio.io/inject: "false"
     spec:
       serviceAccountName: default-splunk-otel-collector

examples/collector-agent-only/rendered_manifests/configmap-agent.yaml

@@ -317,3 +317,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/collector-agent-only/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 2b785f4900df0628c3f854329cbf7d6fb4875d1a0d0646bf01f078241d826e19
+        checksum/config: 48ec2739d8647831f778aad2724f3f4211b477dec23a232688d5c72689e97438
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/collector-all-modes/rendered_manifests/configmap-agent.yaml

@@ -301,3 +301,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/collector-all-modes/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/collector-all-modes/rendered_manifests/configmap-gateway.yaml

@@ -228,3 +228,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-collector

examples/collector-all-modes/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 4e4fa9c1ad7feedf306c00d1dafbb6ec4e3aa6d220d53f89024d14e0a2e1067a
+        checksum/config: d2aeb58870e725f513fe356de0bd0e81fbf422bd3f093ca037563887f1a733d7
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 82e349a132b20f4c21cca4d3baaa8cfbbf9f46ed942f18c20d9d4dac81737b36
+        checksum/config: 05c65d695f8db76b3ee175a9c1ac46a3fef39a122004d280cadcd16dcb1ed42d
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/collector-cluster-receiver-only/rendered_manifests/configmap-cluster-receiver.yaml

@@ -184,3 +184,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 2375bfaa6874fa298f691f0a636a7be034b68e541a3ce507adc885d6c31fae99
+        checksum/config: c1519af3592effec9d730342c24b83201af65992aa06d5dee3b88f7556369316
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/collector-gateway-only/rendered_manifests/configmap-gateway.yaml

@@ -228,3 +228,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-collector

examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-collector
         release: default
       annotations:
-        checksum/config: 82e349a132b20f4c21cca4d3baaa8cfbbf9f46ed942f18c20d9d4dac81737b36
+        checksum/config: 05c65d695f8db76b3ee175a9c1ac46a3fef39a122004d280cadcd16dcb1ed42d
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/controlplane-histogram-metrics/rendered_manifests/configmap-agent.yaml

@@ -357,3 +357,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/controlplane-histogram-metrics/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/controlplane-histogram-metrics/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 281b7a13c07e6ba3441a3df5f2c17c246267f369e4ca058b8557728655459f5f
+        checksum/config: e758be4c0afe277ae4444d457a95962e1e933dead3b751c4aef99984b229172d
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/controlplane-histogram-metrics/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/crio-logging/rendered_manifests/configmap-agent.yaml

@@ -317,3 +317,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/crio-logging/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/crio-logging/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 2b785f4900df0628c3f854329cbf7d6fb4875d1a0d0646bf01f078241d826e19
+        checksum/config: 48ec2739d8647831f778aad2724f3f4211b477dec23a232688d5c72689e97438
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/default/rendered_manifests/configmap-agent.yaml

@@ -317,3 +317,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/default/rendered_manifests/configmap-cluster-receiver.yaml

@@ -130,3 +130,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/default/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: 2b785f4900df0628c3f854329cbf7d6fb4875d1a0d0646bf01f078241d826e19
+        checksum/config: 48ec2739d8647831f778aad2724f3f4211b477dec23a232688d5c72689e97438
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/default/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: 91987f4db922dfbd2abeb6d5d1600511b4725f6eaa914bc51a77ee747bbcf028
+        checksum/config: 6777488399676ecd220543e6fd3520f980bc3af2add4d3fb5bd7311a41747738
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/disable-persistence-queue-traces/rendered_manifests/configmap-agent.yaml

@@ -537,3 +537,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent

examples/disable-persistence-queue-traces/rendered_manifests/configmap-cluster-receiver.yaml

@@ -176,3 +176,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-k8s-cluster-receiver

examples/disable-persistence-queue-traces/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: c646df94e4d08caf3d44b7eb44febf333bad5d93d5c1a276c6fb679ce28dd6c4
+        checksum/config: 0d57932a5bd2bdd4f08fd8b27d767fd9f601f1c36d342cd2502116ec2eab2076
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/disable-persistence-queue-traces/rendered_manifests/deployment-cluster-receiver.yaml

@@ -31,7 +31,7 @@ spec:
         component: otel-k8s-cluster-receiver
         release: default
       annotations:
-        checksum/config: bfb8def17eb3be631bf0aeb4881eaafac6a654f928d2e03200eb952a9888a16a
+        checksum/config: f139a99aea7cfbfdd9d7d34a58aec68562300ec6101d50df06f36ecdd309bbce
     spec:
       serviceAccountName: default-splunk-otel-collector
       nodeSelector:

examples/discovery-mode/rendered_manifests/configmap-agent.yaml

@@ -317,6 +317,8 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent
   discovery.properties: |
     splunk.discovery:
       extensions:

examples/discovery-mode/rendered_manifests/daemonset.yaml

@@ -32,7 +32,7 @@ spec:
         component: otel-collector-agent
         release: default
       annotations:
-        checksum/config: f00e9fb8ced736fa74e6a17b60fceaaaff1f75ce1e5bec439cc0937992148d79
+        checksum/config: da5b5152c2b5b5297b5f8e3bedca5f4645a8dbd13c6b5f309d7099ec0d1f2c28
         kubectl.kubernetes.io/default-container: otel-collector
     spec:
       hostNetwork: true

examples/distribution-aks/rendered_manifests/configmap-agent.yaml

@@ -275,3 +275,5 @@ data:
                   without_scope_info: true
                   without_type_suffix: true
                   without_units: true
+        resource:
+          service.name: otel-agent