Merge branch 'main' of github.com:open-telemetry/opentelemetry-python into 4907

Author: iblancasa

.github/workflows/stale.yml

@@ -33,3 +33,5 @@ jobs:
             This PR has been closed due to inactivity. Please reopen if you would
             like to continue working on it.
           exempt-pr-labels: "hold,WIP,blocked by spec,do not merge"
+          # TODO: Revert back to default of 30 after we have cleared the backlog of stale PRs.
+          operations-per-run: 500

CHANGELOG.md

@@ -14,10 +14,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - logs: add exception support to Logger emit and LogRecord attributes
   ([#4907](https://github.com/open-telemetry/opentelemetry-python/issues/4907))
+- `opentelemetry-sdk`: Add file configuration support with YAML/JSON loading, environment variable substitution, and schema validation against the vendored OTel config JSON schema
+  ([#4898](https://github.com/open-telemetry/opentelemetry-python/pull/4898))
 - Fix intermittent CI failures in `getting-started` and `tracecontext` jobs caused by GitHub git CDN SHA propagation lag by installing contrib packages from the already-checked-out local copy instead of a second git clone
   ([#4958](https://github.com/open-telemetry/opentelemetry-python/pull/4958))
 - `opentelemetry-sdk`: fix type annotations on `MetricReader` and related types
   ([#4938](https://github.com/open-telemetry/opentelemetry-python/pull/4938/))
+- Implement log creation metric
+  ([#4935](https://github.com/open-telemetry/opentelemetry-python/pull/4935))
+- `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))
 
 ## Version 1.40.0/0.61b0 (2026-03-04)
 

opentelemetry-api/tests/logs/test_proxy.py

@@ -83,6 +83,7 @@ def test_proxy_logger_forwards_exception_with_record(self):
         record = _logs.LogRecord()
         exception = ValueError("boom")
 
+        self.assertIsNotNone(logger._real_logger)
         logger.emit(record, exception=exception)
 
         logger._real_logger.emit.assert_called_once_with(

opentelemetry-sdk/pyproject.toml

@@ -32,6 +32,12 @@ dependencies = [
   "typing-extensions >= 4.5.0",
 ]
 
+[project.optional-dependencies]
+file-configuration = [
+  "pyyaml >= 6.0",
+  "jsonschema >= 4.0",
+]
+
 [project.entry-points.opentelemetry_environment_variables]
 sdk = "opentelemetry.sdk.environment_variables"
 

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/README.md

@@ -0,0 +1,29 @@
+# SDK File Configuration
+
+This package implements [OpenTelemetry file-based configuration](https://opentelemetry.io/docs/specs/otel/configuration).
+
+## Files
+
+- `schema.json` — vendored copy of the [OpenTelemetry configuration JSON schema](https://github.com/open-telemetry/opentelemetry-configuration)
+- `models.py` — Python dataclasses generated from `schema.json` by [datamodel-code-generator](https://github.com/koxudaxi/datamodel-code-generator)
+
+## Updating the schema
+
+1. Download the new schema from the [opentelemetry-configuration releases](https://github.com/open-telemetry/opentelemetry-configuration/releases):
+
+   ```sh
+   curl -o opentelemetry-sdk/src/opentelemetry/sdk/_configuration/schema.json \
+     https://raw.githubusercontent.com/open-telemetry/opentelemetry-configuration/refs/tags/vX.Y.Z/opentelemetry_configuration.json
+   ```
+
+2. Regenerate `models.py`:
+
+   ```sh
+   tox -e generate-config-from-jsonschema
+   ```
+
+3. Update any version string references in tests and source:
+
+   ```sh
+   grep -r "OLD_VERSION" opentelemetry-sdk/
+   ```

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

@@ -0,0 +1,41 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""OpenTelemetry SDK File Configuration.
+
+This module provides support for configuring the OpenTelemetry SDK
+using declarative configuration files (YAML or JSON).
+
+Example:
+    >>> from opentelemetry.sdk._configuration.file import load_config_file
+    >>> config = load_config_file("otel-config.yaml")
+    >>> print(config.file_format)
+    '1.0'
+"""
+
+from opentelemetry.sdk._configuration.file._env_substitution import (
+    EnvSubstitutionError,
+    substitute_env_vars,
+)
+from opentelemetry.sdk._configuration.file._loader import (
+    ConfigurationError,
+    load_config_file,
+)
+
+__all__ = [
+    "load_config_file",
+    "substitute_env_vars",
+    "ConfigurationError",
+    "EnvSubstitutionError",
+]

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/file/_env_substitution.py

@@ -0,0 +1,86 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Environment variable substitution for configuration files."""
+
+import logging
+import os
+import re
+
+_logger = logging.getLogger(__name__)
+
+
+class EnvSubstitutionError(Exception):
+    """Raised when environment variable substitution fails.
+
+    This occurs when a ${VAR} reference is found but the environment
+    variable is not set and no default value is provided.
+    """
+
+
+def substitute_env_vars(text: str) -> str:
+    """Substitute environment variables in configuration text.
+
+    Supports the following syntax:
+    - ${VAR}: Substitute with environment variable VAR. Raises error if not found.
+    - ${VAR:-default}: Substitute with VAR if set, otherwise use default value.
+    - $$: Escape sequence for literal $.
+
+    Args:
+        text: Configuration text with potential ${VAR} placeholders.
+
+    Returns:
+        Text with environment variables substituted.
+
+    Raises:
+        EnvSubstitutionError: If a required environment variable is not found.
+
+    Examples:
+        >>> os.environ['SERVICE_NAME'] = 'my-service'
+        >>> substitute_env_vars('name: ${SERVICE_NAME}')
+        'name: my-service'
+        >>> substitute_env_vars('name: ${MISSING:-default}')
+        'name: default'
+        >>> substitute_env_vars('price: $$100')
+        'price: $100'
+    """
+    # Pattern matches $$ (escape sequence) or ${VAR_NAME} / ${VAR_NAME:-default_value}
+    # Handling both in a single pass ensures $$ followed by ${VAR} works correctly
+    pattern = r"\$\$|\$\{([A-Za-z_][A-Za-z0-9_]*)(:-([^}]*))?\}"
+
+    def replace_var(match) -> str:
+        if match.group(1) is None:
+            # Matched $$, return literal $
+            return "$"
+
+        var_name = match.group(1)
+        has_default = match.group(2) is not None
+        default_value = match.group(3) if has_default else None
+
+        value = os.environ.get(var_name)
+
+        if value is None:
+            if has_default:
+                return default_value or ""
+            _logger.error(
+                "Environment variable '%s' not found and no default provided",
+                var_name,
+            )
+            raise EnvSubstitutionError(
+                f"Environment variable '{var_name}' not found and no default provided"
+            )
+
+        return value
+
+    return re.sub(pattern, replace_var, text)