diff --git a/config/initializers/instrumentation.rb b/config/initializers/instrumentation.rb index 46f54d78f07..909bfa2f3f7 100644 --- a/config/initializers/instrumentation.rb +++ b/config/initializers/instrumentation.rb @@ -1,8 +1,18 @@ -ActiveSupport::Notifications - .monotonic_subscribe("each_iteration.iteration") do |_, started, finished, _, tags| +# Possible events related to job-iteration. +# https://github.com/Shopify/job-iteration/blob/main/guides/best-practices.md#instrumentation +# build_enumerator.iteration +# throttled.iteration (when using ThrottleEnumerator) +# nil_enumerator.iteration +# resumed.iteration +# each_iteration.iteration +# not_found.iteration +# interrupted.iteration +# completed.iteration + +ActiveSupport::Notifications.monotonic_subscribe("each_iteration.iteration") do |_, started, finished, _, tags| elapsed = finished - started - max_iteration_runtime = 10.seconds + max_iteration_runtime = 3.minutes if elapsed >= max_iteration_runtime Rails.logger.warn "[Iteration] job_class=#{tags[:job_class]} " \ "each_iteration runtime exceeded limit of #{max_iteration_runtime}s" diff --git a/docker-compose.yml b/docker-compose.yml index 8ad642c4bf0..c7c9ad81806 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,8 +102,6 @@ services: POSTGRES_DB: ${DB_DATABASE:-openproject} networks: - network - ports: - - "4444:5432" cache: image: memcached diff --git a/docker/dev/youtrack/.env b/docker/dev/youtrack/.env deleted file mode 100644 index c962deb2abe..00000000000 --- a/docker/dev/youtrack/.env +++ /dev/null @@ -1 +0,0 @@ -OPENPROJECT_DOCKER_DEV_TLD=local diff --git a/docker/dev/youtrack/docker-compose.yml b/docker/dev/youtrack/docker-compose.yml deleted file mode 100644 index b702710cc64..00000000000 --- a/docker/dev/youtrack/docker-compose.yml +++ /dev/null @@ -1,24 +0,0 @@ -services: - youtrack: - image: jetbrains/youtrack:2025.2.98373 - labels: - - "traefik.enable=true" - - "traefik.http.routers.youtrack.rule=Host(`youtrack.${OPENPROJECT_DOCKER_DEV_TLD}`)" - - "traefik.http.routers.youtrack.service=youtrack-service" - - "traefik.http.services.youtrack-service.loadbalancer.server.port=8080" - networks: - - gateway - volumes: - - youtrack-data:/opt/youtrack/data - - youtrack-conf:/opt/youtrack/conf - - youtrack-logs:/opt/youtrack/logs - - youtrack-backups:/opt/youtrack/backups -networks: - gateway: - external: true - name: gateway -volumes: - youtrack-data: - youtrack-conf: - youtrack-logs: - youtrack-backups: diff --git a/instrumentation.rb b/instrumentation.rb deleted file mode 100644 index 909bfa2f3f7..00000000000 --- a/instrumentation.rb +++ /dev/null @@ -1,20 +0,0 @@ -# Possible events related to job-iteration. -# https://github.com/Shopify/job-iteration/blob/main/guides/best-practices.md#instrumentation -# build_enumerator.iteration -# throttled.iteration (when using ThrottleEnumerator) -# nil_enumerator.iteration -# resumed.iteration -# each_iteration.iteration -# not_found.iteration -# interrupted.iteration -# completed.iteration - -ActiveSupport::Notifications.monotonic_subscribe("each_iteration.iteration") do |_, started, finished, _, tags| - elapsed = finished - started - - max_iteration_runtime = 3.minutes - if elapsed >= max_iteration_runtime - Rails.logger.warn "[Iteration] job_class=#{tags[:job_class]} " \ - "each_iteration runtime exceeded limit of #{max_iteration_runtime}s" - end -end