Merge pull request #2380 from amvanbaren/tracing-otel-attrs

Add OpenTelemetry attributes
EclipseFdn · Feb 22, 2024 · 861e4f3 · 861e4f3
2 parents 42347de + 9ed49cc
commit 861e4f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -27,7 +27,7 @@ RUN /usr/bin/yarn --cwd website \
   && /usr/bin/yarn --cwd website build
 
 # Main image derived from openvsx-server 
-FROM docker.io/amvanbaren/openvsx-server:1b712aa
+FROM docker.io/amvanbaren/openvsx-server:4ff5504
 
 COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/
 COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/ config/

diff --git a/configuration/application.yml b/configuration/application.yml
@@ -62,6 +62,11 @@ management:
   health:
     probes:
       enabled: true
+  metrics:
+    tags:
+      "[service.name]": ${spring.application.name}
+      "[deployment.environment]": ${ENVNAME}
+      "[service.instance.id]": ${HOSTNAME}
   endpoints:
     web:
       exposure:

diff --git a/kubernetes/open-vsx.org.libsonnet b/kubernetes/open-vsx.org.libsonnet
@@ -81,26 +81,14 @@ local newGrafanaAgentConfigMap() = {
             url: ${PROMETHEUS_URL}
           scrape_configs:
           - job_name: integrations/spring-boot
-            relabel_configs:
-              - replacement: ${HOSTNAME}
-                target_label: instance
             static_configs:
               - targets: ['localhost:8081']
-                labels:
-                  environment: ${ENVNAME}
             metrics_path: /actuator/prometheus
         global:
           scrape_interval: 60s
       traces:
         configs:
         - name: default
-          attributes:
-          - key: environment
-            action: upsert
-            value: ${ENVNAME}
-          - key: instance
-            action: upsert
-            value: ${HOSTNAME}
           remote_write:
           - endpoint: ${TEMPO_URL}
             basic_auth: