Skip to content

Commit 87d33b3

Browse files
committed
fix docs and add changelog
Signed-off-by: emdneto <[email protected]>
1 parent dbecc8b commit 87d33b3

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717
([#4094](https://github.com/open-telemetry/opentelemetry-python/pull/4094))
1818
- Implement events sdk
1919
([#4176](https://github.com/open-telemetry/opentelemetry-python/pull/4176))
20+
- Add support to protobuf5
21+
([#4206](https://github.com/open-telemetry/opentelemetry-python/pull/4206))
2022

2123
## Version 1.27.0/0.48b0 (2024-08-28)
2224

docs-requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,4 @@ opentracing~=2.2.0
2525
thrift~=0.10
2626
wrapt>=1.0.0,<2.0.0
2727
markupsafe~=2.0
28-
29-
# Jaeger generated protobufs do not currently support protobuf 4.x. This can be removed once
30-
# they're regenerated.
3128
protobuf==5.26.1

tox.ini

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,11 @@ recreate = True
347347
deps =
348348
-c {toxinidir}/dev-requirements.txt
349349
-r {toxinidir}/docs-requirements.txt
350+
setenv =
351+
; We need this workaround to allow generating docs for exporters that have different protobuf versions as requirement.
352+
; See https://github.com/open-telemetry/opentelemetry-python/pull/4206
353+
; We can remove the workaround when opentelemetry-exporter-zipkin-proto-http support protobuf > 5.26
354+
PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python
350355
changedir = docs
351356
commands =
352357
sphinx-build -E -a -W -b html -T . _build/html

0 commit comments

Comments
 (0)