Merge branch 'master' into feature/listen-to-ports

Author: odeimaiz

Makefile

@@ -685,9 +685,9 @@ info-registry: ## info on local registry (if any)
 
 ## INFO -------------------------------
 
-.PHONY: info info-images info-swarm  info-tools
+.PHONY: info info-images info-swarm
 info: ## displays setup information
-	# setup info:
+	@echo setup info  --------------------------------
 	@echo ' Detected OS          : $(IS_LINUX)$(IS_OSX)$(IS_WSL)$(IS_WSL2)$(IS_WIN)'
 	@echo ' SWARM_STACK_NAME     : ${SWARM_STACK_NAME}'
 	@echo ' DOCKER_REGISTRY      : $(DOCKER_REGISTRY)'
@@ -697,19 +697,23 @@ info: ## displays setup information
 	@echo '  - ULR                : ${VCS_URL}'
 	@echo '  - REF                : ${VCS_REF}'
 	@echo '  - (STATUS)REF_CLIENT : (${VCS_STATUS_CLIENT}) ${VCS_REF_CLIENT}'
-	@echo ' DIRECTOR_API_VERSION  : ${DIRECTOR_API_VERSION}'
-	@echo ' STORAGE_API_VERSION   : ${STORAGE_API_VERSION}'
-	@echo ' DATCORE_ADAPTER_API_VERSION   : ${DATCORE_ADAPTER_API_VERSION}'
-	@echo ' WEBSERVER_API_VERSION : ${WEBSERVER_API_VERSION}'
-	# dev tools version
-	@echo ' make          : $(shell make --version 2>&1 | head -n 1)'
-	@echo ' jq            : $(shell jq --version)'
+	@make --silent info-tools
+
+
+.PHONY: show-tools
+info-tools: ## displays tools versions
+	@echo dev-tools versions -------------------------
 	@echo ' awk           : $(shell awk -W version 2>&1 | head -n 1)'
-	@echo ' python        : $(shell python3 --version)'
-	@echo ' node          : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
 	@echo ' docker        : $(shell docker --version)'
 	@echo ' docker buildx : $(shell docker buildx version)'
 	@echo ' docker compose: $(shell docker compose version)'
+	@echo ' jq            : $(shell jq --version)'
+	@echo ' make          : $(shell make --version 2>&1 | head -n 1)'
+	@echo ' node          : $(shell node --version 2> /dev/null || echo ERROR nodejs missing)'
+	@echo ' python        : $(shell python3 --version)'
+	@echo ' uv            : $(shell uv --version 2> /dev/null || echo ERROR uv missing)'
+	@echo ' ubuntu        : $(shell lsb_release --description --short 2> /dev/null | tail || echo ERROR Not an Ubuntu OS )'
+
 
 
 define show-meta

packages/aws-library/requirements/_base.txt

@@ -210,7 +210,7 @@ pyyaml==6.0.2
     #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/../../../packages/service-library/requirements/_base.in
-redis==5.0.8
+redis==5.0.4
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt

packages/postgres-database/docker/Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM python:3.6-slim as base
+FROM python:3.6-slim AS base
 
 LABEL maintainer=sanderegg
 
@@ -13,7 +13,7 @@ ENV PYTHONDONTWRITEBYTECODE=1 \
 ENV PATH="${VIRTUAL_ENV}/bin:$PATH"
 
 
-FROM base as build
+FROM base AS build
 
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
@@ -41,7 +41,7 @@ ARG GIT_REPOSITORY
 RUN git clone --single-branch --branch ${GIT_BRANCH} ${GIT_REPOSITORY} osparc-simcore\
   && uv pip install osparc-simcore/packages/postgres-database[migration]
 
-FROM base as production
+FROM base AS production
 
 ENV PYTHONOPTIMIZE=TRUE
 

packages/postgres-database/scripts/erd/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION="3.11.9"
-FROM python:${PYTHON_VERSION}-slim-bookworm as base
+FROM python:${PYTHON_VERSION}-slim-bookworm AS base
 
 RUN apt-get update \
   && apt-get -y install --no-install-recommends\

packages/service-integration/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION="3.11.9"
-FROM python:${PYTHON_VERSION}-slim-bookworm as base
+FROM python:${PYTHON_VERSION}-slim-bookworm AS base
 
 LABEL maintainer=pcrespov
 
@@ -46,7 +46,7 @@ ENV PATH="${VIRTUAL_ENV}/bin:$PATH"
 
 # -------------------------- Build stage -------------------
 
-FROM base as build
+FROM base AS build
 
 RUN --mount=type=cache,target=/var/cache/apt,mode=0755,sharing=private \
   --mount=type=cache,target=/var/lib/apt,mode=0755,sharing=private \
@@ -82,9 +82,9 @@ RUN \
 
 # -------------------------- Build stage -------------------
 
-FROM base as development
+FROM base AS development
 # NOTE: this is necessary to allow to build development images but is the same as production here
-FROM base as production
+FROM base AS production
 
 ENV PYTHONOPTIMIZE=TRUE
 

packages/service-library/requirements/_base.txt

@@ -161,7 +161,7 @@ pyyaml==6.0.2
     #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/_base.in
-redis==5.0.8
+redis==5.0.4
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt

packages/service-library/src/servicelib/aiohttp/tracing.py

@@ -12,8 +12,8 @@
 from opentelemetry.instrumentation.aiohttp_client import (  # pylint:disable=no-name-in-module
     AioHttpClientInstrumentor,
 )
-from opentelemetry.instrumentation.aiohttp_server import (  # pylint:disable=no-name-in-module
-    AioHttpServerInstrumentor,
+from opentelemetry.instrumentation.aiohttp_server import (
+    middleware as aiohttp_server_opentelemetry_middleware,  # pylint:disable=no-name-in-module
 )
 from opentelemetry.instrumentation.aiopg import (  # pylint:disable=no-name-in-module
     AiopgInstrumentor,
@@ -72,8 +72,24 @@ def setup_tracing(
 
     # Add the span processor to the tracer provider
     tracer_provider.add_span_processor(BatchSpanProcessor(otlp_exporter))  # type: ignore[attr-defined] # https://github.com/open-telemetry/opentelemetry-python/issues/3713
-    # Instrument aiohttp server and client
-    AioHttpServerInstrumentor().instrument()
+    # Instrument aiohttp server
+    # Explanation for custom middleware call DK 10/2024:
+    # OpenTelemetry Aiohttp autoinstrumentation is meant to be used by only calling `AioHttpServerInstrumentor().instrument()`
+    # The call `AioHttpServerInstrumentor().instrument()` monkeypatches the __init__() of aiohttp's web.application() to inject the tracing middleware, in it's `__init__()`.
+    # In simcore, we want to switch tracing on or off using the simcore-settings-library.
+    # The simcore-settings library in turn depends on the instance of web.application(), i.e. the aiohttp webserver, to exist. So here we face a hen-and-egg problem.
+    # At the time when the instrumentation should be configured, the instance of web.application already exists and the overwrite to the __init__() is never called
+    #
+    # Since the code that is provided (monkeypatched) in the __init__ that the opentelemetry-autoinstrumentation-library provides is only 4 lines,
+    # just adding a middleware, we are free to simply execute this "missed call" [since we can't call the monkeypatch'ed __init__()] in this following line:
+    app.middlewares.insert(0, aiohttp_server_opentelemetry_middleware)
+    # Code of the aiohttp server instrumentation: github.com/open-telemetry/opentelemetry-python-contrib/blob/eccb05c808a7d797ef5b6ecefed3590664426fbf/instrumentation/opentelemetry-instrumentation-aiohttp-server/src/opentelemetry/instrumentation/aiohttp_server/__init__.py#L246
+    # For reference, the above statement was written for:
+    # - osparc-simcore 1.77.x
+    # - opentelemetry-api==1.27.0
+    # - opentelemetry-instrumentation==0.48b0
+
+    # Instrument aiohttp client
     AioHttpClientInstrumentor().instrument()
     if instrument_aiopg:
         AiopgInstrumentor().instrument()

packages/simcore-sdk/requirements/_base.txt

@@ -232,7 +232,7 @@ pyyaml==6.0.2
     #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
     #   -r requirements/../../../packages/service-library/requirements/_base.in
-redis==5.0.8
+redis==5.0.4
     # via
     #   -c requirements/../../../packages/models-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../packages/postgres-database/requirements/../../../requirements/constraints.txt

requirements/tools/Dockerfile

@@ -9,7 +9,7 @@
 #
 #
 ARG PYTHON_VERSION="3.11.9"
-FROM python:${PYTHON_VERSION}-slim-bookworm as base
+FROM python:${PYTHON_VERSION}-slim-bookworm AS base
 
 ENV VIRTUAL_ENV=/home/scu/.venv
 

scripts/apt-packages-versions/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG PYTHON_VERSION="3.11.9"
-FROM python:${PYTHON_VERSION}-slim-bookworm as base
+FROM python:${PYTHON_VERSION}-slim-bookworm AS base
 
 RUN \
   apt-get update && \