Regenerate opentelemetry-proto to be compatible with protobuf 3 and 4 (#3070)

Author: aabmass

.github/workflows/test.yml

@@ -87,7 +87,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tox-environment: [ "docker-tests", "lint", "spellcheck", "docs", "mypy", "mypyinstalled", "tracecontext" ]
+        tox-environment: [ "docker-tests-proto3", "docker-tests-proto4", "lint", "spellcheck", "docs", "mypy", "mypyinstalled", "tracecontext" ]
     name: ${{ matrix.tox-environment }}
     runs-on: ubuntu-20.04
     steps:

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Regenerate opentelemetry-proto to be compatible with protobuf 3 and 4
+  ([#3070](https://github.com/open-telemetry/opentelemetry-python/pull/3070))
 - Rename parse_headers to parse_env_headers and improve error message
   ([#2376](https://github.com/open-telemetry/opentelemetry-python/pull/2376))
 - Add url decode values from OTEL_RESOURCE_ATTRIBUTES

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.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.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

docs-requirements.txt

@@ -23,3 +23,7 @@ wrapt>=1.0.0,<2.0.0
 # See https://github.com/pallets/markupsafe/issues/282
 # breaking change introduced in markupsafe causes jinja, flask to break
 markupsafe==2.0.1
+
+# Jaeger generated protobufs do not currently support protobuf 4.x. This can be removed once
+# they're regenerated.
+protobuf~=3.19

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]