merge upstream/main

Assisted-by: Claude Sonnet 4.6

Author: MikeGoldsmith

CHANGELOG.md

@@ -14,6 +14,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `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))
+- 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
+  ([#5034](https://github.com/open-telemetry/opentelemetry-python/pull/5034))
+- Fix `BatchLogRecordProcessor` default `schedule_delay_millis` from 5000ms to 1000ms to comply with the OTel specification. Note: logs may be exported 5x more frequently by default (e.g. for users who don't explicitly set the `OTEL_BLRP_SCHEDULE_DELAY` env var).
+  ([#4998](https://github.com/open-telemetry/opentelemetry-python/pull/4998))
+- `opentelemetry-sdk`: Add `process` resource detector support to declarative file configuration via `detection_development.detectors[].process`
+  ([#5001](https://github.com/open-telemetry/opentelemetry-python/pull/5001))
 - `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
@@ -31,6 +39,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4935](https://github.com/open-telemetry/opentelemetry-python/pull/4935))
 - `opentelemetry-sdk`: implement metric reader metrics
   ([#4970](https://github.com/open-telemetry/opentelemetry-python/pull/4970))
+- `opentelemetry-sdk`: implement processor metrics
+  ([#5012](https://github.com/open-telemetry/opentelemetry-python/pull/5012))
 - `opentelemetry-sdk`: upgrade vendored OTel configuration schema from v1.0.0-rc.3 to v1.0.0
   ([#4965](https://github.com/open-telemetry/opentelemetry-python/pull/4965))
 - improve check-links ci job
@@ -45,10 +55,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#4910](https://github.com/open-telemetry/opentelemetry-python/pull/4910))
 - Add configurable `max_export_batch_size` to OTLP HTTP metrics exporter
   ([#4576](https://github.com/open-telemetry/opentelemetry-python/pull/4576))
+- `opentelemetry-sdk`: Implement experimental Meter configurator
+  ([#4966](https://github.com/open-telemetry/opentelemetry-python/pull/4966))
 - `opentelemetry-exporter-otlp-proto-http`: use consistent protobuf for export request
   ([#5015](https://github.com/open-telemetry/opentelemetry-python/pull/5015))
 - `opentelemetry-sdk`: cache TracerConfig into the tracer, this changes an internal interface. Only one Tracer with the same instrumentation scope will be created
   ([#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))
 
 ## Version 1.40.0/0.61b0 (2026-03-04)
 

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/_common/__init__.py

@@ -19,9 +19,6 @@
 
 from opentelemetry.sdk.environment_variables import (
     _OTEL_PYTHON_EXPORTER_OTLP_HTTP_CREDENTIAL_PROVIDER,
-    _OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER,
-    _OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
-    _OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
 )
 from opentelemetry.util._importlib_metadata import entry_points
 
@@ -36,9 +33,9 @@ def _is_retryable(resp: requests.Response) -> bool:
 
 def _load_session_from_envvar(
     cred_envvar: Literal[
-        _OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER,
-        _OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER,
-        _OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER,
+        "OTEL_PYTHON_EXPORTER_OTLP_HTTP_LOGS_CREDENTIAL_PROVIDER",
+        "OTEL_PYTHON_EXPORTER_OTLP_HTTP_TRACES_CREDENTIAL_PROVIDER",
+        "OTEL_PYTHON_EXPORTER_OTLP_HTTP_METRICS_CREDENTIAL_PROVIDER",
     ],
 ) -> Optional[requests.Session]:
     _credential_env = environ.get(

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/metric_exporter/__init__.py

@@ -443,6 +443,11 @@ def _split_metrics_data(
 
                         # Rebuild metric dict generically using same approach as initial creation
                         field_name = metric.WhichOneof("data")
+                        if field_name is None:
+                            _logger.warning(
+                                "Tried to split and export an unsupported metric type. Skipping."
+                            )
+                            continue
                         data_container = getattr(metric, field_name)
                         metric_dict = {
                             "name": metric.name,
@@ -552,13 +557,13 @@ def _get_split_resource_metrics_pb2(
         new_resource_metrics = pb2.ResourceMetrics(
             resource=resource_metrics.get("resource"),
             scope_metrics=[],
-            schema_url=resource_metrics.get("schema_url"),
+            schema_url=resource_metrics.get("schema_url") or "",
         )
         for scope_metrics in resource_metrics.get("scope_metrics", []):
             new_scope_metrics = pb2.ScopeMetrics(
                 scope=scope_metrics.get("scope"),
                 metrics=[],
-                schema_url=scope_metrics.get("schema_url"),
+                schema_url=scope_metrics.get("schema_url") or "",
             )
 
             for metric in scope_metrics.get("metrics", []):