Merge branch 'main' into dependabot/github_actions/github-actions-f65240ce72

Author: xrmx

CHANGELOG.md

@@ -16,6 +16,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   to crash at shutdown with a max recursion error ([#4586](https://github.com/open-telemetry/opentelemetry-python/pull/4586)).
 - Configurable max retry timeout for grpc exporter
   ([#4333](https://github.com/open-telemetry/opentelemetry-python/pull/4333))
+- opentelemetry-api: allow importlib-metadata 8.7.0
+  ([#4593](https://github.com/open-telemetry/opentelemetry-python/pull/4593))
+- opentelemetry-test-utils: assert explicit bucket boundaries in histogram metrics
+  ([#4595](https://github.com/open-telemetry/opentelemetry-python/pull/4595))
 
 ## Version 1.33.0/0.54b0 (2025-05-09)
 

RELEASING.md

@@ -22,13 +22,16 @@
   * Press the "Run workflow" button, then select the release branch from the dropdown list,
     e.g. `release/v1.9.x`, then enter the pull request number that you want to backport,
     then click the "Run workflow" button below that.
+  * Add the label `backport` to the generated pull request.
+  * In case label automation doesn't work, just close and reopen the PR so that the workflow will take into account the label automation we have in place.
   * Review and merge the backport pull request that it generates.
 * Merge a pull request to the release branch updating the `CHANGELOG.md`.
   * The heading for the unreleased entries should be `## Unreleased`.
 * Run the [Prepare patch release workflow](https://github.com/open-telemetry/opentelemetry-python/actions/workflows/prepare-patch-release.yml).
   * Press the "Run workflow" button, then select the release branch from the dropdown list,
     e.g. `release/v1.9.x`, and click the "Run workflow" button below that.
   * Review and merge the pull request that it creates for updating the version.
+* Note: If you are doing a patch release in `-core` repo, you should also do an equivalent patch release in `-contrib` repo (even if there's no fix to release), otherwise tests in CI will fail.
 
 ## Making the release
 

opentelemetry-api/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
     "Deprecated >= 1.2.6",
     # FIXME This should be able to be removed after 3.12 is released if there is a reliable API
     # in importlib.metadata.
-    "importlib-metadata >= 6.0, < 8.7.0",
+    "importlib-metadata >= 6.0, < 8.8.0",
 ]
 dynamic = [
     "version",

opentelemetry-api/test-requirements.txt

@@ -1,7 +1,7 @@
 asgiref==3.7.2
 Deprecated==1.2.14
 importlib-metadata==8.5.0 ; python_version < "3.9"
-importlib-metadata==8.6.1 ; python_version >= "3.9"
+importlib-metadata==8.7.0 ; python_version >= "3.9"
 iniconfig==2.0.0
 packaging==24.0
 pluggy==1.5.0

tests/opentelemetry-test-utils/src/opentelemetry/test/test_base.py

@@ -20,6 +20,9 @@
 from opentelemetry import metrics as metrics_api
 from opentelemetry import trace as trace_api
 from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.sdk.metrics._internal.aggregation import (
+    _DEFAULT_EXPLICIT_BUCKET_HISTOGRAM_AGGREGATION_BOUNDARIES,
+)
 from opentelemetry.sdk.metrics._internal.point import Metric
 from opentelemetry.sdk.metrics.export import (
     DataPointT,
@@ -204,6 +207,12 @@ def is_data_points_equal(
             ):
                 return False
 
+            if (
+                expected_data_point.explicit_bounds
+                != data_point.explicit_bounds
+            ):
+                return False
+
         return (
             values_diff <= est_value_delta
             and expected_data_point.attributes == dict(data_point.attributes)
@@ -239,7 +248,12 @@ def create_number_data_point(value, attributes):
 
     @staticmethod
     def create_histogram_data_point(
-        sum_data_point, count, max_data_point, min_data_point, attributes
+        sum_data_point,
+        count,
+        max_data_point,
+        min_data_point,
+        attributes,
+        explicit_bounds=None,
     ):
         return HistogramDataPoint(
             count=count,
@@ -250,7 +264,9 @@ def create_histogram_data_point(
             start_time_unix_nano=0,
             time_unix_nano=0,
             bucket_counts=[],
-            explicit_bounds=[],
+            explicit_bounds=explicit_bounds
+            if explicit_bounds is not None
+            else _DEFAULT_EXPLICIT_BUCKET_HISTOGRAM_AGGREGATION_BOUNDARIES,
         )