Pin a version of grpcio-tools with protoc compatible with protobuf 3 …

…and 4
open-telemetry · Dec 1, 2022 · 309a4c3 · 309a4c3
1 parent 4f83b73
commit 309a4c3
Show file tree

Hide file tree

Showing 15 changed files with 255 additions and 3,605 deletions.
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -10,9 +10,12 @@ sphinx-autodoc-typehints~=1.12.0
 pytest==7.1.3
 pytest-cov>=2.8
 readme-renderer~=24.0
-grpcio-tools~=1.41.0
+# This version of grpcio-tools ships with protoc 3.19.4 which appears to be compatible with
+# both protobuf 3.x and 4.x. Bump this version with caution to preserve compatability with
+# protobuf 3.x in
+# https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-proto/pyproject.toml#L28
+grpcio-tools==1.48.1
 mypy-protobuf~=3.0.0
-protobuf~=3.18.1
 # temporary fix. we should update the jinja, flask deps
 # See https://github.com/pallets/markupsafe/issues/282
 # breaking change introduced in markupsafe causes jinja, flask to break

diff --git a/opentelemetry-proto/pyproject.toml b/opentelemetry-proto/pyproject.toml
@@ -25,7 +25,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-  "protobuf~=3.13",
+  "protobuf>=3.19, < 5.0",
 ]
 
 [project.optional-dependencies]

diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2.py
diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2.py b/opentelemetry-proto/src/opentelemetry/proto/collector/metrics/v1/metrics_service_pb2.py