Add support for protobuf 5

Signed-off-by: Jason Parraga <[email protected]>

Author: Sovietaced

.github/workflows/test.yml

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

CHANGELOG.md

@@ -42,6 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3917](https://github.com/open-telemetry/opentelemetry-python/pull/3917/))
 - Add OpenTelemetry trove classifiers to PyPI packages
   ([#3913] (https://github.com/open-telemetry/opentelemetry-python/pull/3913))
+- Update proto dependencies to allow protobuf 5
+  ([#3931](https://github.com/open-telemetry/opentelemetry-python/pull/3931))
 
 ## Version 1.24.0/0.45b0 (2024-03-28)
 

opentelemetry-proto/pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-  "protobuf>=3.19, < 5.0",
+  "protobuf>=3.19, < 6.0",
 ]
 
 [project.urls]

opentelemetry-proto/test-requirements-2.txt

@@ -0,0 +1,18 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+flaky==3.7.0
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+protobuf==5.27.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-proto

tox.ini

@@ -12,8 +12,9 @@ envlist =
     ; below mean these dependencies are being used:
     ; 0: protobuf==3.20.3
     ; 1: protobuf==4.25.3
-    py3{8,9,10,11}-opentelemetry-protobuf-{0,1}
-    pypy3-opentelemetry-protobuf-{0,1}
+    ; 2: protobuf==5.27.0
+    py3{8,9,10,11}-opentelemetry-protobuf-{0,1,2}
+    pypy3-opentelemetry-protobuf-{0,1,2}
 
     py3{8,9,10,11}-opentelemetry-sdk
     pypy3-opentelemetry-sdk
@@ -86,7 +87,7 @@ envlist =
     tracecontext
     mypy,mypyinstalled
     docs
-    docker-tests-proto{3,4}
+    docker-tests-proto{3,4,5}
     public-symbols-check
 
 [testenv]
@@ -99,9 +100,10 @@ deps =
   coverage: pytest-cov
   mypy,mypyinstalled: mypy
 
-  ; proto 3 and 4 tests install the respective version of protobuf
+  ; proto 3,4, and 5 tests install the respective version of protobuf
   proto3: protobuf~=3.19.0
   proto4: protobuf~=4.0
+  proto5: protobuf~=5.26.0
 
 
 setenv =
@@ -123,6 +125,7 @@ commands_pre =
 
   protobuf-0: pip install -r {toxinidir}/opentelemetry-proto/test-requirements-0.txt
   protobuf-1: pip install -r {toxinidir}/opentelemetry-proto/test-requirements-1.txt
+  protobuf-2: pip install -r {toxinidir}/opentelemetry-proto/test-requirements-2.txt
 
   getting-started: pip install -r {toxinidir}/docs/getting_started/tests/requirements.txt
   getting-started: pip install -e {env:CONTRIB_REPO}\#egg=opentelemetry-util-http&subdirectory=util/opentelemetry-util-http
@@ -275,7 +278,7 @@ commands_pre =
 commands =
   {toxinidir}/scripts/tracecontext-integration-test.sh
 
-[testenv:docker-tests-proto{3,4}]
+[testenv:docker-tests-proto{3,4,5}]
 deps =
   pytest==7.1.3
   # Pinning PyYAML for issue: https://github.com/yaml/pyyaml/issues/724
@@ -285,9 +288,10 @@ deps =
   docker-compose==1.29.2
   requests==2.28.2
 
-  ; proto 3 and 4 tests install the respective version of protobuf
+  ; proto 3, 4 and 5 tests install the respective version of protobuf
   proto3: protobuf~=3.19.0
   proto4: protobuf~=4.0
+  proto5: protobuf~=5.26.0
 
 changedir =
   tests/opentelemetry-docker-tests/tests
@@ -310,6 +314,8 @@ commands =
   proto3: pytest {posargs}
   ; opencensus exporter does not work with protobuf 4
   proto4: pytest --ignore opencensus {posargs}
+  ; opencensus exporter does not work with protobuf 5
+  proto5: pytest --ignore opencensus {posargs}
 
 commands_post =
   docker-compose down -v