feat: add instance id to metrics

charts/opentelemetry-collector/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: aspecto-io-opentelemetry-collector
-version: '1.4.11'
+version: '1.4.12'
 home: https://aspecto.io
 type: application
 description: helm chart of aspecto's opentelemetry tail sampling collector

charts/opentelemetry-collector/templates/collector/_helpers.tpl

@@ -51,6 +51,8 @@ telemetry:
     address: {{ $localListenerIp }}:{{ .internalPort }}
 {{- end }}
 {{- end }}
+  resource:
+    service.instance.id: $aspecto:settings:instance_id
 {{- end }}
 
 
@@ -60,8 +62,10 @@ telemetry:
 filter:
   metrics:
     include:
-      match_type: strict
+      match_type: regexp
       metric_names:
+        - .*receiver.*
+        - .*exporter.*
         - otelcol_processor_tail_sampling_policy_evaluation_decision
         - otelcol_processor_tail_sampling_count_spans_sampled
 {{- end }}

charts/opentelemetry-collector/templates/receiver/_helpers.tpl

@@ -99,4 +99,6 @@ telemetry:
     address: {{ $localListenerIp }}:{{ .internalPort }}
 {{- end }}
 {{- end }}
+  resource:
+    service.instance.id: $aspecto:settings:instance_id
 {{- end }}

charts/opentelemetry-collector/templates/receiver/configMap.yaml

@@ -24,6 +24,9 @@ metadata:
   {{- if $localObjectAnnotations }}{{ toYaml $localObjectAnnotations | nindent 4 }}{{- end }}
 data:
   {{ .Values.receiver.specs.volumes.serviceConfig.fileName }}: |
+    config_sources:
+      aspecto:
+        token: ${token}
     receivers:
       otlp:
         protocols:

charts/opentelemetry-collector/templates/receiver/deployment.yaml

@@ -77,8 +77,18 @@ spec:
               mountPath: {{ .mountPath }}
               readOnly: {{ .readOnly }}
           {{- end }}
-          {{- if .Values.receiver.envs }}
           env:
+            {{- if or ( $root.Values.global.aspecto.token.secret.createNewSecret) ($root.Values.global.aspecto.token.secret.existingSecretName) }}
+            - name: token
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.global.aspecto.token.secret.existingSecretName | default (printf "%s-token" .Values.global.name) }}
+                  key: {{ .Values.global.aspecto.token.secret.keyName }}
+  {{ else }}
+            - name: token
+              value: {{ .Values.global.aspecto.token.value }}
+  {{- end }}
+{{- if .Values.receiver.envs }}
 {{ toYaml .Values.receiver.envs | indent 10 }}
           {{- end}}
           {{- if .Values.receiver.envFrom }}

charts/opentelemetry-collector/values.yaml

@@ -116,7 +116,7 @@ global:
   image:
     repository: 'public.ecr.aws/x3s3n8k7'
     pullPolicy: Always
-    version: 'v0.69.1'
+    version: 'v0.69.1-rc3'
 
 receiver:
   image: