Merge pull request #34 from aspecto-io/v0.91.0

chore: v0.91.0
aspecto-io · Dec 25, 2023 · 8127e39 · 8127e39
2 parents ef2445b + 47ab223
commit 8127e39
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 10 deletions.
diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: aspecto-io-opentelemetry-collector
-version: '1.5.4'
+version: '1.5.5'
 home: https://aspecto.io
 type: application
 description: helm chart of aspecto's opentelemetry tail sampling collector

diff --git a/charts/opentelemetry-collector/templates/collector/_helpers.tpl b/charts/opentelemetry-collector/templates/collector/_helpers.tpl
@@ -88,7 +88,7 @@ otlp/metrics:
 {{- define "collector.configMap.exporters.logs" -}}
 {{- if .enable }}
   logging:
-    logLevel: {{ .logLevel }}
+    verbosity: {{ .logVerbosity }}
 {{- end }}
 {{- end }}
 

diff --git a/charts/opentelemetry-collector/templates/collector/configMap.yaml b/charts/opentelemetry-collector/templates/collector/configMap.yaml
@@ -58,7 +58,7 @@ data:
       otlp/traces:
         endpoint: {{ .Values.collector.specs.configuration.collector_endpoint }}
       {{- include "collector.configMap.exporters.sendingQueue" (dict "sending_queue" .Values.collector.specs.configuration.sending_queue "queue_size" .Values.collector.specs.configuration.queue_size "num_consumers" .Values.collector.specs.configuration.num_consumers) | indent 6 }}
-      {{- include "collector.configMap.exporters.logs" (dict "enable" .Values.collector.specs.configuration.log.enable "logLevel" .Values.collector.specs.configuration.log.level ) | indent 4 }}
+      {{- include "collector.configMap.exporters.logs" (dict "enable" .Values.collector.specs.configuration.log.enable "verbosity" .Values.collector.specs.configuration.log.verbosity ) | indent 4 }}
       {{- include "collector.configMap.exporters.metrics" (dict "protocols" .Values.global.collector_services "service" "metrics" "endpoint" .Values.collector.specs.configuration.metrics_endpoint) | indent 6 }}
     {{- if $kafka }}
       {{- include "collector.configMap.exporters.kafka" (dict "kafka" .Values.collector.specs.configuration.kafka) | nindent 6 }}

diff --git a/charts/opentelemetry-collector/templates/collector/deployment.yaml b/charts/opentelemetry-collector/templates/collector/deployment.yaml
@@ -124,6 +124,8 @@ spec:
               value: {{ .Values.redis.config.credentials.username | quote }}
             - name: REDIS_PASSWORD
               value: {{ .Values.redis.config.credentials.password | quote }}
+            - name: ASPECTO_CHART_VERSION
+              value: {{ .Chart.Version }}
             {{- end }}
   {{- end }}{{- if .Values.collector.envs }}{{ toYaml .Values.collector.envs | indent 12 }}{{- end}}
           {{- if .Values.collector.envFrom }}

diff --git a/charts/opentelemetry-collector/templates/receiver/_helpers.tpl b/charts/opentelemetry-collector/templates/receiver/_helpers.tpl
@@ -39,7 +39,7 @@
 {{- define "receiver.configMap.exporters.logs" -}}
 {{ printf "" }}
   logging:
-    logLevel: {{ .logLevel }}
+    verbosity: {{ .logVerbosity }}
 {{- end }}
 
 {{- define "receiver.configMap.extentions" -}}{{ $service := .service }}{{ $localListenerIp := .localListenerIp }}
@@ -99,4 +99,4 @@ telemetry:
     address: {{ $localListenerIp }}:{{ .internalPort }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/opentelemetry-collector/templates/receiver/configMap.yaml b/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:

diff --git a/charts/opentelemetry-collector/templates/receiver/deployment.yaml b/charts/opentelemetry-collector/templates/receiver/deployment.yaml
@@ -77,8 +77,19 @@ 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 }}

diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml
@@ -116,7 +116,7 @@ global:
   image:
     repository: 'public.ecr.aws/x3s3n8k7'
     pullPolicy: Always
-    version: 'v0.69.7'
+    version: 'v0.91.0'
 
 receiver:
   image:
@@ -214,8 +214,8 @@ receiver:
                 hostname:
                 port: 4317
       log:
-        enable: true
-        level: debug
+        enable: false
+        verbosity: normal
       endpoint: 'aspecto-testing-gateway'
 
     autoscaling:
@@ -448,7 +448,7 @@ collector:
       policies: $$aspecto:tail_sampling_policy
       log:
         enable: true
-        level: debug
+        verbosity: normal
       kafka:
         enable: false
         brokers: