Merge branch 'main' into exclude_attribute

Author: lzchen

.changelog/5220.added

@@ -0,0 +1 @@
+`opentelemetry-docker-tests`: Refactor Docker tests to properly validate contents of exported telemetry

.changelog/5329.changed

@@ -0,0 +1 @@
+opentelemetry-sdk: revert BoundedAttributes RLock back to Lock

.changelog/5340.fixed

@@ -0,0 +1 @@
+`opentelemetry-sdk`: raise `ValueError` when `ExplicitBucketHistogramAggregation` boundaries are not strictly increasing or finite

.changelog/5347.added

@@ -0,0 +1 @@
+`opentelemetry-sdk`: point the declarative configuration package README at the shared [language support status matrix](https://github.com/open-telemetry/opentelemetry-configuration/blob/main/language-support-status.md#python) in the `opentelemetry-configuration` repo, so Python conformance status lives alongside the other languages instead of being duplicated per language SDK.

.changelog/5353.added

@@ -0,0 +1 @@
+`opentelemetry-sdk`: document that Python-implementation extensions (`OTEL_PYTHON_*` variables) are bypassed when `OTEL_CONFIG_FILE` is set. The env-var initialisation path is skipped entirely in favour of the declarative file; honouring these alongside a config file is tracked as a follow-up.

.changelog/5363.added

@@ -0,0 +1 @@
+`opentelemetry-sdk`: wire id_generator from declarative configuration to TracerProvider

CONTRIBUTING.md

@@ -73,6 +73,14 @@ You can run `tox` with the following arguments:
 - `tox -e tracecontext` to run integration tests for tracecontext.
 - `tox -e precommit` to run all `pre-commit` actions
 
+The `docker-tests-otlpexporter` tests use
+[inline-snapshot](https://github.com/15r10nk/inline-snapshot) to assert
+on expected values inline in the test code. If you need to create or
+update a snapshot, run the tests with `--inline-snapshot=create` or
+`--inline-snapshot=fix` (see the
+[inline-snapshot docs](https://15r10nk.github.io/inline-snapshot/latest/)
+for all options).
+
 ### Changelog
 
 This project uses [towncrier](https://towncrier.readthedocs.io/) to manage the changelog. Instead of editing `CHANGELOG.md` directly, each PR should include a changelog fragment file in the `.changelog/` directory.

docs/sdk/configuration.rst

@@ -119,6 +119,13 @@ Behavior notes
   not consulted. Environment variables can still be read indirectly by
   components the file enables (for example resource detectors) and via
   ``${env:VAR}`` substitution.
+* Python-implementation extensions (``OTEL_PYTHON_*`` variables such as
+  ``OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED`` or
+  ``OTEL_PYTHON_TRACER_CONFIGURATOR``) are **not** applied when
+  ``OTEL_CONFIG_FILE`` is set: the env-var initialisation path is skipped
+  entirely. If your app currently relies on one of these and you are
+  migrating to a config file, plan to capture the equivalent behaviour in
+  the file (or in code) instead.
 * Sections omitted from the file leave the corresponding global provider
   unset (a no-op provider), per the specification.
 * Setting ``disabled: true`` at the top level turns the SDK into a no-op.

opentelemetry-api/src/opentelemetry/attributes/__init__.py

@@ -262,7 +262,7 @@ def __init__(
             MutableMapping[str, types.AnyValue]
             | OrderedDict[str, types.AnyValue]
         ) = {}
-        self._lock = threading.RLock()
+        self._lock = threading.Lock()
         if attributes:
             for key, value in attributes.items():
                 self[key] = value

opentelemetry-api/tests/attributes/test_attributes.py

@@ -4,6 +4,8 @@
 # type: ignore
 
 import copy
+import logging
+import threading
 import unittest
 import unittest.mock
 from collections.abc import MutableSequence
@@ -269,19 +271,47 @@ def test_immutable(self):
         with self.assertRaises(TypeError):
             bdict["should-not-work"] = "dict immutable"
 
-    def test_locking(self):
-        """Supporting test case for a commit titled: Fix class BoundedAttributes to have RLock rather than Lock. See #3858.
-        The change was introduced because __iter__ of the class BoundedAttributes holds lock, and we observed some deadlock symptoms
-        in the codebase. This test case is to verify that the fix works as expected.
+    def test_no_deadlock_on_reentrant_logging(self):
+        """Regression test for #3858.
+
+        The deadlock scenario: a logging handler intercepts the warning
+        emitted by _clean_attribute for an invalid value and calls __setitem__
+        on the same BoundedAttributes instance from the same thread.
+        With _clean_attribute called inside the lock this caused a deadlock.
+        With _clean_attribute called before the lock is acquired, no deadlock
+        occurs.
         """
         bdict = BoundedAttributes(immutable=False)
 
-        with bdict._lock:  # pylint: disable=protected-access
-            for num in range(100):
-                bdict[str(num)] = num
-
-        for num in range(100):
-            self.assertEqual(bdict[str(num)], num)
+        class ReentrantHandler(logging.Handler):
+            def emit(self, _record):
+                # Simulates Sentry intercepting the OTel warning and writing
+                # back into the same BoundedAttributes on the same thread.
+                bdict["reentrant.key"] = "set_by_handler"
+
+        otel_logger = logging.getLogger("opentelemetry.attributes")
+        handler = ReentrantHandler()
+        otel_logger.addHandler(handler)
+        try:
+            completed = threading.Event()
+
+            def run():
+                # None is an invalid attribute value and triggers _logger.warning
+                # in _clean_attribute, which fires the ReentrantHandler above.
+                bdict["trigger.key"] = None
+                completed.set()
+
+            thread = threading.Thread(target=run, daemon=True)
+            thread.start()
+            thread.join(timeout=2.0)
+
+            self.assertTrue(
+                completed.is_set(),
+                "Deadlock detected: __setitem__ did not complete within 2s",
+            )
+            self.assertEqual(bdict.get("reentrant.key"), "set_by_handler")
+        finally:
+            otel_logger.removeHandler(handler)
 
     # pylint: disable=no-self-use
     def test_extended_attributes(self):