Merge branch 'main' into name

Author: srikanthccv

CHANGELOG.md

@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2720](https://github.com/open-telemetry/opentelemetry-python/pull/2720))
 - Specify worker thread names
   ([#2724](https://github.com/open-telemetry/opentelemetry-python/pull/2724))
+- Loosen dependency on `backoff` for newer Python versions
+  ([#2726](https://github.com/open-telemetry/opentelemetry-python/pull/2726))
+- fix: frozenset object has no attribute items
+  ([#2727](https://github.com/open-telemetry/opentelemetry-python/pull/2727))
 
 ## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17
 

exporter/opentelemetry-exporter-otlp-proto-grpc/setup.cfg

@@ -45,7 +45,8 @@ install_requires =
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.11
     opentelemetry-proto == 1.12.0rc1
-    backoff >= 1.10.0, < 2.0.0
+    backoff >= 1.10.0, < 2.0.0; python_version<'3.7'
+    backoff >= 1.10.0, < 3.0.0; python_version>='3.7'
 
 [options.extras_require]
 test =

exporter/opentelemetry-exporter-otlp-proto-http/setup.cfg

@@ -45,7 +45,8 @@ install_requires =
     opentelemetry-api ~= 1.3
     opentelemetry-sdk ~= 1.11
     opentelemetry-proto == 1.12.0rc1
-    backoff >= 1.10.0, < 2.0.0
+    backoff >= 1.10.0, < 2.0.0; python_version<'3.7'
+    backoff >= 1.10.0, < 3.0.0; python_version>='3.7'
 
 [options.extras_require]
 test =

opentelemetry-sdk/src/opentelemetry/sdk/metrics/_internal/_view_instrument_match.py

@@ -95,11 +95,11 @@ def consume_measurement(self, measurement: Measurement) -> None:
         else:
             attributes = {}
 
-        attributes = frozenset(attributes.items())
+        aggr_key = frozenset(attributes.items())
 
-        if attributes not in self._attributes_aggregation:
+        if aggr_key not in self._attributes_aggregation:
             with self._lock:
-                if attributes not in self._attributes_aggregation:
+                if aggr_key not in self._attributes_aggregation:
                     if not isinstance(
                         self._view._aggregation, DefaultAggregation
                     ):
@@ -118,9 +118,9 @@ def consume_measurement(self, measurement: Measurement) -> None:
                             attributes,
                             self._start_time_unix_nano,
                         )
-                    self._attributes_aggregation[attributes] = aggregation
+                    self._attributes_aggregation[aggr_key] = aggregation
 
-        self._attributes_aggregation[attributes].aggregate(measurement)
+        self._attributes_aggregation[aggr_key].aggregate(measurement)
 
     def collect(
         self,

opentelemetry-sdk/tests/metrics/test_view_instrument_match.py

@@ -209,7 +209,7 @@ def test_collect(self):
 
         number_data_point = number_data_points[0]
 
-        self.assertEqual(number_data_point.attributes, frozenset({("c", "d")}))
+        self.assertEqual(number_data_point.attributes, {"c": "d"})
         self.assertEqual(number_data_point.value, 0)
 
     def test_setting_aggregation(self):