@@ -223,28 +223,22 @@ def test_pyramid_metric(self):
223223 self .client .get ("/hello/756" )
224224 self .client .get ("/hello/756" )
225225 self .client .get ("/hello/756" )
226- metrics_list = self .memory_metrics_reader . get_metrics_data ()
226+ metrics = self .get_sorted_metrics ()
227227 number_data_point_seen = False
228228 histogram_data_point_seen = False
229- self .assertTrue (len (metrics_list .resource_metrics ) == 1 )
230- for resource_metric in metrics_list .resource_metrics :
231- self .assertTrue (len (resource_metric .scope_metrics ) == 1 )
232- for scope_metric in resource_metric .scope_metrics :
233- self .assertTrue (len (scope_metric .metrics ) == 2 )
234- for metric in scope_metric .metrics :
235- self .assertIn (metric .name , _expected_metric_names )
236- data_points = list (metric .data .data_points )
237- self .assertEqual (len (data_points ), 1 )
238- for point in data_points :
239- if isinstance (point , HistogramDataPoint ):
240- self .assertEqual (point .count , 3 )
241- histogram_data_point_seen = True
242- if isinstance (point , NumberDataPoint ):
243- number_data_point_seen = True
244- for attr in point .attributes :
245- self .assertIn (
246- attr , _recommended_attrs [metric .name ]
247- )
229+ self .assertEqual (len (metrics ), 2 )
230+ for metric in metrics :
231+ self .assertIn (metric .name , _expected_metric_names )
232+ data_points = list (metric .data .data_points )
233+ self .assertEqual (len (data_points ), 1 )
234+ for point in data_points :
235+ if isinstance (point , HistogramDataPoint ):
236+ self .assertEqual (point .count , 3 )
237+ histogram_data_point_seen = True
238+ if isinstance (point , NumberDataPoint ):
239+ number_data_point_seen = True
240+ for attr in point .attributes :
241+ self .assertIn (attr , _recommended_attrs [metric .name ])
248242 self .assertTrue (number_data_point_seen and histogram_data_point_seen )
249243
250244 def test_basic_metric_success (self ):
0 commit comments