Skip to content

Commit 42e8b0a

Browse files
michaelschuett-tomtomemdnetoaabmass
authored
upgrade opentelemetry-exporter-prometheus-remote-write to use protobuf 5.26 (#3219)
* Allow protobuf version above 4 and under 6 for opentelemetry_exporter_prometheus_remote_write * update version * fix tests * regenerate protobufs * with newer protoc * format * actually support 5.26 protobuf * changelog * Update CHANGELOG.md Co-authored-by: Emídio Neto <[email protected]> --------- Co-authored-by: Emídio Neto <[email protected]> Co-authored-by: Aaron Abbott <[email protected]>
1 parent 6e61ff0 commit 42e8b0a

File tree

8 files changed

+96
-362
lines changed

8 files changed

+96
-362
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7373

7474
### Breaking changes
7575

76+
- `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs
77+
([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219))
7678
- `opentelemetry-instrumentation-sqlalchemy` including sqlcomment in `db.statement` span attribute value is now opt-in
7779
([#3112](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3112))
7880
- `opentelemetry-instrumentation-dbapi` including sqlcomment in `db.statement` span attribute value is now opt-in
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
## Instructions
2-
1. Install protobuf tools. Can use your package manager or download from [GitHub](https://github.com/protocolbuffers/protobuf/releases/tag/v21.7)
3-
2. Run `generate-proto-py.sh` from inside the `proto/` directory
2+
1. Install protobuf tools. Can use your package manager or download from [GitHub](https://github.com/protocolbuffers/protobuf/releases/tag/v26.0)
3+
2. Run `generate-proto-py.sh` from inside the `proto/` directory

exporter/opentelemetry-exporter-prometheus-remote-write/proto/generate-proto-py.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ sed -i 's/import "gogoproto\/gogo.proto";/import "opentelemetry\/exporter\/prome
4949
echo "Removing clones..."
5050
rm -rf protobuf prometheus
5151

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

exporter/opentelemetry-exporter-prometheus-remote-write/pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ classifiers = [
2727
"Programming Language :: Python :: 3.13",
2828
]
2929
dependencies = [
30-
"protobuf ~= 4.21",
30+
"protobuf ~= 5.26",
3131
"requests ~= 2.28",
3232
"opentelemetry-api ~= 1.12",
3333
"opentelemetry-sdk ~= 1.12",

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/gogoproto/gogo_pb2.py

+10-246
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/remote_pb2.py

+29-42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/types_pb2.py

+50-69
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/opentelemetry-exporter-prometheus-remote-write/test-requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ idna==3.7
99
iniconfig==2.0.0
1010
packaging==24.0
1111
pluggy==1.5.0
12-
protobuf==4.25.3
12+
protobuf==5.26
1313
py-cpuinfo==9.0.0
1414
pytest==7.4.4
1515
python-snappy==0.7.1

0 commit comments

Comments
 (0)