Skip to content

HDDS-1870. ConcurrentModification at PrometheusMetricsSink #1179

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

Merged
bharatviswa504 merged 3 commits into from
Aug 4, 2019
Merged

HDDS-1870. ConcurrentModification at PrometheusMetricsSink #1179

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
520a3e2
HDDS-1870. ConcurrentModification at PrometheusMetricsSink
adoroszlai Jul 29, 2019
ce42774
HDDS-1870. Avoid string concatenation in append()
adoroszlai Jul 29, 2019
a579871
HDDS-1870. Append newline to builder
adoroszlai Jul 29, 2019
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
24 changes: 16 additions & 8 deletions hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/PrometheusMetricsSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import java.io.IOException;
import java.io.Writer;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Pattern;

import org.apache.commons.lang3.StringUtils;
Expand All @@ -44,7 +44,7 @@ public class PrometheusMetricsSink implements MetricsSink {
/**
* Cached output lines for each metrics.
*/
private Map<String, String> metricLines = new HashMap<>();
private final Map<String, String> metricLines = new ConcurrentHashMap<>();

private static final Pattern SPLIT_PATTERN =
Pattern.compile("(?<!(^|[A-Z_]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])");
Expand All @@ -65,9 +65,13 @@ public void putMetrics(MetricsRecord metricsRecord) {
metricsRecord.name(), metrics.name());

StringBuilder builder = new StringBuilder();
builder.append("# TYPE " + key + " " +
metrics.type().toString().toLowerCase() + "\n");
builder.append(key + "{");
builder.append("# TYPE ")
.append(key)
.append(" ")
.append(metrics.type().toString().toLowerCase())
.append("\n")
.append(key)
.append("{");
String sep = "";

//add tags
Expand All @@ -76,13 +80,17 @@ public void putMetrics(MetricsRecord metricsRecord) {

//ignore specific tag which includes sub-hierarchy
if (!tagName.equals("numopenconnectionsperuser")) {
builder.append(
sep + tagName + "=\"" + tag.value() + "\"");
builder.append(sep)
.append(tagName)
.append("=\"")
.append(tag.value())
.append("\"");
sep = ",";
}
}
builder.append("} ");
builder.append(metrics.value());
builder.append("\n");
metricLines.put(key, builder.toString());

}
Expand Down Expand Up @@ -121,7 +129,7 @@ public void init(SubsetConfiguration subsetConfiguration) {

public void writeMetrics(Writer writer) throws IOException {
for (String line : metricLines.values()) {
writer.write(line + "\n");
writer.write(line);
}
}
}