Merge branch 'main' into xrmx-patch-3

Author: xrmx

README.md

@@ -113,7 +113,7 @@ Meeting notes are available as a public [Google doc](https://docs.google.com/doc
 
 Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telemetry/teams/python-approvers)):
 
-- [Emídio Neto](https://github.com/emdneto), Zenvia
+- [Emídio Neto](https://github.com/emdneto), PicPay
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
 - [Owais Lone](https://github.com/owais), Splunk
 - [Pablo Collins](https://github.com/pmcollins), Splunk

gen-requirements.txt

@@ -1,6 +1,6 @@
 -c dev-requirements.txt
 astor==0.8.1
-jinja2==3.1.4
+jinja2==3.1.6
 markupsafe==2.0.1
 ruff==0.6.9
 requests

instrumentation/opentelemetry-instrumentation-urllib/tests/test_metrics_instrumentation.py

@@ -414,16 +414,16 @@ def test_metric_uninstrument(self):
             ) = metrics[:3]
 
             self.assertEqual(
-                client_duration.data.data_points[0].bucket_counts[1],
+                sum(client_duration.data.data_points[0].bucket_counts),
                 1,
             )
 
             self.assertEqual(
-                client_request_size.data.data_points[0].bucket_counts[0],
+                sum(client_request_size.data.data_points[0].bucket_counts),
                 1,
             )
             self.assertEqual(
-                client_response_size.data.data_points[0].bucket_counts[2],
+                sum(client_response_size.data.data_points[0].bucket_counts),
                 1,
             )
 
@@ -439,15 +439,15 @@ def test_metric_uninstrument(self):
             ) = metrics[:3]
 
             self.assertEqual(
-                client_duration.data.data_points[0].bucket_counts[1],
+                sum(client_duration.data.data_points[0].bucket_counts),
                 2,
             )
             self.assertEqual(
-                client_request_size.data.data_points[0].bucket_counts[0],
+                sum(client_request_size.data.data_points[0].bucket_counts),
                 2,
             )
             self.assertEqual(
-                client_response_size.data.data_points[0].bucket_counts[2],
+                sum(client_response_size.data.data_points[0].bucket_counts),
                 2,
             )
 
@@ -467,15 +467,15 @@ def test_metric_uninstrument(self):
             self.assertEqual(len(metrics), 3)
 
             self.assertEqual(
-                client_duration.data.data_points[0].bucket_counts[1],
+                sum(client_duration.data.data_points[0].bucket_counts),
                 2,
             )
             self.assertEqual(
-                client_request_size.data.data_points[0].bucket_counts[0],
+                sum(client_request_size.data.data_points[0].bucket_counts),
                 2,
             )
 
             self.assertEqual(
-                client_response_size.data.data_points[0].bucket_counts[2],
+                sum(client_response_size.data.data_points[0].bucket_counts),
                 2,
             )