Bundle of dependency updates (Python, Node, DotNet, Docker, Java) (GoogleCloudPlatform#3196)

* Update python dependencies

* Update dotnet dependencies

* Update python dependencies

* Update Node dependencies

* Update Java dependencies

* Update python dependencies

* Update python dependencies

* Update python dependencies

* Update python dependencies

* Downgrade back to Node 20

* Downgrade back to Java 24

* Temporarily disable profiler in Python services

Author: bourgeoisor

src/adservice/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM eclipse-temurin:21.0.9_10-jdk-noble@sha256:e2ba4c84f2356d829837f561e171482f5121d75e537e8fe04e91fb4381694641 AS builder
+FROM --platform=$BUILDPLATFORM eclipse-temurin:24.0.2_12-jdk-noble@sha256:dacac8e9a0df0d2bd24e702b4431132875c249930b70555ebd7ca285b5bee684 AS builder
 
 WORKDIR /app
 

src/cartservice/src/Dockerfile.debug

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM mcr.microsoft.com/dotnet/sdk:10.0@sha256:d599d654aa6fd7baabe54b4272dc475768307ef4d8a07d6e9f9b50b7b1758059 AS build
+FROM mcr.microsoft.com/dotnet/sdk:10.0@sha256:d1823fecac3689a2eb959e02ee3bfe1c2142392808240039097ad70644566190 AS build
 WORKDIR /app
 COPY . .
 RUN dotnet restore cartservice.csproj
@@ -22,7 +22,7 @@ FROM build AS publish
 RUN dotnet publish cartservice.csproj -c Debug -o /out
 
 # Building final image used in running container
-FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:5b558c0d5f65031e34528f0c68c954f03f4db77ee18504cad183d239328f55ca AS final
+FROM mcr.microsoft.com/dotnet/aspnet:10.0@sha256:eaa79205c3ade4792a7f7bf310a3aac51fe0e1d91c44e40f70b7c6423d475fe0 AS final
 # Installing procps on the container to enable debugging of .NET Core
 RUN apt-get update \
     && apt-get install -y unzip procps wget

src/currencyservice/Dockerfile

@@ -27,7 +27,7 @@ COPY package*.json ./
 
 RUN npm install --only=production
 
-FROM alpine:3.22.2@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412
+FROM alpine:3.23.2@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62
 
 RUN apk add --no-cache nodejs
 

src/emailservice/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM python:3.12.12-alpine@sha256:d82291d418d5c47f267708393e40599ae836f2260b0519dd38670e9d281657f5 AS base
+FROM --platform=$BUILDPLATFORM python:3.14.2-alpine@sha256:7af51ebeb83610fb69d633d5c61a2efb87efa4caf66b59862d624bb6ef788345 AS base
 
 FROM base AS builder
 
@@ -42,7 +42,7 @@ RUN apk update \
 WORKDIR /email_server
 
 # Grab packages from builder
-COPY --from=builder /usr/local/lib/python3.12/ /usr/local/lib/python3.12/
+COPY --from=builder /usr/local/lib/python3.14/ /usr/local/lib/python3.14/
 
 # Add the application
 COPY . .

src/emailservice/email_server.py

@@ -36,7 +36,8 @@
 from opentelemetry.sdk.trace.export import BatchSpanProcessor
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
 
-import googlecloudprofiler
+# @TODO: Temporarily removed in https://github.com/GoogleCloudPlatform/microservices-demo/pull/3196
+# import googlecloudprofiler
 
 from logger import getJSONLogger
 logger = getJSONLogger('emailservice-server')
@@ -143,21 +144,22 @@ def initStackdriverProfiling():
     # Environment variable not set
     pass
 
-  for retry in range(1,4):
-    try:
-      if project_id:
-        googlecloudprofiler.start(service='email_server', service_version='1.0.0', verbose=0, project_id=project_id)
-      else:
-        googlecloudprofiler.start(service='email_server', service_version='1.0.0', verbose=0)
-      logger.info("Successfully started Stackdriver Profiler.")
-      return
-    except (BaseException) as exc:
-      logger.info("Unable to start Stackdriver Profiler Python agent. " + str(exc))
-      if (retry < 4):
-        logger.info("Sleeping %d to retry initializing Stackdriver Profiler"%(retry*10))
-        time.sleep (1)
-      else:
-        logger.warning("Could not initialize Stackdriver Profiler after retrying, giving up")
+  # @TODO: Temporarily removed in https://github.com/GoogleCloudPlatform/microservices-demo/pull/3196
+  # for retry in range(1,4):
+  #   try:
+  #     if project_id:
+  #       googlecloudprofiler.start(service='email_server', service_version='1.0.0', verbose=0, project_id=project_id)
+  #     else:
+  #       googlecloudprofiler.start(service='email_server', service_version='1.0.0', verbose=0)
+  #     logger.info("Successfully started Stackdriver Profiler.")
+  #     return
+  #   except (BaseException) as exc:
+  #     logger.info("Unable to start Stackdriver Profiler Python agent. " + str(exc))
+  #     if (retry < 4):
+  #       logger.info("Sleeping %d to retry initializing Stackdriver Profiler"%(retry*10))
+  #       time.sleep (1)
+  #     else:
+  #       logger.warning("Could not initialize Stackdriver Profiler after retrying, giving up")
   return
 
 

src/emailservice/requirements.in

@@ -3,9 +3,8 @@ grpcio-health-checking==1.76.0
 grpcio==1.76.0
 jinja2==3.1.6
 python-json-logger==4.0.0
-google-cloud-profiler==4.1.0
 google-cloud-trace==1.17.0
-requests==2.32.4
-opentelemetry-distro==0.41b0
+requests==2.32.5
+opentelemetry-distro==0.60b1
 opentelemetry-instrumentation-grpc==0.60b1
 opentelemetry-exporter-otlp-proto-grpc==1.39.1

src/emailservice/requirements.txt

@@ -1,110 +1,88 @@
-#
-# This file is autogenerated by pip-compile with Python 3.11
-# by the following command:
-#
-#    pip-compile requirements.in
-#
-backoff==2.2.1
-    # via
-    #   opentelemetry-exporter-otlp-proto-common
-    #   opentelemetry-exporter-otlp-proto-grpc
+# This file was autogenerated by uv via the following command:
+#    uv pip compile requirements.in -o requirements.txt
 cachetools==5.3.2
     # via google-auth
 certifi==2023.7.22
     # via requests
 charset-normalizer==3.3.2
     # via requests
-deprecated==1.2.14
-    # via
-    #   opentelemetry-api
-    #   opentelemetry-exporter-otlp-proto-grpc
-google-api-core[grpc]==2.12.0
+google-api-core==2.28.1
     # via
     #   -r requirements.in
-    #   google-api-python-client
     #   google-cloud-trace
-google-api-python-client==2.107.0
-    # via google-cloud-profiler
 google-auth==2.23.4
     # via
     #   google-api-core
-    #   google-api-python-client
-    #   google-auth-httplib2
-    #   google-cloud-profiler
-google-auth-httplib2==0.1.1
-    # via
-    #   google-api-python-client
-    #   google-cloud-profiler
-google-cloud-profiler==4.1.0
-    # via -r requirements.in
-google-cloud-trace==1.11.3
+    #   google-cloud-trace
+google-cloud-trace==1.17.0
     # via -r requirements.in
-googleapis-common-protos==1.61.0
+googleapis-common-protos==1.72.0
     # via
     #   google-api-core
     #   grpcio-status
     #   opentelemetry-exporter-otlp-proto-grpc
-grpcio==1.59.2
+grpcio==1.76.0
     # via
     #   -r requirements.in
     #   google-api-core
+    #   google-cloud-trace
     #   grpcio-health-checking
     #   grpcio-status
     #   opentelemetry-exporter-otlp-proto-grpc
-grpcio-health-checking==1.59.2
+grpcio-health-checking==1.76.0
     # via -r requirements.in
-grpcio-status==1.59.2
+grpcio-status==1.76.0
     # via google-api-core
-httplib2==0.22.0
-    # via
-    #   google-api-python-client
-    #   google-auth-httplib2
 idna==3.4
     # via requests
 importlib-metadata==6.8.0
     # via opentelemetry-api
-jinja2==3.1.2
+jinja2==3.1.6
     # via -r requirements.in
 markupsafe==2.1.3
     # via jinja2
-opentelemetry-api==1.20.0
+opentelemetry-api==1.39.1
     # via
     #   opentelemetry-distro
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-instrumentation
     #   opentelemetry-instrumentation-grpc
     #   opentelemetry-sdk
-opentelemetry-distro==0.41b0
+    #   opentelemetry-semantic-conventions
+opentelemetry-distro==0.60b1
     # via -r requirements.in
-opentelemetry-exporter-otlp-proto-common==1.20.0
+opentelemetry-exporter-otlp-proto-common==1.39.1
     # via opentelemetry-exporter-otlp-proto-grpc
-opentelemetry-exporter-otlp-proto-grpc==1.20.0
+opentelemetry-exporter-otlp-proto-grpc==1.39.1
     # via -r requirements.in
-opentelemetry-instrumentation==0.41b0
+opentelemetry-instrumentation==0.60b1
     # via
     #   opentelemetry-distro
     #   opentelemetry-instrumentation-grpc
-opentelemetry-instrumentation-grpc==0.41b0
+opentelemetry-instrumentation-grpc==0.60b1
     # via -r requirements.in
-opentelemetry-proto==1.20.0
+opentelemetry-proto==1.39.1
     # via
     #   opentelemetry-exporter-otlp-proto-common
     #   opentelemetry-exporter-otlp-proto-grpc
-opentelemetry-sdk==1.20.0
+opentelemetry-sdk==1.39.1
     # via
     #   opentelemetry-distro
     #   opentelemetry-exporter-otlp-proto-grpc
-    #   opentelemetry-instrumentation-grpc
-opentelemetry-semantic-conventions==0.41b0
+opentelemetry-semantic-conventions==0.60b1
     # via
+    #   opentelemetry-instrumentation
     #   opentelemetry-instrumentation-grpc
     #   opentelemetry-sdk
-proto-plus==1.22.3
-    # via google-cloud-trace
-protobuf==4.25.0
+packaging==25.0
+    # via opentelemetry-instrumentation
+proto-plus==1.27.0
+    # via
+    #   google-api-core
+    #   google-cloud-trace
+protobuf==6.33.2
     # via
     #   google-api-core
-    #   google-cloud-profiler
     #   google-cloud-trace
     #   googleapis-common-protos
     #   grpcio-health-checking
@@ -117,30 +95,26 @@ pyasn1==0.5.0
     #   rsa
 pyasn1-modules==0.3.0
     # via google-auth
-pyparsing==3.1.1
-    # via httplib2
-python-json-logger==2.0.7
+python-json-logger==4.0.0
     # via -r requirements.in
-requests==2.31.0
+requests==2.32.5
     # via
     #   -r requirements.in
     #   google-api-core
-    #   google-cloud-profiler
 rsa==4.9
     # via google-auth
-typing-extensions==4.8.0
-    # via opentelemetry-sdk
-uritemplate==4.1.1
-    # via google-api-python-client
+typing-extensions==4.15.0
+    # via
+    #   grpcio
+    #   opentelemetry-api
+    #   opentelemetry-exporter-otlp-proto-grpc
+    #   opentelemetry-sdk
+    #   opentelemetry-semantic-conventions
 urllib3==2.0.7
     # via requests
 wrapt==1.16.0
     # via
-    #   deprecated
     #   opentelemetry-instrumentation
     #   opentelemetry-instrumentation-grpc
 zipp==3.17.0
     # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

src/loadgenerator/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM python:3.12.12-alpine@sha256:d82291d418d5c47f267708393e40599ae836f2260b0519dd38670e9d281657f5 AS base
+FROM --platform=$BUILDPLATFORM python:3.14.2-alpine@sha256:7af51ebeb83610fb69d633d5c61a2efb87efa4caf66b59862d624bb6ef788345 AS base
 
 FROM base AS builder
 

src/loadgenerator/requirements.in

@@ -1,2 +1,2 @@
-locust==2.40.4
-faker==37.7.0
+locust==2.43.0
+faker==40.1.0