chore(deps): manual upgrade of dependencies (GoogleCloudPlatform#1396)

* chore(deps): manual upgrade of dependencies accumulated upgrades from renovate PRs GoogleCloudPlatform#997, GoogleCloudPlatform#1094, GoogleCloudPlatform#1095, GoogleCloudPlatform#1193, GoogleCloudPlatform#1379, GoogleCloudPlatform#1384, GoogleCloudPlatform#1387, GoogleCloudPlatform#1388, GoogleCloudPlatform#1389, * chore(deps): fix dependencies due to requests constraint the charset-normalizer is rolled back to lates of major version 2 (2.1.1). add importlib-metadata dependency. update opentelemetry-* to the version supported by 1.15.0 of the SDK. rollback to docker 3.10 for email & recommendation cause profiler package does not support python 3.11 regenerate email and recommendation svs protobuf * chore(deps): adding changes from GoogleCloudPlatform#1402 and GoogleCloudPlatform#1403
D-Mwanth · Dec 14, 2022 · 9d043c4 · 9d043c4
1 parent 5c52845
commit 9d043c4
Show file tree

Hide file tree

Showing 11 changed files with 1,601 additions and 4,286 deletions.
diff --git a/src/emailservice/demo_pb2.py b/src/emailservice/demo_pb2.py
diff --git a/src/emailservice/demo_pb2_grpc.py b/src/emailservice/demo_pb2_grpc.py
diff --git a/src/emailservice/requirements.in b/src/emailservice/requirements.in
@@ -1,12 +1,12 @@
 google-api-core==2.11.0
-grpcio-health-checking==1.48.1
+grpcio-health-checking==1.51.1
 grpcio==1.51.1
 jinja2==3.1.2
 python-json-logger==2.0.4
 google-cloud-profiler==4.0.0
 google-cloud-trace==1.7.3
 requests==2.28.1
-protobuf==3.20.3 # transitive dependency, move when google-api is bumped safely
-opentelemetry-distro==0.35b0
-opentelemetry-instrumentation-grpc==0.35b0
-opentelemetry-exporter-otlp-proto-grpc==1.14.0
+protobuf==4.21.10 # transitive dependency, move when google-api is bumped safely
+opentelemetry-distro==0.36b0
+opentelemetry-instrumentation-grpc==0.36b0
+opentelemetry-exporter-otlp-proto-grpc==1.15.0
diff --git a/src/emailservice/requirements.txt b/src/emailservice/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile --output-file=requirements.txt requirements.in
@@ -19,7 +19,7 @@ google-api-core[grpc]==2.11.0
     #   -r requirements.in
     #   google-api-python-client
     #   google-cloud-trace
-google-api-python-client==2.69.0
+google-api-python-client==2.70.0
     # via google-cloud-profiler
 google-auth==2.15.0
     # via
@@ -47,9 +47,9 @@ grpcio==1.51.1
     #   grpcio-health-checking
     #   grpcio-status
     #   opentelemetry-exporter-otlp-proto-grpc
-grpcio-health-checking==1.48.1
+grpcio-health-checking==1.51.1
     # via -r requirements.in
-grpcio-status==1.48.1
+grpcio-status==1.51.1
     # via google-api-core
 httplib2==0.21.0
     # via
@@ -61,37 +61,37 @@ jinja2==3.1.2
     # via -r requirements.in
 markupsafe==2.1.1
     # via jinja2
-opentelemetry-api==1.14.0
+opentelemetry-api==1.15.0
     # via
     #   opentelemetry-distro
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-instrumentation
     #   opentelemetry-instrumentation-grpc
     #   opentelemetry-sdk
-opentelemetry-distro==0.35b0
+opentelemetry-distro==0.36b0
     # via -r requirements.in
-opentelemetry-exporter-otlp-proto-grpc==1.14.0
+opentelemetry-exporter-otlp-proto-grpc==1.15.0
     # via -r requirements.in
-opentelemetry-instrumentation==0.35b0
+opentelemetry-instrumentation==0.36b0
     # via
     #   opentelemetry-distro
     #   opentelemetry-instrumentation-grpc
-opentelemetry-instrumentation-grpc==0.35b0
+opentelemetry-instrumentation-grpc==0.36b0
     # via -r requirements.in
-opentelemetry-proto==1.14.0
+opentelemetry-proto==1.15.0
     # via opentelemetry-exporter-otlp-proto-grpc
-opentelemetry-sdk==1.14.0
+opentelemetry-sdk==1.15.0
     # via
     #   opentelemetry-distro
     #   opentelemetry-exporter-otlp-proto-grpc
     #   opentelemetry-instrumentation-grpc
-opentelemetry-semantic-conventions==0.35b0
+opentelemetry-semantic-conventions==0.36b0
     # via
     #   opentelemetry-instrumentation-grpc
     #   opentelemetry-sdk
 proto-plus==1.22.1
     # via google-cloud-trace
-protobuf==3.20.3
+protobuf==4.21.10
     # via
     #   -r requirements.in
     #   google-api-core

diff --git a/src/loadgenerator/Dockerfile b/src/loadgenerator/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM python:3.11.0-slim@sha256:ff09e30b44097b761742f1c460f385046d3627c1cfdc5511e191b4274b416257 as base
+FROM python:3.11.1-slim@sha256:54924a2ee4a2ef17028ae076ce38e59b3f4054353a5c9f9318dfaee60377532c as base
 
 FROM base as builder
 

diff --git a/src/loadgenerator/requirements.in b/src/loadgenerator/requirements.in
@@ -1 +1 @@
-locust==2.13.2
+locust==2.14.0
diff --git a/src/loadgenerator/requirements.txt b/src/loadgenerator/requirements.txt
@@ -35,11 +35,13 @@ greenlet==2.0.1
     # via gevent
 idna==3.4
     # via requests
+importlib-metadata==5.1.0
+    # via flask
 itsdangerous==2.1.2
     # via flask
 jinja2==3.1.2
     # via flask
-locust==2.13.2
+locust==2.14.0
     # via -r requirements.in
 markupsafe==2.1.1
     # via
@@ -67,6 +69,8 @@ werkzeug==2.2.2
     # via
     #   flask
     #   locust
+zipp==3.11.0
+    # via importlib-metadata
 zope-event==4.5.0
     # via gevent
 zope-interface==5.5.2