Skip to content

Commit 9c656f6

Browse files
committed
Move set creation outside of method to avoid recreation
1 parent 52f7f17 commit 9c656f6

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

core/src/main/java/org/apache/accumulo/core/metrics/MetricsInfo.java

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Collections;
2424
import java.util.List;
2525
import java.util.Objects;
26+
import java.util.Set;
2627

2728
import com.google.common.net.HostAndPort;
2829

@@ -36,6 +37,9 @@ public interface MetricsInfo {
3637
String HOST_TAG_KEY = "host";
3738
String PORT_TAG_KEY = "port";
3839

40+
Set<String> allTags = Set.of(INSTANCE_NAME_TAG_KEY, PROCESS_NAME_TAG_KEY, RESOURCE_GROUP_TAG_KEY,
41+
HOST_TAG_KEY, PORT_TAG_KEY);
42+
3943
/**
4044
* Convenience method to create tag name / value pair for the instance name
4145
*

server/base/src/main/java/org/apache/accumulo/server/metrics/MetricResponseWrapper.java

+3-12
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,14 @@
1818
*/
1919
package org.apache.accumulo.server.metrics;
2020

21-
import static org.apache.accumulo.core.metrics.MetricsInfo.HOST_TAG_KEY;
22-
import static org.apache.accumulo.core.metrics.MetricsInfo.INSTANCE_NAME_TAG_KEY;
23-
import static org.apache.accumulo.core.metrics.MetricsInfo.PORT_TAG_KEY;
24-
import static org.apache.accumulo.core.metrics.MetricsInfo.PROCESS_NAME_TAG_KEY;
25-
import static org.apache.accumulo.core.metrics.MetricsInfo.RESOURCE_GROUP_TAG_KEY;
26-
2721
import java.nio.ByteBuffer;
2822
import java.util.List;
29-
import java.util.Set;
3023
import java.util.concurrent.TimeUnit;
3124
import java.util.function.Consumer;
3225
import java.util.stream.Collectors;
3326
import java.util.stream.Stream;
3427

28+
import org.apache.accumulo.core.metrics.MetricsInfo;
3529
import org.apache.accumulo.core.metrics.flatbuffers.FMetric;
3630
import org.apache.accumulo.core.metrics.flatbuffers.FTag;
3731
import org.apache.accumulo.core.metrics.thrift.MetricResponse;
@@ -54,7 +48,7 @@
5448
*/
5549
public class MetricResponseWrapper extends MetricResponse {
5650

57-
private class CommonRefs {
51+
private static class CommonRefs {
5852
int nameRef;
5953
int typeRef;
6054
int tagsRef;
@@ -82,11 +76,8 @@ public MetricResponseWrapper(FlatBufferBuilder builder) {
8276
* Remove tags from the Metric that duplicate other information found in the MetricResponse
8377
*/
8478
private List<Tag> reduceTags(List<Tag> tags, List<Tag> extraTags) {
85-
final Set<String> existingTags = Set.of(INSTANCE_NAME_TAG_KEY, PROCESS_NAME_TAG_KEY,
86-
RESOURCE_GROUP_TAG_KEY, HOST_TAG_KEY, PORT_TAG_KEY);
87-
8879
return Stream.concat(tags.stream(), extraTags.stream())
89-
.filter(t -> !existingTags.contains(t.getKey())).collect(Collectors.toList());
80+
.filter(t -> !MetricsInfo.allTags.contains(t.getKey())).collect(Collectors.toList());
9081
}
9182

9283
private void parseAndCreateCommonInfo(Meter.Id id, List<Tag> extraTags) {

0 commit comments

Comments
 (0)