Use quarkus.application.name if service.name not provided

projectnessie · Feb 22, 2023 · a584a59 · a584a59
1 parent 62887cf
commit a584a59
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/helm/nessie/README.md b/helm/nessie/README.md
@@ -102,7 +102,7 @@ $ helm uninstall --namespace nessie-ns nessie
 | serviceMonitor.interval | string | `""` | The scrape interval; leave empty to let Prometheus decide. Must be a valid duration, e.g. 1d, 1h30m, 5m, 10s. |
 | serviceMonitor.labels | object | `{}` | Labels for the created ServiceMonitor so that Prometheus operator can properly pick it up. |
 | tolerations | list | `[]` | A list of tolerations to apply to nessie pods. See https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/. |
-| tracing.attributes | object | `{}` | Resource attributes to identify the nessie service among other tracing sources. See https://opentelemetry.io/docs/reference/specification/resource/semantic_conventions/#service. If left empty, the following attribute will be automatically added: service.name=nessie. |
+| tracing.attributes | object | `{}` | Resource attributes to identify the nessie service among other tracing sources. See https://opentelemetry.io/docs/reference/specification/resource/semantic_conventions/#service. If left empty, traces will be attached to a service named "Nessie"; to change this, provide a service.name attribute here. |
 | tracing.enabled | bool | `false` | Specifies whether tracing for the nessie server should be enabled. |
 | tracing.endpoint | string | `"http://otlp-collector:4317"` | The collector endpoint URL to connect to (required). The endpoint URL must have either the http:// or the https:// scheme. The collector must talk the OpenTelemetry protocol (OTLP) and the port must be its gRPC port (by default 4317). See https://quarkus.io/guides/opentelemetry for more information. |
 | tracing.sample | string | `"all"` | Which requests should be sampled. Valid values are: "all", "none", or a ratio between 0.0 and 1.0 (inclusive). E.g. 0.5 means that 50% of the requests will be sampled. |

diff --git a/helm/nessie/templates/deployment.yaml b/helm/nessie/templates/deployment.yaml
@@ -147,11 +147,9 @@ spec:
               value: "true"
             - name: QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT
               value: {{ .Values.tracing.endpoint | quote }}
-            - name: QUARKUS_OPENTELEMETRY_TRACER_RESOURCE_ATTRIBUTES
             {{- if .Values.tracing.attributes }}
+            - name: QUARKUS_OPENTELEMETRY_TRACER_RESOURCE_ATTRIBUTES
               value: "{{- include "nessie.dictToString" .Values.tracing.attributes }}"
-            {{- else }}
-              value: "service.name={{ include "nessie.name" . }}"
             {{- end }}
             {{- if .Values.tracing.sample }}
             {{ if eq .Values.tracing.sample "all" }}

diff --git a/helm/nessie/values.yaml b/helm/nessie/values.yaml
@@ -110,10 +110,10 @@ tracing:
   sample: all
   # -- Resource attributes to identify the nessie service among other tracing sources.
   # See https://opentelemetry.io/docs/reference/specification/resource/semantic_conventions/#service.
-  # If left empty, the following attribute will be automatically added: service.name=nessie.
+  # If left empty, traces will be attached to a service named "Nessie"; to change this, provide a service.name attribute here.
   attributes:
     {}
-    # service.name: nessie
+    # service.name: my-nessie
 
 serviceMonitor:
   # -- Specifies whether a ServiceMonitor for Prometheus operator should be created.