Skip to content

Commit 4cdf158

Browse files
authored
Merge branch 'main' into tox-uv
2 parents 544ada5 + f4f3253 commit 4cdf158

File tree

56 files changed

+955
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+955
-203
lines changed

CHANGELOG.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## Unreleased
99

10+
## Version 1.33.0/0.54b0 (2025-05-09)
11+
1012
- Fix intermittent `Connection aborted` error when using otlp/http exporters
1113
([#4477](https://github.com/open-telemetry/opentelemetry-python/pull/4477))
1214
- opentelemetry-sdk: use stable code attributes: `code.function` -> `code.function.name`, `code.lineno` -> `code.line.number`, `code.filepath` -> `code.file.path`
1315
([#4508](https://github.com/open-telemetry/opentelemetry-python/pull/4508))
1416
- Fix serialization of extended attributes for logs signal
1517
([#4342](https://github.com/open-telemetry/opentelemetry-python/pull/4342))
18+
- Handle OTEL_PROPAGATORS contains None
19+
([#4553](https://github.com/open-telemetry/opentelemetry-python/pull/4553))
1620
- docs: updated and added to the metrics and log examples
1721
([#4559](https://github.com/open-telemetry/opentelemetry-python/pull/4559))
22+
- Bump semantic conventions to 1.33.0
23+
([#4567](https://github.com/open-telemetry/opentelemetry-python/pull/4567))
1824

1925
## Version 1.32.0/0.53b0 (2025-04-10)
2026

@@ -81,6 +87,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
8187
([#4353](https://github.com/open-telemetry/opentelemetry-python/pull/4353))
8288
- sdk: don't log or print warnings when the SDK has been disabled
8389
([#4371](https://github.com/open-telemetry/opentelemetry-python/pull/4371))
90+
- Configurable max retry timeout for grpc exporter
91+
([#4333](https://github.com/open-telemetry/opentelemetry-python/pull/4333))
8492
- Fix span context manager typing by using ParamSpec from typing_extensions
8593
([#4389](https://github.com/open-telemetry/opentelemetry-python/pull/4389))
8694
- Fix serialization of None values in logs body to match 1.31.0+ data model
@@ -1531,8 +1539,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
15311539
Serialize tuple type values by coercing them into a string, since Jaeger does not
15321540
support tuple types.
15331541
([#865](https://github.com/open-telemetry/opentelemetry-python/pull/865))
1534-
- Validate span attribute types in SDK
1535-
([#678](https://github.com/open-telemetry/opentelemetry-python/pull/678))
15361542
- Specify to_json indent from arguments
15371543
([#718](https://github.com/open-telemetry/opentelemetry-python/pull/718))
15381544
- Span.resource will now default to an empty resource

eachdist.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sortfirst=
1111
exporter/*
1212

1313
[stable]
14-
version=1.33.0.dev
14+
version=1.34.0.dev
1515

1616
packages=
1717
opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
2727
opentelemetry-api
2828

2929
[prerelease]
30-
version=0.54b0.dev
30+
version=0.55b0.dev
3131

3232
packages=
3333
opentelemetry-opentracing-shim

exporter/opentelemetry-exporter-opencensus/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies = [
3232
"grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
3333
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
3434
"opencensus-proto >= 0.1.0, < 1.0.0",
35-
"opentelemetry-api >= 1.33.0.dev",
35+
"opentelemetry-api >= 1.34.0.dev",
3636
"opentelemetry-sdk >= 1.15",
3737
"protobuf ~= 3.13",
3838
"setuptools >= 16.0",

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "0.54b0.dev"
15+
__version__ = "0.55b0.dev"

exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
"Programming Language :: Python :: 3.13",
2929
]
3030
dependencies = [
31-
"opentelemetry-proto == 1.33.0.dev",
31+
"opentelemetry-proto == 1.34.0.dev",
3232
]
3333

3434
[project.urls]

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.33.0.dev"
15+
__version__ = "1.34.0.dev"

exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ dependencies = [
3333
"grpcio >= 1.63.2, < 2.0.0; python_version < '3.13'",
3434
"grpcio >= 1.66.2, < 2.0.0; python_version >= '3.13'",
3535
"opentelemetry-api ~= 1.15",
36-
"opentelemetry-proto == 1.33.0.dev",
37-
"opentelemetry-sdk ~= 1.33.0.dev",
38-
"opentelemetry-exporter-otlp-proto-common == 1.33.0.dev",
36+
"opentelemetry-proto == 1.34.0.dev",
37+
"opentelemetry-sdk ~= 1.34.0.dev",
38+
"opentelemetry-exporter-otlp-proto-common == 1.34.0.dev",
3939
]
4040

4141
[project.entry-points.opentelemetry_logs_exporter]

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,8 @@ class OTLPExporterMixin(
187187
compression: gRPC compression method to use
188188
"""
189189

190+
_MAX_RETRY_TIMEOUT = 64
191+
190192
def __init__(
191193
self,
192194
endpoint: Optional[str] = None,
@@ -286,12 +288,13 @@ def _export(
286288
# data.__class__.__name__,
287289
# delay,
288290
# )
289-
max_value = 64
290291
# expo returns a generator that yields delay values which grow
291292
# exponentially. Once delay is greater than max_value, the yielded
292293
# value will remain constant.
293-
for delay in _create_exp_backoff_generator(max_value=max_value):
294-
if delay == max_value or self._shutdown:
294+
for delay in _create_exp_backoff_generator(
295+
max_value=self._MAX_RETRY_TIMEOUT
296+
):
297+
if delay == self._MAX_RETRY_TIMEOUT or self._shutdown:
295298
return self._result.FAILURE
296299

297300
with self._export_lock:

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
__version__ = "1.33.0.dev"
15+
__version__ = "1.34.0.dev"

exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ dependencies = [
3131
"Deprecated >= 1.2.6",
3232
"googleapis-common-protos ~= 1.52",
3333
"opentelemetry-api ~= 1.15",
34-
"opentelemetry-proto == 1.33.0.dev",
35-
"opentelemetry-sdk ~= 1.33.0.dev",
36-
"opentelemetry-exporter-otlp-proto-common == 1.33.0.dev",
34+
"opentelemetry-proto == 1.34.0.dev",
35+
"opentelemetry-sdk ~= 1.34.0.dev",
36+
"opentelemetry-exporter-otlp-proto-common == 1.34.0.dev",
3737
"requests ~= 2.7",
3838
]
3939

0 commit comments

Comments
 (0)