Skip to content

upgrade opentelemetry-exporter-prometheus-remote-write to use protobuf 5.26 #3219

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

Merged
merged 12 commits into from
Feb 11, 2025
Merged

upgrade opentelemetry-exporter-prometheus-remote-write to use protobuf 5.26 #3219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
df710aa
Allow protobuf version above 4 and under 6 for opentelemetry_exporter…
michaelschuett-tomtom Jan 29, 2025
ab31103
update version
michaelschuett-tomtom Feb 3, 2025
c2fd3a3
fix tests
michaelschuett-tomtom Feb 3, 2025
b6acca1
Merge branch 'main' into main
michaelschuett-tomtom Feb 3, 2025
414a68f
regenerate protobufs
michaelschuett-tomtom Feb 4, 2025
720e018
with newer protoc
michaelschuett-tomtom Feb 4, 2025
e5e2826
format
michaelschuett-tomtom Feb 4, 2025
7f8b83c
actually support 5.26 protobuf
michaelschuett-tomtom Feb 4, 2025
2c53a1b
changelog
michaelschuett-tomtom Feb 4, 2025
7daebc7
Merge branch 'main' into main
emdneto Feb 6, 2025
356efcc
Update CHANGELOG.md
michaelschuett-tomtom Feb 11, 2025
6b23343
Merge branch 'main' into main
aabmass Feb 11, 2025
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
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 @@ -73,6 +73,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Breaking changes

- `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs
([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219))
- `opentelemetry-instrumentation-sqlalchemy` including sqlcomment in `db.statement` span attribute value is now opt-in
([#3112](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3112))
- `opentelemetry-instrumentation-dbapi` including sqlcomment in `db.statement` span attribute value is now opt-in
Expand Down
4 changes: 2 additions & 2 deletions exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## Instructions
1. Install protobuf tools. Can use your package manager or download from [GitHub](https://github.com/protocolbuffers/protobuf/releases/tag/v21.7)
2. Run `generate-proto-py.sh` from inside the `proto/` directory
1. Install protobuf tools. Can use your package manager or download from [GitHub](https://github.com/protocolbuffers/protobuf/releases/tag/v26.0)
2. Run `generate-proto-py.sh` from inside the `proto/` directory
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ sed -i 's/import "gogoproto\/gogo.proto";/import "opentelemetry\/exporter\/prome
echo "Removing clones..."
rm -rf protobuf prometheus

# Used libprotoc 3.21.1 & protoc 21.7
# Used libprotoc 26
echo "Compiling proto files to Python"
protoc -I . --python_out=../src ${SRC_DIR}/gogoproto/gogo.proto ${SRC_DIR}/remote.proto ${SRC_DIR}/types.proto

Expand Down
2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"protobuf ~= 4.21",
"protobuf ~= 5.26",
"requests ~= 2.28",
"opentelemetry-api ~= 1.12",
"opentelemetry-sdk ~= 1.12",
Expand Down
256 changes: 10 additions & 246 deletions ...remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py
View file
Open in desktop

Large diffs are not rendered by default.

71 changes: 29 additions & 42 deletions ...metheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py
View file
Open in desktop

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

119 changes: 50 additions & 69 deletions ...ometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ idna==3.7
iniconfig==2.0.0
packaging==24.0
pluggy==1.5.0
protobuf==4.25.3
protobuf==5.26
py-cpuinfo==9.0.0
pytest==7.4.4
python-snappy==0.7.1
Expand Down