try protobuf==5.26.1

emdneto · Sep 30, 2024 · 544a2c4 · 544a2c4
1 parent 84a070d
commit 544a2c4
Show file tree

Hide file tree

Showing 26 changed files with 909 additions and 990 deletions.
diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -25,3 +25,7 @@ opentracing~=2.2.0
 thrift~=0.10
 wrapt>=1.0.0,<2.0.0
 markupsafe~=2.0
+
+# Jaeger generated protobufs do not currently support protobuf 4.x. This can be removed once
+# they're regenerated.
+protobuf==5.26.1
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt
@@ -4,7 +4,7 @@ importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
-protobuf==5.27.2
+protobuf==5.26.1
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.txt
@@ -6,7 +6,7 @@ importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
-protobuf==5.27.2
+protobuf==5.26.1
 py-cpuinfo==9.0.0
 pytest==7.4.4
 tomli==2.0.1

diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements.txt b/exporter/opentelemetry-exporter-otlp-proto-http/test-requirements.txt
@@ -8,7 +8,7 @@ importlib-metadata==6.11.0
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0
-protobuf==5.27.2
+protobuf==5.26.1
 py-cpuinfo==9.0.0
 pytest==7.4.4
 PyYAML==6.0.1

diff --git a/gen-requirements.txt b/gen-requirements.txt
@@ -2,5 +2,5 @@
 # both protobuf 3.19.x and 4.x (see https://github.com/protocolbuffers/protobuf/issues/11123).
 # Bump this version with caution to preserve compatibility with protobuf 3.
 # https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-proto/pyproject.toml#L28
-grpcio-tools==1.66.0
-mypy-protobuf~=3.6.0
+grpcio-tools==1.65.5
+mypy-protobuf~=3.1.0
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/logs/v1/logs_service_pb2.pyi b/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2.pyi
diff --git a/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2_grpc.py b/opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2_grpc.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