merge upstream/main

Assisted-by: Claude Sonnet 4.6

Author: MikeGoldsmith

CHANGELOG.md

@@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-sdk`: Add `create_logger_provider`/`configure_logger_provider` to declarative file configuration, enabling LoggerProvider instantiation from config files without reading env vars
   ([#4990](https://github.com/open-telemetry/opentelemetry-python/pull/4990))
+- `opentelemetry-sdk`: Add `host` resource detector support to declarative file configuration via `detection_development.detectors[].host`
+  ([#5002](https://github.com/open-telemetry/opentelemetry-python/pull/5002))
+- `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
+  ([#5004](https://github.com/open-telemetry/opentelemetry-python/pull/5004))
+- `opentelemetry-sdk`: Add `create_tracer_provider`/`configure_tracer_provider` to declarative file configuration, enabling TracerProvider instantiation from config files without reading env vars
+  ([#4985](https://github.com/open-telemetry/opentelemetry-python/pull/4985))
 - Enabled the flake8-tidy-import plugins rules for the ruff linter. These rules throw warnings for relative imports in the modules.
   ([#5019](https://github.com/open-telemetry/opentelemetry-python/pull/5019))
 - `opentelemetry-sdk`: Fix `AttributeError` in `ExplicitBucketHistogramAggregation` when applied to non-Histogram instruments without explicit boundaries
@@ -25,6 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `opentelemetry-sdk`: Add shared `_parse_headers` helper for declarative config OTLP exporters
   ([#5021](https://github.com/open-telemetry/opentelemetry-python/pull/5021))
 - `opentelemetry-api`: Replace a broad exception in attribute cleaning tests to satisfy pylint in the `lint-opentelemetry-api` CI job
+- `opentelemetry-sdk`: Add `create_meter_provider`/`configure_meter_provider` to declarative file configuration, enabling MeterProvider instantiation from config files without reading env vars
+  ([#4987](https://github.com/open-telemetry/opentelemetry-python/pull/4987))
 - `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
   ([#4979](https://github.com/open-telemetry/opentelemetry-python/pull/4979))
 - `opentelemetry-sdk`: Map Python `CRITICAL` log level to OTel `FATAL` severity text per the specification
@@ -63,6 +71,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#5007](https://github.com/open-telemetry/opentelemetry-python/pull/5007))
 - Redo OTLPMetricExporter unit tests of `max_export_batch_size` to use real `export`
   ([#5036](https://github.com/open-telemetry/opentelemetry-python/pull/5036))
+- `opentelemetry-sdk`: Implement experimental Logger configurator
+  ([#4980](https://github.com/open-telemetry/opentelemetry-python/pull/4980))
 
 ## Version 1.40.0/0.61b0 (2026-03-04)
 

README.md

@@ -125,28 +125,23 @@ For more information about the maintainer role, see the [community repository](h
 
 For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#approver).
 
-### Emeritus Maintainers
-
-- [Alex Boten](https://github.com/codeboten)
-- [Chris Kleinknecht](https://github.com/c24t)
-- [Diego Hurtado](https://github.com/ocelotl)
-- [Owais Lone](https://github.com/owais)
-- [Reiley Yang](https://github.com/reyang)
-- [Srikanth Chekuri](https://github.com/srikanthccv)
-- [Yusuke Tsutsumi](https://github.com/toumorokoshi)
-
-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).
-
-### Emeritus Approvers
-
-- [Ashutosh Goel](https://github.com/ashu658)
-- [Carlos Alberto Cortez](https://github.com/carlosalberto)
-- [Christian Neumüller](https://github.com/Oberon00)
-- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal)
-- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN)
-- [Nikolay Sokolik](https://github.com/oxeye-nikolay)
-- [Sanket Mehta](https://github.com/sanketmehta28)
-- [Tahir H. Butt](https://github.com/majorgreys)
+### Emeritus
+
+- [Alex Boten](https://github.com/codeboten), Maintainer
+- [Ashutosh Goel](https://github.com/ashu658), Approver
+- [Carlos Alberto Cortez](https://github.com/carlosalberto), Approver
+- [Chris Kleinknecht](https://github.com/c24t), Maintainer
+- [Christian Neumüller](https://github.com/Oberon00), Approver
+- [Diego Hurtado](https://github.com/ocelotl), Maintainer
+- [Mauricio Vásquez](https://github.com/mauriciovasquezbernal), Approver
+- [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), Approver
+- [Nikolay Sokolik](https://github.com/oxeye-nikolay), Approver
+- [Owais Lone](https://github.com/owais), Maintainer
+- [Reiley Yang](https://github.com/reyang), Maintainer
+- [Sanket Mehta](https://github.com/sanketmehta28), Approver
+- [Srikanth Chekuri](https://github.com/srikanthccv), Maintainer
+- [Tahir H. Butt](https://github.com/majorgreys), Approver
+- [Yusuke Tsutsumi](https://github.com/toumorokoshi), Maintainer
 
 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).
 

codegen/opentelemetry-codegen-json/src/opentelemetry/codegen/json/version/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.61b0.dev"
+__version__ = "0.62b0.dev"

opentelemetry-proto-json/src/opentelemetry/proto_json/version/__init__.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.61b0.dev"
+__version__ = "0.62b0.dev"

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

@@ -42,6 +42,7 @@
     LoggingHandler,
     LogRecordProcessor,
 )
+from opentelemetry.sdk._logs._internal import _LoggerConfiguratorT
 from opentelemetry.sdk._logs.export import (
     BatchLogRecordProcessor,
     LogRecordExporter,
@@ -52,6 +53,7 @@
     OTEL_EXPORTER_OTLP_METRICS_PROTOCOL,
     OTEL_EXPORTER_OTLP_PROTOCOL,
     OTEL_EXPORTER_OTLP_TRACES_PROTOCOL,
+    OTEL_PYTHON_LOGGER_CONFIGURATOR,
     OTEL_PYTHON_METER_CONFIGURATOR,
     OTEL_PYTHON_TRACER_CONFIGURATOR,
     OTEL_TRACES_SAMPLER,
@@ -177,6 +179,10 @@ def _get_meter_configurator() -> str | None:
     return environ.get(OTEL_PYTHON_METER_CONFIGURATOR, None)
 
 
+def _get_logger_configurator() -> str | None:
+    return environ.get(OTEL_PYTHON_LOGGER_CONFIGURATOR, None)
+
+
 def _get_exporter_entry_point(
     exporter_name: str, signal_type: Literal["traces", "metrics", "logs"]
 ):
@@ -297,6 +303,7 @@ def _init_metrics(
     set_meter_provider(provider)
 
 
+# pylint: disable-next=too-many-locals
 def _init_logging(
     exporters: dict[str, Type[LogRecordExporter]],
     resource: Resource | None = None,
@@ -305,8 +312,11 @@ def _init_logging(
     log_record_processors: Sequence[LogRecordProcessor] | None = None,
     export_log_record_processor: _ConfigurationExporterLogRecordProcessorT
     | None = None,
+    logger_configurator: _LoggerConfiguratorT | None = None,
 ):
-    provider = LoggerProvider(resource=resource)
+    provider = LoggerProvider(
+        resource=resource, _logger_configurator=logger_configurator
+    )
     set_logger_provider(provider)
 
     exporter_args_map = exporter_args_map or {}
@@ -377,6 +387,27 @@ def overwritten_config_fn(*args, **kwargs):
     logging.basicConfig = wrapper(logging.basicConfig)
 
 
+def _import_logger_configurator(
+    logger_configurator_name: str | None,
+) -> _LoggerConfiguratorT | None:
+    if not logger_configurator_name:
+        return None
+
+    try:
+        _, logger_configurator_impl = _import_config_components(
+            [logger_configurator_name.strip()],
+            "_opentelemetry_logger_configurator",
+        )[0]
+    except Exception as exc:  # pylint: disable=broad-exception-caught
+        _logger.warning(
+            "Using default logger configurator. Failed to load logger configurator, %s: %s",
+            logger_configurator_name,
+            exc,
+        )
+        return None
+    return logger_configurator_impl
+
+
 def _import_tracer_configurator(
     tracer_configurator_name: str | None,
 ) -> _TracerConfiguratorT | None:
@@ -540,6 +571,7 @@ def _initialize_components(
     | None = None,
     tracer_configurator: _TracerConfiguratorT | None = None,
     meter_configurator: _MeterConfiguratorT | None = None,
+    logger_configurator: _LoggerConfiguratorT | None = None,
 ):
     # pylint: disable=too-many-locals
     if trace_exporter_names is None:
@@ -576,6 +608,11 @@ def _initialize_components(
         meter_configurator = _import_meter_configurator(
             meter_configurator_name
         )
+    if logger_configurator is None:
+        logger_configurator_name = _get_logger_configurator()
+        logger_configurator = _import_logger_configurator(
+            logger_configurator_name
+        )
 
     # if env var OTEL_RESOURCE_ATTRIBUTES is given, it will read the service_name
     # from the env variable else defaults to "unknown_service"
@@ -613,6 +650,7 @@ def _initialize_components(
         exporter_args_map=exporter_args_map,
         log_record_processors=log_record_processors,
         export_log_record_processor=export_log_record_processor,
+        logger_configurator=logger_configurator,
     )