Merge branch 'main' into 2025/add/chatVendorService

Author: mrnicegyu11

services/simcore/docker-compose.deploy.aws.yml

@@ -56,10 +56,8 @@ services:
       - "--providers.swarm.refreshSeconds=1"
       - "--providers.swarm.exposedByDefault=false"
       - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-      - "--tracing=true"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.serviceName=simcore-traefik"
+      - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
     deploy:
       resources:
         limits:

services/simcore/docker-compose.deploy.dalco.yml

@@ -51,10 +51,8 @@ services:
             - "--providers.swarm.refreshSeconds=1"
             - "--providers.swarm.exposedByDefault=false"
             - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-            - "--tracing=true"
-            - "--tracing.addinternals"
-            - "--tracing.otlp=true"
-            - "--tracing.otlp.http=true"
+            - "--tracing.serviceName=simcore-traefik"
+            - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
         deploy:
             resources:
                 limits:

services/simcore/docker-compose.deploy.local.yml

@@ -108,10 +108,8 @@ services:
       - "--providers.swarm.refreshSeconds=1"
       - "--providers.swarm.exposedByDefault=false"
       - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-      - "--tracing=true"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.serviceName=simcore-traefik"
+      - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
     deploy:
       labels:
         # oSparc postgres

services/simcore/docker-compose.deploy.master.yml

@@ -49,11 +49,8 @@ services:
       - "--providers.swarm.refreshSeconds=1"
       - "--providers.swarm.exposedByDefault=false"
       - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-      #- "--tracing=true"
-      #- "--tracing.addinternals"
-      #- "--tracing.otlp=true"
-      #- "--tracing.otlp.http=true"
-      - "--tracing.otlp.http.endpoint=https://otel-collector:4318/v1/traces"
+      - "--tracing.serviceName=simcore-traefik"
+      - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
     deploy:
       resources:
         limits:

services/simcore/docker-compose.deploy.public.yml

@@ -45,10 +45,8 @@ services:
       - "--providers.swarm.refreshSeconds=1"
       - "--providers.swarm.exposedByDefault=false"
       - "--providers.swarm.constraints=Label(`io.simcore.zone`, `${TRAEFIK_SIMCORE_ZONE}`)"
-      - "--tracing"
-      - "--tracing.addinternals"
-      - "--tracing.otlp=true"
-      - "--tracing.otlp.http=true"
+      - "--tracing.serviceName=simcore-traefik"
+      - "--tracing.otlp.http.endpoint=http://otel-collector:4318/v1/traces"
     deploy:
       labels:
         - prometheus-job=traefik_simcore_production