Add additional OTEL options

mastodon · Sep 26, 2024 · 91e0a89 · 91e0a89
1 parent fd0366d
commit 91e0a89
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/Chart.yaml b/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time
 # you make changes to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 5.4.0
+version: 5.4.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml
@@ -203,6 +203,8 @@ spec:
               value: {{ coalesce $context.Values.mastodon.sidekiq.otel.endpointUri $context.Values.mastodon.otel.endpointUri }}
             - name: OTEL_SERVICE_NAME_PREFIX
               value: {{ coalesce $context.Values.mastodon.sidekiq.otel.namePrefix $context.Values.mastodon.otel.namePrefix }}
+            - name: OTEL_SERVICE_NAME_SEPARATOR
+              value: {{ coalesce $context.Values.mastodon.sidekiq.otel.nameSeparator $context.Values.mastodon.otel.nameSeparator }}
             {{- end }}
           volumeMounts:
           {{- if (not $context.Values.mastodon.s3.enabled) }}

diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml
@@ -193,6 +193,8 @@ spec:
               value: {{ coalesce .Values.mastodon.web.otel.endpointUri .Values.mastodon.otel.endpointUri }}
             - name: OTEL_SERVICE_NAME_PREFIX
               value: {{ coalesce .Values.mastodon.web.otel.namePrefix .Values.mastodon.otel.namePrefix }}
+            - name: OTEL_SERVICE_NAME_SEPARATOR
+              value: {{ coalesce .Values.mastodon.web.otel.nameSeparator .Values.mastodon.otel.nameSeparator }}
             {{- end }}
           volumeMounts:
           {{- if (not .Values.mastodon.s3.enabled) }}

diff --git a/values.yaml b/values.yaml
@@ -185,6 +185,7 @@ mastodon:
       enabled:
       exporterUri:
       namePrefix:
+      nameSeparator:
 
     workers:
       - name: all-queues
@@ -384,6 +385,7 @@ mastodon:
       enabled:
       exporterUri:
       namePrefix:
+      nameSeparator:
 
   # HTTP cache buster configuration.
   # See the documentation for more information about this feature:
@@ -413,6 +415,7 @@ mastodon:
     enabled: false
     exporterUri:
     namePrefix: mastodon
+    nameSeparator: /
 
   # Sets the PREPARED_STATEMENTS environment variable: https://docs.joinmastodon.org/admin/config/#prepared_statements
   preparedStatements: true