Skip to content

Fix the situation where metric collection stops when NPE occours #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix the situation where metric collection stops when NPE occours #710

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14337f7
fix nullpointer exception
codings-dan Oct 18, 2021
98293b1
add sampleNameFilter to collect metric
codings-dan Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 51 additions & 13 deletions simpleclient_dropwizard/src/main/java/io/prometheus/client/dropwizard/DropwizardExports.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Snapshot;
import com.codahale.metrics.Timer;
import io.prometheus.client.Predicate;
import io.prometheus.client.dropwizard.samplebuilder.SampleBuilder;
import io.prometheus.client.dropwizard.samplebuilder.DefaultSampleBuilder;

Expand Down Expand Up @@ -93,20 +94,25 @@ MetricFamilySamples fromCounter(String dropwizardName, Counter counter) {
* Export gauge as a prometheus gauge.
*/
MetricFamilySamples fromGauge(String dropwizardName, Gauge gauge) {
Object obj = gauge.getValue();
double value;
if (obj instanceof Number) {
value = ((Number) obj).doubleValue();
} else if (obj instanceof Boolean) {
value = ((Boolean) obj) ? 1 : 0;
} else {
LOGGER.log(Level.FINE, String.format("Invalid type for Gauge %s: %s", sanitizeMetricName(dropwizardName),
obj == null ? "null" : obj.getClass().getName()));
return null;
try {
Object obj = gauge.getValue();
double value;
if (obj instanceof Number) {
value = ((Number) obj).doubleValue();
} else if (obj instanceof Boolean) {
value = ((Boolean) obj) ? 1 : 0;
} else {
LOGGER.log(Level.FINE, String.format("Invalid type for Gauge %s: %s", sanitizeMetricName(dropwizardName),
obj == null ? "null" : obj.getClass().getName()));
return null;
}
MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "",
new ArrayList<String>(), new ArrayList<String>(), value);
return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, gauge), Arrays.asList(sample));
} catch (NullPointerException e) {
e.printStackTrace();
}
MetricFamilySamples.Sample sample = sampleBuilder.createSample(dropwizardName, "",
new ArrayList<String>(), new ArrayList<String>(), value);
return new MetricFamilySamples(sample.name, Type.GAUGE, getHelpMessage(dropwizardName, gauge), Arrays.asList(sample));
return null;
}

/**
Expand Down Expand Up @@ -180,6 +186,38 @@ public List<MetricFamilySamples> collect() {
return new ArrayList<MetricFamilySamples>(mfSamplesMap.values());
}

@Override
public List<MetricFamilySamples> collect(Predicate<String> sampleNameFilter) {
Map<String, MetricFamilySamples> mfSamplesMap = new HashMap<String, MetricFamilySamples>();

for (SortedMap.Entry<String, Gauge> entry : registry.getGauges(metricFilter).entrySet()) {
if(sampleNameFilter.test(entry.getKey())) {
addToMap(mfSamplesMap, fromGauge(entry.getKey(), entry.getValue()));
}
}
for (SortedMap.Entry<String, Counter> entry : registry.getCounters(metricFilter).entrySet()) {
if (sampleNameFilter.test(entry.getKey())) {
addToMap(mfSamplesMap, fromCounter(entry.getKey(), entry.getValue()));
}
}
for (SortedMap.Entry<String, Histogram> entry : registry.getHistograms(metricFilter).entrySet()) {
if (sampleNameFilter.test(entry.getKey())) {
addToMap(mfSamplesMap, fromHistogram(entry.getKey(), entry.getValue()));
}
}
for (SortedMap.Entry<String, Timer> entry : registry.getTimers(metricFilter).entrySet()) {
if (sampleNameFilter.test(entry.getKey())) {
addToMap(mfSamplesMap, fromTimer(entry.getKey(), entry.getValue()));
}
}
for (SortedMap.Entry<String, Meter> entry : registry.getMeters(metricFilter).entrySet()) {
if (sampleNameFilter.test(entry.getKey())) {
addToMap(mfSamplesMap, fromMeter(entry.getKey(), entry.getValue()));
}
}
return new ArrayList<MetricFamilySamples>(mfSamplesMap.values());
}

private void addToMap(Map<String, MetricFamilySamples> mfSamplesMap, MetricFamilySamples newMfSamples)
{
if (newMfSamples != null) {
Expand Down