Skip to content

Commit 2b2e3c3

Browse files
authored
Merge branch 'main' into fix/sns-warnings
2 parents 2424259 + 63e43d5 commit 2b2e3c3

File tree

30 files changed

+969
-406
lines changed

30 files changed

+969
-406
lines changed

.readthedocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ sphinx:
66
configuration: docs/conf.py
77

88
build:
9-
os: "ubuntu-22.04"
9+
os: "ubuntu-24.04"
1010
tools:
11-
python: "3.8"
11+
python: "3.11"
1212

1313
python:
1414
install:

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
1212
## Unreleased
1313

14+
### Added
15+
16+
- `opentelemetry-instrumentation-botocore` Add support for GenAI user events and lazy initialize tracer
17+
([#3258](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3258))
18+
1419
### Fixed
1520

1621
- `opentelemetry-instrumentation-redis` Add missing entry in doc string for `def _instrument`
@@ -77,6 +82,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7782

7883
### Breaking changes
7984

85+
- `opentelemetry-exporter-prometheus-remote-write` updated protobuf required version from 4.21 to 5.26 and regenerated protobufs
86+
([#3219](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3219))
8087
- `opentelemetry-instrumentation-sqlalchemy` including sqlcomment in `db.statement` span attribute value is now opt-in
8188
([#3112](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3112))
8289
- `opentelemetry-instrumentation-dbapi` including sqlcomment in `db.statement` span attribute value is now opt-in
Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 10 additions & 246 deletions
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

Lines changed: 29 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)