Merge remote-tracking branch 'upstream/main'

Author: mrnicegyu11

services/logging/fluentd/fluent.conf

@@ -39,8 +39,6 @@
     hostname "#{Socket.gethostname}"
     fluentd_hostname "#{ENV['FLUENTD_HOSTNAME']}"
     tag ${tag}
-    container_name ${record["container_name"] && record["container_name"].start_with?("/") ? record["container_name"][1..-1] : record["container_name"]}
-    log_service ${record["log_service"] && record["log_service"].start_with?("/") ? record["log_service"][1..-1] : record["log_service"]}
   </record>
 </filter>
 

services/registry/docker-compose.yml.j2

@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   registry:
-    image: registry:2.8.3
+    image: registry:3.0.0
     command: ["/bin/sh", "/etc/docker/registry/init"]
     environment:
       REGISTRY_HTTP_HOST: "https://${REGISTRY_DOMAIN}"
@@ -31,6 +31,9 @@ services:
       REGISTRY_LOG_ACCESSLOG_DISABLED: ${REGISTRY_LOG_ACCESSLOG_DISABLED}
       # set to true if using self-signed certificates
       UPDATE_CERTIFICATES: "false"
+      # OpenTelemetry
+      OTEL_EXPORTER_OTLP_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
+      OTEL_SERVICE_NAME: registry-simcore
     networks:
       - public
       - monitored
@@ -47,7 +50,7 @@ services:
       resources:
         limits:
           memory: 1G
-          cpus: '2'
+          cpus: '6'
         reservations:
           memory: 128M
           cpus: '0.1'
@@ -77,7 +80,7 @@ services:
     {%- raw %}
     hostname: "registry-ptc-{{.Node.Hostname}}-{{.Task.Slot}}"
     {%- endraw %}
-    image: registry:2.8.3
+    image: registry:3.0.0
     environment:
       REGISTRY_HTTP_SECRET: ${REGISTRY_PULL_THROUGH_CACHE_HTTP_SECRET}
       # S3
@@ -100,6 +103,9 @@ services:
       # Logs
       REGISTRY_LOG_LEVEL: ${REGISTRY_PULL_THROUGH_CACHE_LOG_LEVEL}
       REGISTRY_LOG_ACCESSLOG_DISABLED: ${REGISTRY_PULL_THROUGH_CACHE_LOG_ACCESSLOG_DISABLED}
+      # OpenTelemetry
+      OTEL_EXPORTER_OTLP_ENDPOINT: ${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}:${TRACING_OPENTELEMETRY_COLLECTOR_PORT}
+      OTEL_SERVICE_NAME: registry-pull-through-cache
     ports:
     - mode: host
       target: 5000

services/registry/template.env

@@ -32,3 +32,6 @@ REGISTRY_PULL_THROUGH_CACHE_LOG_ACCESSLOG_DISABLED=${REGISTRY_PULL_THROUGH_CACHE
 
 DOCKER_HUB_LOGIN=${DOCKER_HUB_LOGIN}
 DOCKER_HUB_PASSWORD=${DOCKER_HUB_PASSWORD}
+
+TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT=${TRACING_OPENTELEMETRY_COLLECTOR_ENDPOINT}
+TRACING_OPENTELEMETRY_COLLECTOR_PORT=${TRACING_OPENTELEMETRY_COLLECTOR_PORT}

services/simcore/docker-compose.yml.j2

@@ -481,7 +481,7 @@ services:
           cpus: "0.1"
           memory: "256M"
         limits:
-          cpus: "0.5"
+          cpus: "1"
           memory: "1G"
 
   director-v2: