|
18 | 18 | */
|
19 | 19 | package org.apache.accumulo.server.metrics;
|
20 | 20 |
|
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 |
| - |
27 | 21 | import java.nio.ByteBuffer;
|
28 | 22 | import java.util.List;
|
29 |
| -import java.util.Set; |
30 | 23 | import java.util.concurrent.TimeUnit;
|
31 | 24 | import java.util.function.Consumer;
|
32 | 25 | import java.util.stream.Collectors;
|
33 | 26 | import java.util.stream.Stream;
|
34 | 27 |
|
| 28 | +import org.apache.accumulo.core.metrics.MetricsInfo; |
35 | 29 | import org.apache.accumulo.core.metrics.flatbuffers.FMetric;
|
36 | 30 | import org.apache.accumulo.core.metrics.flatbuffers.FTag;
|
37 | 31 | import org.apache.accumulo.core.metrics.thrift.MetricResponse;
|
|
54 | 48 | */
|
55 | 49 | public class MetricResponseWrapper extends MetricResponse {
|
56 | 50 |
|
57 |
| - private class CommonRefs { |
| 51 | + private static class CommonRefs { |
58 | 52 | int nameRef;
|
59 | 53 | int typeRef;
|
60 | 54 | int tagsRef;
|
@@ -82,11 +76,8 @@ public MetricResponseWrapper(FlatBufferBuilder builder) {
|
82 | 76 | * Remove tags from the Metric that duplicate other information found in the MetricResponse
|
83 | 77 | */
|
84 | 78 | 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 |
| - |
88 | 79 | 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()); |
90 | 81 | }
|
91 | 82 |
|
92 | 83 | private void parseAndCreateCommonInfo(Meter.Id id, List<Tag> extraTags) {
|
|
0 commit comments