@@ -70,8 +70,11 @@ def test_system_metrics_instrument(self):
7070 meter_provider = MeterProvider (metric_readers = [reader ])
7171 system_metrics = SystemMetricsInstrumentor ()
7272 system_metrics .instrument (meter_provider = meter_provider )
73- metrics = reader .get_metrics ()
74- metric_names = list ({x .name for x in metrics })
73+ metric_names = []
74+ for resource_metrics in reader .get_metrics_data ().resource_metrics :
75+ for scope_metrics in resource_metrics .scope_metrics :
76+ for metric in scope_metrics .metrics :
77+ metric_names .append (metric .name )
7578 self .assertEqual (len (metric_names ), 17 )
7679
7780 observer_names = [
@@ -100,17 +103,22 @@ def test_system_metrics_instrument(self):
100103
101104 def _assert_metrics (self , observer_name , reader , expected ):
102105 assertions = 0
103- for metric in reader .get_metrics (): # pylint: disable=protected-access
104- for expect in expected :
105- if (
106- metric .attributes == expect .attributes
107- and metric .name == observer_name
108- ):
109- self .assertEqual (
110- metric .point .value ,
111- expect .value ,
112- )
113- assertions += 1
106+ # pylint: disable=too-many-nested-blocks
107+ for resource_metrics in reader .get_metrics_data ().resource_metrics :
108+ for scope_metrics in resource_metrics .scope_metrics :
109+ for metric in scope_metrics .metrics :
110+ for data_point in metric .data .data_points :
111+ for expect in expected :
112+ if (
113+ dict (data_point .attributes )
114+ == expect .attributes
115+ and metric .name == observer_name
116+ ):
117+ self .assertEqual (
118+ data_point .value ,
119+ expect .value ,
120+ )
121+ assertions += 1
114122 self .assertEqual (len (expected ), assertions )
115123
116124 def _test_metrics (self , observer_name , expected ):
0 commit comments