Merge branch 'master' into maintenance/removing-old-folders

Author: matusdrobuliak66

packages/aws-library/requirements/_base.txt

@@ -5,7 +5,9 @@ aioboto3==13.1.1
 aiobotocore==2.13.1
     # via aioboto3
 aiocache==0.12.2
-    # via -r requirements/_base.in
+    # via
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/_base.in
 aiodebug==2.3.0
     # via -r requirements/../../../packages/service-library/requirements/_base.in
 aiodocker==0.22.2
@@ -174,6 +176,8 @@ protobuf==4.25.4
     # via
     #   googleapis-common-protos
     #   opentelemetry-proto
+psutil==6.0.0
+    # via -r requirements/../../../packages/service-library/requirements/_base.in
 pydantic==1.10.17
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt

packages/service-library/requirements/_base.in

@@ -19,6 +19,7 @@ opentelemetry-api
 opentelemetry-exporter-otlp
 opentelemetry-instrumentation-requests
 opentelemetry-sdk
+psutil
 pydantic
 pyinstrument
 pyyaml

packages/service-library/requirements/_base.txt

@@ -138,6 +138,8 @@ protobuf==4.25.4
     # via
     #   googleapis-common-protos
     #   opentelemetry-proto
+psutil==6.0.0
+    # via -r requirements/_base.in
 pydantic==1.10.17
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt

packages/service-library/requirements/_test.in

@@ -18,7 +18,6 @@ docker
 faker
 flaky
 openapi-spec-validator
-psutil
 pytest
 pytest-aiohttp
 pytest-asyncio
@@ -35,5 +34,6 @@ python-dotenv
 respx
 sqlalchemy[mypy]
 types_aiofiles
-types-psycopg2
 types_tqdm
+types-psutil
+types-psycopg2

packages/service-library/requirements/_test.txt

@@ -141,8 +141,6 @@ pluggy==1.5.0
     # via pytest
 pprintpp==0.4.0
     # via pytest-icdiff
-psutil==6.0.0
-    # via -r requirements/_test.in
 py-cpuinfo==9.0.0
     # via pytest-benchmark
 pytest==8.3.2
@@ -244,6 +242,8 @@ termcolor==2.4.0
     # via pytest-sugar
 types-aiofiles==24.1.0.20240626
     # via -r requirements/_test.in
+types-psutil==6.0.0.20240901
+    # via -r requirements/_test.in
 types-psycopg2==2.9.21.20240819
     # via -r requirements/_test.in
 types-tqdm==4.66.0.20240417

packages/service-library/src/servicelib/instrumentation.py

@@ -0,0 +1,2 @@
+def get_metrics_namespace(application_name: str) -> str:
+    return application_name.replace("-", "_")

packages/service-library/src/servicelib/rabbitmq/_utils.py

@@ -1,8 +1,10 @@
 import logging
+import os
 import socket
 from typing import Any, Final
 
 import aio_pika
+import psutil
 from aiormq.exceptions import ChannelPreconditionFailed
 from pydantic import NonNegativeInt
 from tenacity import retry
@@ -51,7 +53,13 @@ async def wait_till_rabbitmq_responsive(url: str) -> bool:
 
 
 def get_rabbitmq_client_unique_name(base_name: str) -> str:
-    return f"{base_name}_{socket.gethostname()}"
+    # NOTE: The prefix below will change every time the process restarts.
+    # Why is this necessary?
+    # 1. The codebase relies on this behavior; without it, subscribers and consumers will fail.
+    # 2. It allows the web server to be restarted seamlessly during [re]deployments.
+    prefix_create_time = f"{psutil.Process(os.getpid()).create_time()}".strip(".")[-6:]
+
+    return f"{base_name}_{socket.gethostname()}_{prefix_create_time}"
 
 
 async def declare_queue(

packages/simcore-sdk/requirements/_base.txt

@@ -1,7 +1,9 @@
 aio-pika==9.4.3
     # via -r requirements/../../../packages/service-library/requirements/_base.in
 aiocache==0.12.2
-    # via -r requirements/_base.in
+    # via
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/_base.in
 aiodebug==2.3.0
     # via -r requirements/../../../packages/service-library/requirements/_base.in
 aiodocker==0.22.2
@@ -191,6 +193,8 @@ protobuf==4.25.4
     # via
     #   googleapis-common-protos
     #   opentelemetry-proto
+psutil==6.0.0
+    # via -r requirements/../../../packages/service-library/requirements/_base.in
 psycopg2-binary==2.9.9
     # via
     #   aiopg

services/api-server/requirements/_base.txt

@@ -3,7 +3,10 @@ aio-pika==9.4.1
     #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
 aiocache==0.12.2
-    # via -r requirements/../../../packages/simcore-sdk/requirements/_base.in
+    # via
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../packages/simcore-sdk/requirements/_base.in
 aiodebug==2.3.0
     # via
     #   -r requirements/../../../packages/service-library/requirements/_base.in
@@ -365,6 +368,10 @@ protobuf==4.25.4
     # via
     #   googleapis-common-protos
     #   opentelemetry-proto
+psutil==6.0.0
+    # via
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../packages/simcore-sdk/requirements/../../../packages/service-library/requirements/_base.in
 psycopg2-binary==2.9.9
     # via
     #   aiopg

services/autoscaling/requirements/_base.txt

@@ -8,7 +8,9 @@ aiobotocore==2.13.1
     # via aioboto3
 aiocache==0.12.2
     # via
+    #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/../../../packages/aws-library/requirements/_base.in
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   -r requirements/_base.in
 aiodebug==2.3.0
     # via
@@ -57,6 +59,7 @@ arrow==1.3.0
     #   -r requirements/../../../packages/aws-library/requirements/../../../packages/models-library/requirements/_base.in
     #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
     #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../packages/aws-library/requirements/_base.in
     #   -r requirements/../../../packages/models-library/requirements/_base.in
     #   -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
     #   -r requirements/../../../packages/service-library/requirements/_base.in
@@ -344,9 +347,11 @@ protobuf==4.25.4
     # via
     #   googleapis-common-protos
     #   opentelemetry-proto
-psutil==5.9.8
+psutil==6.0.0
     # via
     #   -c requirements/../../../services/dask-sidecar/requirements/_dask-distributed.txt
+    #   -r requirements/../../../packages/aws-library/requirements/../../../packages/service-library/requirements/_base.in
+    #   -r requirements/../../../packages/service-library/requirements/_base.in
     #   distributed
 pydantic==1.10.15
     # via