Merge branch 'main' into validate_utf8_string_in_setters

Author: owent

CHANGELOG.md

@@ -18,6 +18,10 @@ Increment the:
 * [SDK] Add bundle version of utf8_range to validate attributes
   [#3512](https://github.com/open-telemetry/opentelemetry-cpp/pull/3512)
 
+* [TEST] Remove workaround for metrics cardinality limit test
+  [#3663](https://github.com/open-telemetry/opentelemetry-cpp/pull/3663)
+
+
 ## [1.23 2025-09-25]
 
 * [CodeHealth] Fix clang-tidy warnings part 6

sdk/test/metrics/sum_aggregation_test.cc

@@ -194,11 +194,7 @@ TEST(HistogramToSumFilterAttributesWithCardinalityLimit, Double)
       {
         for (const MetricData &md : smd.metric_data_)
         {
-          // Something weird about attributes hashmap. If cardinality is setup to n, it emits n-1
-          // including overflow. Just making the logic generic here to succeed for n or n-1 total
-          // cardinality.
-          EXPECT_GE(cardinality_limit, md.point_data_attr_.size());
-          EXPECT_LT(cardinality_limit / 2, md.point_data_attr_.size());
+          EXPECT_EQ(cardinality_limit, md.point_data_attr_.size());
           for (size_t i = 0; i < md.point_data_attr_.size(); i++)
           {
             EXPECT_EQ(1, md.point_data_attr_[i].attributes.size());
@@ -380,8 +376,7 @@ TEST(CounterToSumFilterAttributesWithCardinalityLimit, Double)
           // resulting in a total of cardinality_limit sets. This test checks that the number of
           // emitted attribute sets is within the expected range, accounting for the overflow
           // behavior.
-          EXPECT_GE(cardinality_limit, md.point_data_attr_.size());
-          EXPECT_LT(cardinality_limit / 2, md.point_data_attr_.size());
+          EXPECT_EQ(cardinality_limit, md.point_data_attr_.size());
           for (size_t i = 0; i < md.point_data_attr_.size(); i++)
           {
             EXPECT_EQ(1, md.point_data_attr_[i].attributes.size());