Skip to content

Commit bff620d

Browse files
NelsonVidesNelsonVides
committed
Avoid introducing breaking changes to default exported quantiles
1 parent aa4d866 commit bff620d

File tree

4 files changed

+16
-44
lines changed

4 files changed

+16
-44
lines changed

‎src/metrics/prometheus_quantile_summary.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ value(Registry, Name, LabelValues) ->
336336

337337
-spec default_quantiles() -> [float()].
338338
default_quantiles() ->
339-
[0.0, 0.5, 0.75, 0.90, 0.95, 0.99, 0.999, 1.0].
339+
[0.5, 0.90, 0.95].
340340

341341
-spec values(prometheus_registry:registry(), prometheus_metric:name()) ->
342342
[{[{atom(), any()}], non_neg_integer(), infinity | number(), [{float(), float()}]}].

‎test/eunit/format/prometheus_protobuf_format_tests.erl

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,13 @@ test_quantile_summary(_) ->
104104
prometheus_quantile_summary:observe(orders_quantile_summary, 15),
105105
Format = prometheus_protobuf_format:format(),
106106
Expected =
107-
<<234, 1, 10, 23, 111, 114, 100, 101, 114, 115, 95, 113, 117, 97, 110, 116, 105, 108, 101,
107+
<<132, 1, 10, 23, 111, 114, 100, 101, 114, 115, 95, 113, 117, 97, 110, 116, 105, 108, 101,
108108
95, 115, 117, 109, 109, 97, 114, 121, 18, 28, 84, 114, 97, 99, 107, 32, 111, 114, 100,
109109
101, 114, 115, 32, 99, 111, 117, 110, 116, 47, 116, 111, 116, 97, 108, 32, 115, 117,
110-
109, 24, 2, 34, 174, 1, 34, 171, 1, 8, 2, 17, 0, 0, 0, 0, 0, 0, 57, 64, 26, 18, 9, 0, 0,
111-
0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 36, 64, 26, 18, 9, 0, 0, 0, 0, 0, 0, 224, 63,
112-
17, 42, 36, 253, 164, 62, 38, 36, 64, 26, 18, 9, 0, 0, 0, 0, 0, 0, 232, 63, 17, 51, 50,
113-
53, 169, 76, 15, 46, 64, 26, 18, 9, 205, 204, 204, 204, 204, 204, 236, 63, 17, 51, 50,
114-
53, 169, 76, 15, 46, 64, 26, 18, 9, 102, 102, 102, 102, 102, 102, 238, 63, 17, 51, 50,
115-
53, 169, 76, 15, 46, 64, 26, 18, 9, 174, 71, 225, 122, 20, 174, 239, 63, 17, 51, 50, 53,
116-
169, 76, 15, 46, 64, 26, 18, 9, 43, 135, 22, 217, 206, 247, 239, 63, 17, 51, 50, 53,
117-
169, 76, 15, 46, 64, 26, 18, 9, 0, 0, 0, 0, 0, 0, 240, 63, 17, 0, 0, 0, 0, 0, 0, 46,
118-
64>>,
110+
109, 24, 2, 34, 73, 34, 71, 8, 2, 17, 0, 0, 0, 0, 0, 0, 57, 64, 26, 18, 9, 0, 0, 0, 0,
111+
0, 0, 224, 63, 17, 42, 36, 253, 164, 62, 38, 36, 64, 26, 18, 9, 205, 204, 204, 204, 204,
112+
204, 236, 63, 17, 51, 50, 53, 169, 76, 15, 46, 64, 26, 18, 9, 102, 102, 102, 102, 102,
113+
102, 238, 63, 17, 51, 50, 53, 169, 76, 15, 46, 64>>,
119114
?_assertEqual(Expected, Format).
120115

121116
test_quantile_dsummary(_) ->
@@ -124,16 +119,12 @@ test_quantile_dsummary(_) ->
124119
prometheus_quantile_summary:observe(quantile_dsummary, 2.7),
125120
Format = prometheus_protobuf_format:format(),
126121
Expected =
127-
<<203, 1, 10, 17, 113, 117, 97, 110, 116, 105, 108, 101, 95, 100, 115, 117, 109, 109, 97,
128-
114, 121, 18, 3, 113, 119, 101, 24, 2, 34, 174, 1, 34, 171, 1, 8, 2, 17, 205, 204, 204,
129-
204, 204, 204, 16, 64, 26, 18, 9, 0, 0, 0, 0, 0, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 248, 63,
130-
26, 18, 9, 0, 0, 0, 0, 0, 0, 224, 63, 17, 162, 167, 157, 142, 179, 27, 248, 63, 26, 18,
131-
9, 0, 0, 0, 0, 0, 0, 232, 63, 17, 133, 58, 170, 243, 141, 135, 5, 64, 26, 18, 9, 205,
132-
204, 204, 204, 204, 204, 236, 63, 17, 133, 58, 170, 243, 141, 135, 5, 64, 26, 18, 9,
133-
102, 102, 102, 102, 102, 102, 238, 63, 17, 133, 58, 170, 243, 141, 135, 5, 64, 26, 18,
134-
9, 174, 71, 225, 122, 20, 174, 239, 63, 17, 133, 58, 170, 243, 141, 135, 5, 64, 26, 18,
135-
9, 43, 135, 22, 217, 206, 247, 239, 63, 17, 133, 58, 170, 243, 141, 135, 5, 64, 26, 18,
136-
9, 0, 0, 0, 0, 0, 0, 240, 63, 17, 154, 153, 153, 153, 153, 153, 5, 64>>,
122+
<<101, 10, 17, 113, 117, 97, 110, 116, 105, 108, 101, 95, 100, 115, 117, 109, 109, 97, 114,
123+
121, 18, 3, 113, 119, 101, 24, 2, 34, 73, 34, 71, 8, 2, 17, 205, 204, 204, 204, 204,
124+
204, 16, 64, 26, 18, 9, 0, 0, 0, 0, 0, 0, 224, 63, 17, 162, 167, 157, 142, 179, 27, 248,
125+
63, 26, 18, 9, 205, 204, 204, 204, 204, 204, 236, 63, 17, 133, 58, 170, 243, 141, 135,
126+
5, 64, 26, 18, 9, 102, 102, 102, 102, 102, 102, 238, 63, 17, 133, 58, 170, 243, 141,
127+
135, 5, 64>>,
137128
?_assertEqual(Expected, Format).
138129

139130
test_histogram(_) ->

‎test/eunit/format/prometheus_text_format_tests.erl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,9 @@ test_quantile_summary(_) ->
176176
"# HELP orders_quantile_summary Track orders count/total sum\n"
177177
"orders_quantile_summary_count 2\n"
178178
"orders_quantile_summary_sum 25\n"
179-
"orders_quantile_summary{quantile=\"0.0\"} 10\n"
180179
"orders_quantile_summary{quantile=\"0.5\"} 10.074696689511331\n"
181-
"orders_quantile_summary{quantile=\"0.75\"} 15.029881751769699\n"
182180
"orders_quantile_summary{quantile=\"0.9\"} 15.029881751769699\n"
183181
"orders_quantile_summary{quantile=\"0.95\"} 15.029881751769699\n"
184-
"orders_quantile_summary{quantile=\"0.99\"} 15.029881751769699\n"
185-
"orders_quantile_summary{quantile=\"0.999\"} 15.029881751769699\n"
186-
"orders_quantile_summary{quantile=\"1.0\"} 15\n"
187182
"\n"
188183
>>,
189184
Format
@@ -200,14 +195,9 @@ test_quantile_dsummary(_) ->
200195
"# HELP quantile_dsummary qwe\n"
201196
"quantile_dsummary_count{host=\"123\"} 2\n"
202197
"quantile_dsummary_sum{host=\"123\"} 4.2\n"
203-
"quantile_dsummary{host=\"123\",quantile=\"0.0\"} 1.5\n"
204198
"quantile_dsummary{host=\"123\",quantile=\"0.5\"} 1.5067630358630386\n"
205-
"quantile_dsummary{host=\"123\",quantile=\"0.75\"} 2.6911887203526157\n"
206199
"quantile_dsummary{host=\"123\",quantile=\"0.9\"} 2.6911887203526157\n"
207200
"quantile_dsummary{host=\"123\",quantile=\"0.95\"} 2.6911887203526157\n"
208-
"quantile_dsummary{host=\"123\",quantile=\"0.99\"} 2.6911887203526157\n"
209-
"quantile_dsummary{host=\"123\",quantile=\"0.999\"} 2.6911887203526157\n"
210-
"quantile_dsummary{host=\"123\",quantile=\"1.0\"} 2.7\n"
211201
"\n"
212202
>>,
213203
Format

‎test/eunit/metric/prometheus_quantile_summary_tests.erl

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,13 @@ test_merge_logic_when_fetching_value(_) ->
4444
[
4545
?_assertMatch(
4646
{100000, _, [
47-
{+0.0, Q0},
4847
{0.5, Q5},
49-
{0.75, Q75},
5048
{0.90, Q90},
51-
{0.95, Q95},
52-
{0.99, Q99},
53-
{0.999, Q999},
54-
{1.0, Q1}
49+
{0.95, Q95}
5550
]} when
56-
(abs(1 - Q0) =< 1) andalso
57-
(abs(50 - Q5) =< 1) andalso
58-
(abs(75 - Q75) =< 1) andalso
51+
(abs(50 - Q5) =< 1) andalso
5952
(abs(90 - Q90) =< 1) andalso
60-
(abs(95 - Q95) =< 1) andalso
61-
(abs(99 - Q99) =< 1) andalso
62-
(abs(100 - Q999) =< 1) andalso
63-
(abs(100 - Q1) =< 1),
53+
(abs(95 - Q95) =< 1),
6454
Value
6555
)
6656
].
@@ -177,6 +167,7 @@ test_observe_quantiles(_) ->
177167
prometheus_quantile_summary:new([
178168
{name, orders_summary_q},
179169
{labels, [department]},
170+
{quantiles, [0.0, 0.5, 0.75, 0.90, 0.95, 0.99, 0.999, 1.0]},
180171
{help, "Track orders quantiles"}
181172
]),
182173
[

0 commit comments

Comments
 (0)