@@ -32,15 +32,10 @@ def setUp(self):
32
32
set_meter_provider (metrics .MeterProvider ())
33
33
self ._meter = get_meter_provider ().get_meter (__name__ )
34
34
self ._test_metric = self ._meter .create_metric (
35
- "testname" ,
36
- "testdesc" ,
37
- "unit" ,
38
- int ,
39
- metrics .Counter ,
40
- ["environment" ],
35
+ "testname" , "testdesc" , "unit" , int , metrics .Counter ,
41
36
)
42
37
labels = {"environment" : "staging" }
43
- self ._labels_key = metrics .get_labels_as_key (labels )
38
+ self ._labels_key = metrics .get_dict_as_key (labels )
44
39
45
40
self ._mock_registry_register = mock .Mock ()
46
41
self ._registry_register_patch = mock .patch (
@@ -78,15 +73,10 @@ def test_export(self):
78
73
def test_counter_to_prometheus (self ):
79
74
meter = get_meter_provider ().get_meter (__name__ )
80
75
metric = meter .create_metric (
81
- "test@name" ,
82
- "testdesc" ,
83
- "unit" ,
84
- int ,
85
- metrics .Counter ,
86
- ["environment@" , "os" ],
76
+ "test@name" , "testdesc" , "unit" , int , metrics .Counter ,
87
77
)
88
78
labels = {"environment@" : "staging" , "os" : "Windows" }
89
- key_labels = metrics .get_labels_as_key (labels )
79
+ key_labels = metrics .get_dict_as_key (labels )
90
80
aggregator = SumAggregator ()
91
81
aggregator .update (123 )
92
82
aggregator .take_checkpoint ()
@@ -117,7 +107,7 @@ def test_invalid_metric(self):
117
107
"tesname" , "testdesc" , "unit" , int , StubMetric
118
108
)
119
109
labels = {"environment" : "staging" }
120
- key_labels = metrics .get_labels_as_key (labels )
110
+ key_labels = metrics .get_dict_as_key (labels )
121
111
record = MetricRecord (metric , key_labels , None )
122
112
collector = CustomCollector ("testprefix" )
123
113
collector .add_metrics_data ([record ])
@@ -143,15 +133,8 @@ def __init__(
143
133
unit : str ,
144
134
value_type ,
145
135
meter ,
146
- label_keys ,
147
136
enabled : bool = True ,
148
137
):
149
138
super ().__init__ (
150
- name ,
151
- description ,
152
- unit ,
153
- value_type ,
154
- meter ,
155
- label_keys = label_keys ,
156
- enabled = enabled ,
139
+ name , description , unit , value_type , meter , enabled = enabled ,
157
140
)
0 commit comments