Skip to content

Commit f9731b8

Browse files
committed
Revert GetNames() redundant change.
1 parent b3de1f9 commit f9731b8

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

simpleclient/src/main/java/io/prometheus/client/Collector.java

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -149,43 +149,44 @@ public MetricFamilySamples filter(Predicate<String> sampleNameFilter) {
149149
* {@code # HELP}), and as this name <a href="https://github.com/prometheus/common/issues/319">must be unique</a>
150150
* we include the name without suffix here as well.
151151
*/
152-
public List<String> getNames() {
153-
List<String> names = new ArrayList<String>();
152+
public String[] getNames() {
154153
switch (type) {
155154
case COUNTER:
156-
names.add(name + "_total");
157-
if (USE_CREATED) {
158-
names.add(name + "_created");
159-
}
160-
break;
155+
return new String[]{
156+
name + "_total",
157+
name + "_created",
158+
name
159+
};
161160
case SUMMARY:
162-
names.add(name + "_count");
163-
names.add(name + "_sum");
164-
if (USE_CREATED) {
165-
names.add(name + "_created");
166-
}
167-
break;
161+
return new String[]{
162+
name + "_count",
163+
name + "_sum",
164+
name + "_created",
165+
name
166+
};
168167
case HISTOGRAM:
169-
names.add(name + "_count");
170-
names.add(name + "_sum");
171-
names.add(name + "_bucket");
172-
if (USE_CREATED) {
173-
names.add(name + "_created");
174-
}
175-
break;
168+
return new String[]{
169+
name + "_count",
170+
name + "_sum",
171+
name + "_bucket",
172+
name + "_created",
173+
name
174+
};
176175
case GAUGE_HISTOGRAM:
177-
names.add(name + "_gcount");
178-
names.add(name + "_gsum");
179-
names.add(name + "_bucket");
180-
break;
176+
return new String[]{
177+
name + "_gcount",
178+
name + "_gsum",
179+
name + "_bucket",
180+
name
181+
};
181182
case INFO:
182-
names.add(name + "_info");
183-
break;
183+
return new String[]{
184+
name + "_info",
185+
name
186+
};
184187
default:
185-
// NOP - `name` is added to all
188+
return new String[]{name};
186189
}
187-
names.add(name);
188-
return names;
189190
}
190191

191192

simpleclient/src/main/java/io/prometheus/client/CollectorRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private List<String> collectorNames(Collector m) {
117117

118118
List<String> names = new ArrayList<String>();
119119
for (Collector.MetricFamilySamples family : mfs) {
120-
names.addAll(family.getNames());
120+
names.addAll(Arrays.asList(family.getNames()));
121121
}
122122
return names;
123123
}

simpleclient/src/test/java/io/prometheus/client/HistogramTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ private void assertNoExemplar(Histogram histogram, double value) {
327327
}
328328
if (lowerBound < value && value <= upperBound) {
329329
if (bucket.exemplar != null) {
330-
Assert.assertNotEquals("expecting no exemplar with value " + value, value, bucket.exemplar.getValue(), 0.001);
330+
Assert.assertNotEquals("expecting no exemplar with value " + value, value, bucket.exemplar.getValue(), 0.0001);
331331
}
332332
}
333333
}

0 commit comments

Comments
 (0)