Skip to content

Commit ff8a717

Browse files
authored
Merge branch 'main' into fix/separate-pylint-config
2 parents f86bdf0 + 9c270da commit ff8a717

56 files changed

Lines changed: 2667 additions & 158 deletions

File tree

Some content is hidden

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

CHANGELOG.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212

1313
## Unreleased
1414

15-
- Enabled the flake8-tidy-import plugins rules for the ruff linter. These rules throw warnings for relative imports in the modules.
15+
- `opentelemetry-sdk`: Add `service` resource detector support to declarative file configuration via `detection_development.detectors[].service`
16+
([#5003](https://github.com/open-telemetry/opentelemetry-python/pull/5003))
17+
18+
## Version 1.41.0/0.62b0 (2026-04-09)
19+
20+
- `opentelemetry-sdk`: Add `host` resource detector support to declarative file configuration via `detection_development.detectors[].host`
21+
([#5002](https://github.com/open-telemetry/opentelemetry-python/pull/5002))
22+
- `opentelemetry-sdk`: Add `container` resource detector support to declarative file configuration via `detection_development.detectors[].container`, using entry point loading of the `opentelemetry-resource-detector-containerid` contrib package
23+
([#5004](https://github.com/open-telemetry/opentelemetry-python/pull/5004))
24+
- `opentelemetry-sdk`: Add `create_tracer_provider`/`configure_tracer_provider` to declarative file configuration, enabling TracerProvider instantiation from config files without reading env vars
25+
([#4985](https://github.com/open-telemetry/opentelemetry-python/pull/4985))
26+
- Enabled the flake8-tidy-import plugins rules for the ruff linter. These rules throw warnings for relative imports in the modules.
1627
([#5019](https://github.com/open-telemetry/opentelemetry-python/pull/5019))
1728
- `opentelemetry-sdk`: Fix `AttributeError` in `ExplicitBucketHistogramAggregation` when applied to non-Histogram instruments without explicit boundaries
1829
([#5034](https://github.com/open-telemetry/opentelemetry-python/pull/5034))
@@ -23,6 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2334
- `opentelemetry-sdk`: Add shared `_parse_headers` helper for declarative config OTLP exporters
2435
([#5021](https://github.com/open-telemetry/opentelemetry-python/pull/5021))
2536
- `opentelemetry-api`: Replace a broad exception in attribute cleaning tests to satisfy pylint in the `lint-opentelemetry-api` CI job
37+
- `opentelemetry-sdk`: Add `create_meter_provider`/`configure_meter_provider` to declarative file configuration, enabling MeterProvider instantiation from config files without reading env vars
38+
([#4987](https://github.com/open-telemetry/opentelemetry-python/pull/4987))
2639
- `opentelemetry-sdk`: Add `create_resource` and `create_propagator`/`configure_propagator` to declarative file configuration, enabling Resource and propagator instantiation from config files without reading env vars
2740
([#4979](https://github.com/open-telemetry/opentelemetry-python/pull/4979))
2841
- `opentelemetry-sdk`: Map Python `CRITICAL` log level to OTel `FATAL` severity text per the specification
@@ -61,6 +74,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
6174
([#5007](https://github.com/open-telemetry/opentelemetry-python/pull/5007))
6275
- Redo OTLPMetricExporter unit tests of `max_export_batch_size` to use real `export`
6376
([#5036](https://github.com/open-telemetry/opentelemetry-python/pull/5036))
77+
- `opentelemetry-sdk`: Implement experimental Logger configurator
78+
([#4980](https://github.com/open-telemetry/opentelemetry-python/pull/4980))
6479

6580
## Version 1.40.0/0.61b0 (2026-03-04)
6681

README.md

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -125,28 +125,23 @@ For more information about the maintainer role, see the [community repository](h
125125

126126
For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
127127

128-
### Emeritus Maintainers
129-
130-
- [Alex Boten](https://github.com/codeboten)
131-
- [Chris Kleinknecht](https://github.com/c24t)
132-
- [Diego Hurtado](https://github.com/ocelotl)
133-
- [Owais Lone](https://github.com/owais)
134-
- [Reiley Yang](https://github.com/reyang)
135-
- [Srikanth Chekuri](https://github.com/srikanthccv)
136-
- [Yusuke Tsutsumi](https://github.com/toumorokoshi)
137-
138-
For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
139-
140-
### Emeritus Approvers
141-
142-
- [Ashutosh Goel](https://github.com/ashu658)
143-
- [Carlos Alberto Cortez](https://github.com/carlosalberto)
144-
- [Christian Neumüller](https://github.com/Oberon00)
145-
- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal)
146-
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN)
147-
- [Nikolay Sokolik](https://github.com/oxeye-nikolay)
148-
- [Sanket Mehta](https://github.com/sanketmehta28)
149-
- [Tahir H. Butt](https://github.com/majorgreys)
128+
### Emeritus
129+
130+
- [Alex Boten](https://github.com/codeboten), Maintainer
131+
- [Ashutosh Goel](https://github.com/ashu658), Approver
132+
- [Carlos Alberto Cortez](https://github.com/carlosalberto), Approver
133+
- [Chris Kleinknecht](https://github.com/c24t), Maintainer
134+
- [Christian Neumüller](https://github.com/Oberon00), Approver
135+
- [Diego Hurtado](https://github.com/ocelotl), Maintainer
136+
- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal), Approver
137+
- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), Approver
138+
- [Nikolay Sokolik](https://github.com/oxeye-nikolay), Approver
139+
- [Owais Lone](https://github.com/owais), Maintainer
140+
- [Reiley Yang](https://github.com/reyang), Maintainer
141+
- [Sanket Mehta](https://github.com/sanketmehta28), Approver
142+
- [Srikanth Chekuri](https://github.com/srikanthccv), Maintainer
143+
- [Tahir H. Butt](https://github.com/majorgreys), Approver
144+
- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Maintainer
150145

151146
For more information about the emeritus role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager).
152147

codegen/opentelemetry-codegen-json/src/opentelemetry/codegen/json/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.61b0.dev"
15+
__version__ = "0.62b0.dev"

eachdist.ini

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

1313
[stable]
14-
version=1.41.0.dev
14+
version=1.42.0.dev
1515

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

2929
[prerelease]
30-
version=0.62b0.dev
30+
version=0.63b0.dev
3131

3232
packages=
3333
opentelemetry-opentracing-shim
3434
opentelemetry-opencensus-shim
3535
opentelemetry-exporter-opencensus
3636
opentelemetry-exporter-prometheus
3737
opentelemetry-distro
38+
opentelemetry-proto-json
3839
opentelemetry-semantic-conventions
3940
opentelemetry-test-utils
4041
tests

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.66.2, < 2.0.0; python_version == '3.13'",
3333
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
3434
"opencensus-proto >= 0.1.0, < 1.0.0",
35-
"opentelemetry-api >= 1.41.0.dev",
35+
"opentelemetry-api >= 1.42.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.62b0.dev"
15+
__version__ = "0.63b0.dev"

exporter/opentelemetry-exporter-otlp-proto-common/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.14",
2828
]
2929
dependencies = [
30-
"opentelemetry-proto == 1.41.0.dev",
30+
"opentelemetry-proto == 1.42.0.dev",
3131
]
3232

3333
[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.41.0.dev"
15+
__version__ = "1.42.0.dev"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ dependencies = [
3232
"grpcio >= 1.66.2, < 2.0.0; python_version == '3.13'",
3333
"grpcio >= 1.75.1, < 2.0.0; python_version >= '3.14'",
3434
"opentelemetry-api ~= 1.15",
35-
"opentelemetry-proto == 1.41.0.dev",
36-
"opentelemetry-sdk ~= 1.41.0.dev",
37-
"opentelemetry-exporter-otlp-proto-common == 1.41.0.dev",
35+
"opentelemetry-proto == 1.42.0.dev",
36+
"opentelemetry-sdk ~= 1.42.0.dev",
37+
"opentelemetry-exporter-otlp-proto-common == 1.42.0.dev",
3838
"typing-extensions >= 4.6.0",
3939
]
4040

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.41.0.dev"
15+
__version__ = "1.42.0.dev"

0 commit comments

Comments
 (0)