Skip to content

Add support to protobuf6 and regenerate proto files #4643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+860 −1,829
Closed

Add support to protobuf6 and regenerate proto files #4643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/lint_0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ jobs:
- name: Run tests
run: tox -e lint-opentelemetry-api

lint-opentelemetry-proto-protobuf5:
name: opentelemetry-proto-protobuf5
lint-opentelemetry-proto-protobuf6:
name: opentelemetry-proto-protobuf6
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
Expand All @@ -64,7 +64,7 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e lint-opentelemetry-proto-protobuf5
run: tox -e lint-opentelemetry-proto-protobuf6

lint-opentelemetry-sdk:
name: opentelemetry-sdk
Expand Down
72 changes: 36 additions & 36 deletions .github/workflows/test_0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ jobs:
- name: Run tests
run: tox -e pypy3-test-opentelemetry-api -- -ra

py39-test-opentelemetry-proto-protobuf5_ubuntu-latest:
name: opentelemetry-proto-protobuf5 3.9 Ubuntu
py39-test-opentelemetry-proto-protobuf6_ubuntu-latest:
name: opentelemetry-proto-protobuf6 3.9 Ubuntu
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
Expand All @@ -159,10 +159,10 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e py39-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py39-test-opentelemetry-proto-protobuf6 -- -ra

py310-test-opentelemetry-proto-protobuf5_ubuntu-latest:
name: opentelemetry-proto-protobuf5 3.10 Ubuntu
py310-test-opentelemetry-proto-protobuf6_ubuntu-latest:
name: opentelemetry-proto-protobuf6 3.10 Ubuntu
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
Expand All @@ -178,10 +178,10 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e py310-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py310-test-opentelemetry-proto-protobuf6 -- -ra

py311-test-opentelemetry-proto-protobuf5_ubuntu-latest:
name: opentelemetry-proto-protobuf5 3.11 Ubuntu
py311-test-opentelemetry-proto-protobuf6_ubuntu-latest:
name: opentelemetry-proto-protobuf6 3.11 Ubuntu
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
Expand All @@ -197,10 +197,10 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e py311-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py311-test-opentelemetry-proto-protobuf6 -- -ra

py312-test-opentelemetry-proto-protobuf5_ubuntu-latest:
name: opentelemetry-proto-protobuf5 3.12 Ubuntu
py312-test-opentelemetry-proto-protobuf6_ubuntu-latest:
name: opentelemetry-proto-protobuf6 3.12 Ubuntu
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
Expand All @@ -216,10 +216,10 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e py312-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py312-test-opentelemetry-proto-protobuf6 -- -ra

py313-test-opentelemetry-proto-protobuf5_ubuntu-latest:
name: opentelemetry-proto-protobuf5 3.13 Ubuntu
py313-test-opentelemetry-proto-protobuf6_ubuntu-latest:
name: opentelemetry-proto-protobuf6 3.13 Ubuntu
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
Expand All @@ -235,10 +235,10 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e py313-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py313-test-opentelemetry-proto-protobuf6 -- -ra

pypy3-test-opentelemetry-proto-protobuf5_ubuntu-latest:
name: opentelemetry-proto-protobuf5 pypy-3.9 Ubuntu
pypy3-test-opentelemetry-proto-protobuf6_ubuntu-latest:
name: opentelemetry-proto-protobuf6 pypy-3.9 Ubuntu
runs-on: ubuntu-latest
timeout-minutes: 30
steps:
Expand All @@ -254,7 +254,7 @@ jobs:
run: pip install tox

- name: Run tests
run: tox -e pypy3-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e pypy3-test-opentelemetry-proto-protobuf6 -- -ra

py39-test-opentelemetry-sdk_ubuntu-latest:
name: opentelemetry-sdk 3.9 Ubuntu
Expand Down Expand Up @@ -2231,8 +2231,8 @@ jobs:
- name: Run tests
run: tox -e pypy3-test-opentelemetry-api -- -ra

py39-test-opentelemetry-proto-protobuf5_windows-latest:
name: opentelemetry-proto-protobuf5 3.9 Windows
py39-test-opentelemetry-proto-protobuf6_windows-latest:
name: opentelemetry-proto-protobuf6 3.9 Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
Expand All @@ -2251,10 +2251,10 @@ jobs:
run: git config --system core.longpaths true

- name: Run tests
run: tox -e py39-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py39-test-opentelemetry-proto-protobuf6 -- -ra

py310-test-opentelemetry-proto-protobuf5_windows-latest:
name: opentelemetry-proto-protobuf5 3.10 Windows
py310-test-opentelemetry-proto-protobuf6_windows-latest:
name: opentelemetry-proto-protobuf6 3.10 Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
Expand All @@ -2273,10 +2273,10 @@ jobs:
run: git config --system core.longpaths true

- name: Run tests
run: tox -e py310-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py310-test-opentelemetry-proto-protobuf6 -- -ra

py311-test-opentelemetry-proto-protobuf5_windows-latest:
name: opentelemetry-proto-protobuf5 3.11 Windows
py311-test-opentelemetry-proto-protobuf6_windows-latest:
name: opentelemetry-proto-protobuf6 3.11 Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
Expand All @@ -2295,10 +2295,10 @@ jobs:
run: git config --system core.longpaths true

- name: Run tests
run: tox -e py311-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py311-test-opentelemetry-proto-protobuf6 -- -ra

py312-test-opentelemetry-proto-protobuf5_windows-latest:
name: opentelemetry-proto-protobuf5 3.12 Windows
py312-test-opentelemetry-proto-protobuf6_windows-latest:
name: opentelemetry-proto-protobuf6 3.12 Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
Expand All @@ -2317,10 +2317,10 @@ jobs:
run: git config --system core.longpaths true

- name: Run tests
run: tox -e py312-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py312-test-opentelemetry-proto-protobuf6 -- -ra

py313-test-opentelemetry-proto-protobuf5_windows-latest:
name: opentelemetry-proto-protobuf5 3.13 Windows
py313-test-opentelemetry-proto-protobuf6_windows-latest:
name: opentelemetry-proto-protobuf6 3.13 Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
Expand All @@ -2339,10 +2339,10 @@ jobs:
run: git config --system core.longpaths true

- name: Run tests
run: tox -e py313-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e py313-test-opentelemetry-proto-protobuf6 -- -ra

pypy3-test-opentelemetry-proto-protobuf5_windows-latest:
name: opentelemetry-proto-protobuf5 pypy-3.9 Windows
pypy3-test-opentelemetry-proto-protobuf6_windows-latest:
name: opentelemetry-proto-protobuf6 pypy-3.9 Windows
runs-on: windows-latest
timeout-minutes: 30
steps:
Expand All @@ -2361,7 +2361,7 @@ jobs:
run: git config --system core.longpaths true

- name: Run tests
run: tox -e pypy3-test-opentelemetry-proto-protobuf5 -- -ra
run: tox -e pypy3-test-opentelemetry-proto-protobuf6 -- -ra

py39-test-opentelemetry-sdk_windows-latest:
name: opentelemetry-sdk 3.9 Windows
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
([#4637](https://github.com/open-telemetry/opentelemetry-python/pull/4637))
- Logging API accepts optional `context`; deprecates `trace_id`, `span_id`, `trace_flags`.
([#4597](https://github.com/open-telemetry/opentelemetry-python/pull/4597))
- Add support to Protobuf 6 and regenerate proto files; Drop support to Protobuf 5
([#4643](https://github.com/open-telemetry/opentelemetry-python/pull/4643))

## Version 1.34.0/0.55b0 (2025-06-04)

Expand Down
2 changes: 1 addition & 1 deletion docs-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ opentracing~=2.2.0
thrift~=0.10
wrapt>=1.0.0,<2.0.0
markupsafe~=2.0
protobuf==5.26.1
protobuf==6.31.1
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-otlp-proto-common/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==5.26.1
protobuf==6.31.1
py-cpuinfo==9.0.0
pytest==7.4.4
tomli==2.0.1
Expand Down
5 changes: 2 additions & 3 deletions exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"googleapis-common-protos ~= 1.52",
"grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
"googleapis-common-protos ~= 1.70",
"grpcio >= 1.73.0, < 2.0.0",
"opentelemetry-api ~= 1.15",
"opentelemetry-proto == 1.35.0.dev",
"opentelemetry-sdk ~= 1.35.0.dev",
Expand Down
6 changes: 3 additions & 3 deletions exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
asgiref==3.7.2
grpcio==1.66.2
googleapis-common-protos==1.70.0
grpcio==1.73.0
protobuf==6.31.1
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==5.26.1
py-cpuinfo==9.0.0
pytest==7.4.4
tomli==2.0.1
typing_extensions==4.10.0
wrapt==1.16.0
zipp==3.19.2
googleapis-common-protos==1.63.2
-e opentelemetry-api
-e tests/opentelemetry-test-utils
-e exporter/opentelemetry-exporter-otlp-proto-common
Expand Down
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-otlp-proto-http/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
asgiref==3.7.2
certifi==2024.7.4
charset-normalizer==3.3.2
googleapis-common-protos==1.63.2
googleapis-common-protos==1.70.0
idna==3.7
importlib-metadata==6.11.0
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==5.26.1
protobuf==6.31.1
py-cpuinfo==9.0.0
pytest==7.4.4
PyYAML==6.0.1
Expand Down
4 changes: 2 additions & 2 deletions gen-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use caution when bumping this version to ensure compatibility with the currently supported protobuf version.
# Pinning this to the oldest grpcio version that supports protobuf 5 helps avoid RuntimeWarning messages
# from the generated protobuf code and ensures continued stability for newer grpcio versions.
grpcio-tools==1.63.2
mypy-protobuf~=3.5.0
grpcio-tools==1.73.0
mypy-protobuf==3.6.0
2 changes: 1 addition & 1 deletion opentelemetry-proto/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"protobuf>=5.0, < 6.0",
"protobuf>=6.0, < 7.0",
]

[project.urls]
Expand Down
49 changes: 24 additions & 25 deletions opentelemetry-proto/src/opentelemetry/proto/collector/logs/v1/logs_service_pb2.py
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading