Merge branch 'main' into botocore-bedrock-user-events

Author: xrmx

.readthedocs.yml

@@ -6,9 +6,9 @@ sphinx:
   configuration: docs/conf.py
 
 build:
-  os: "ubuntu-22.04"
+  os: "ubuntu-24.04"
   tools:
-    python: "3.8"
+    python: "3.11"
 
 python:
   install:

CHANGELOG.md

@@ -79,6 +79,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

exporter/opentelemetry-exporter-prometheus-remote-write/proto/README.md

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

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

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

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

@@ -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",

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

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