-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Enhance MetricsMonitor with several new metrics * Add config read and write rt * Add ServiceEvent publisher queue size * Add fuzzy search count * Add naming subscriber and publisher count with v1 or v2 version tag * Add config subscriber count with v1 or v2 version tag * Add pending push task count and empty push count metrics * collect pending push task count by scheduled task * add unit test for increment metrics in NacosMonitorPushResultHook * Add topn counter container and topn config change * Create private MeterRegistry for config change * Add scheduled clear for config change count, add removeAll for TopnCounterMetricsContainer * Add topn service change * Reconstruct metrics monitor with NacosMeterRegistryCenter. * divide globalRegistry to different modules' CompositeMeterRegistry * Add dynamic meters refresh service for config and naming module * fix unit test * Add try catch when init NacosMeterRegistryCenter
- Loading branch information
Showing
24 changed files
with
1,249 additions
and
102 deletions.
There are no files selected for viewing
217 changes: 217 additions & 0 deletions
217
common/src/main/java/com/alibaba/nacos/common/utils/TopnCounterMetricsContainer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,217 @@ | ||
/* | ||
* Copyright 1999-2022 Alibaba Group Holding Ltd. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.alibaba.nacos.common.utils; | ||
|
||
import java.util.LinkedList; | ||
import java.util.List; | ||
import java.util.concurrent.ConcurrentHashMap; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
|
||
/** | ||
* container for top n counter metrics, increment and remove cost O(1) time. | ||
* | ||
* @author <a href="mailto:[email protected]">liuyixiao</a> | ||
*/ | ||
public class TopnCounterMetricsContainer { | ||
|
||
/** | ||
* dataId -> count. | ||
*/ | ||
private ConcurrentHashMap<String, AtomicInteger> dataCount; | ||
|
||
/** | ||
* count -> node. | ||
*/ | ||
private ConcurrentHashMap<Integer, DoublyLinkedNode> specifiedCountDataIdSets; | ||
|
||
private DoublyLinkedNode dummyHead; | ||
|
||
public TopnCounterMetricsContainer() { | ||
dataCount = new ConcurrentHashMap<>(); | ||
specifiedCountDataIdSets = new ConcurrentHashMap<>(); | ||
dummyHead = new DoublyLinkedNode(null, null, null, -1); | ||
dummyHead.next = new DoublyLinkedNode(null, dummyHead, new ConcurrentHashSet<>(), 0); | ||
specifiedCountDataIdSets.put(0, dummyHead.next); | ||
} | ||
|
||
public List<Pair<String, AtomicInteger>> getTopNCounter(int n) { | ||
List<Pair<String, AtomicInteger>> topnCounter = new LinkedList<>(); | ||
DoublyLinkedNode curr = dummyHead; | ||
while (curr.next != null && topnCounter.size() < n) { | ||
for (String dataId : curr.next.dataSet) { | ||
// use inner AtomicInteger to reflect change to prometheus | ||
topnCounter.add(new Pair<>(dataId, dataCount.get(dataId))); | ||
if (topnCounter.size() == n) { | ||
break; | ||
} | ||
} | ||
curr = curr.next; | ||
} | ||
return topnCounter; | ||
} | ||
|
||
/** | ||
* put(String dataId, 0). | ||
* | ||
* @param dataId data name or data key. | ||
*/ | ||
public void put(String dataId) { | ||
put(dataId, 0); | ||
} | ||
|
||
/** | ||
* put new data into container, if already exist, update it. | ||
* this method could be slow (O(N)), most time use increment. | ||
* | ||
* @param dataId data name or data key. | ||
* @param count data count. | ||
*/ | ||
public void put(String dataId, int count) { | ||
if (dataCount.containsKey(dataId)) { | ||
removeFromSpecifiedCountDataIdSets(dataId); | ||
dataCount.get(dataId).set(count); | ||
} else { | ||
dataCount.put(dataId, new AtomicInteger(count)); | ||
} | ||
insertIntoSpecifiedCountDataIdSets(dataId, count); | ||
} | ||
|
||
/** | ||
* get data count by dataId. | ||
* | ||
* @param dataId data name or data key. | ||
* @return data count or -1 if not exist. | ||
*/ | ||
public int get(String dataId) { | ||
if (dataCount.containsKey(dataId)) { | ||
return dataCount.get(dataId).get(); | ||
} | ||
return -1; | ||
} | ||
|
||
/** | ||
* increment the count of dataId. | ||
* | ||
* @param dataId data name or data key. | ||
*/ | ||
public void increment(String dataId) { | ||
if (!dataCount.containsKey(dataId)) { | ||
put(dataId); | ||
} | ||
DoublyLinkedNode prev = removeFromSpecifiedCountDataIdSets(dataId); | ||
int newCount = dataCount.get(dataId).incrementAndGet(); | ||
if (!isDummyHead(prev) && prev.count == newCount) { | ||
insertIntoSpecifiedCountDataIdSets(dataId, prev); | ||
} else { | ||
// prev.count > newCount | ||
DoublyLinkedNode newNode = new DoublyLinkedNode(prev.next, prev, new ConcurrentHashSet<>(), newCount); | ||
if (prev.next != null) { | ||
prev.next.prev = newNode; | ||
} | ||
prev.next = newNode; | ||
newNode.dataSet.add(dataId); | ||
specifiedCountDataIdSets.put(newCount, newNode); | ||
} | ||
} | ||
|
||
/** | ||
* remove data. | ||
* | ||
* @param dataId data name or data key. | ||
* @return data count or null if data is not exist. | ||
*/ | ||
public AtomicInteger remove(String dataId) { | ||
if (dataCount.containsKey(dataId)) { | ||
removeFromSpecifiedCountDataIdSets(dataId); | ||
return dataCount.remove(dataId); | ||
} | ||
return null; | ||
} | ||
|
||
/** | ||
* remove all data. | ||
*/ | ||
public void removeAll() { | ||
for (String dataId : dataCount.keySet()) { | ||
removeFromSpecifiedCountDataIdSets(dataId); | ||
} | ||
dataCount.clear(); | ||
} | ||
|
||
private DoublyLinkedNode removeFromSpecifiedCountDataIdSets(String dataId) { | ||
int count = dataCount.get(dataId).get(); | ||
DoublyLinkedNode node = specifiedCountDataIdSets.get(count); | ||
node.dataSet.remove(dataId); | ||
// keep the 0 count node. | ||
if (node.dataSet.size() == 0 && node.count != 0) { | ||
node.prev.next = node.next; | ||
if (node.next != null) { | ||
node.next.prev = node.prev; | ||
} | ||
specifiedCountDataIdSets.remove(node.count); | ||
} | ||
return node.prev; | ||
} | ||
|
||
private void insertIntoSpecifiedCountDataIdSets(String dataId, int count) { | ||
if (specifiedCountDataIdSets.containsKey(count)) { | ||
specifiedCountDataIdSets.get(count).dataSet.add(dataId); | ||
} else { | ||
DoublyLinkedNode prev = dummyHead; | ||
while (prev.next != null) { | ||
if (prev.next.count < count) { | ||
break; | ||
} else { | ||
prev = prev.next; | ||
} | ||
} | ||
DoublyLinkedNode newNode = new DoublyLinkedNode(prev.next, prev, new ConcurrentHashSet<>(), count); | ||
if (prev.next != null) { | ||
prev.next.prev = newNode; | ||
} | ||
prev.next = newNode; | ||
newNode.dataSet.add(dataId); | ||
specifiedCountDataIdSets.put(count, newNode); | ||
} | ||
} | ||
|
||
private void insertIntoSpecifiedCountDataIdSets(String dataId, DoublyLinkedNode targetSet) { | ||
targetSet.dataSet.add(dataId); | ||
} | ||
|
||
private boolean isDummyHead(DoublyLinkedNode node) { | ||
return node.count == -1; | ||
} | ||
|
||
private class DoublyLinkedNode { | ||
|
||
public DoublyLinkedNode next; | ||
|
||
public DoublyLinkedNode prev; | ||
|
||
public ConcurrentHashSet<String> dataSet; | ||
|
||
public int count; | ||
|
||
public DoublyLinkedNode(DoublyLinkedNode next, DoublyLinkedNode prev, ConcurrentHashSet<String> dataSet, int count) { | ||
this.next = next; | ||
this.prev = prev; | ||
this.dataSet = dataSet; | ||
this.count = count; | ||
} | ||
} | ||
} |
109 changes: 109 additions & 0 deletions
109
common/src/test/java/com/alibaba/nacos/common/utils/TopnCounterMetricsContainerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
/* | ||
* Copyright 1999-2022 Alibaba Group Holding Ltd. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package com.alibaba.nacos.common.utils; | ||
|
||
import org.junit.Assert; | ||
import org.junit.Before; | ||
import org.junit.Test; | ||
|
||
import java.util.ArrayList; | ||
import java.util.Collections; | ||
import java.util.List; | ||
import java.util.Random; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
|
||
/** | ||
* unit test for TopNCounterMetricsContainer. | ||
* | ||
* @author <a href="mailto:[email protected]">liuyixiao</a> | ||
*/ | ||
public class TopnCounterMetricsContainerTest { | ||
|
||
private TopnCounterMetricsContainer topnCounterMetricsContainer; | ||
|
||
@Before | ||
public void setUp() { | ||
topnCounterMetricsContainer = new TopnCounterMetricsContainer(); | ||
} | ||
|
||
@Test | ||
public void testPut() { | ||
topnCounterMetricsContainer.put("test"); | ||
Assert.assertEquals(0, topnCounterMetricsContainer.get("test")); | ||
topnCounterMetricsContainer.put("test1", 1); | ||
Assert.assertEquals(1, topnCounterMetricsContainer.get("test1")); | ||
} | ||
|
||
@Test | ||
public void testIncrement() { | ||
topnCounterMetricsContainer.put("test", 0); | ||
topnCounterMetricsContainer.increment("test"); | ||
Assert.assertEquals(1, topnCounterMetricsContainer.get("test")); | ||
} | ||
|
||
@Test | ||
public void testRemove() { | ||
topnCounterMetricsContainer.put("test"); | ||
Assert.assertEquals(0, topnCounterMetricsContainer.get("test")); | ||
topnCounterMetricsContainer.remove("test"); | ||
Assert.assertEquals(-1, topnCounterMetricsContainer.get("test")); | ||
} | ||
|
||
@Test | ||
public void testRemoveAll() { | ||
topnCounterMetricsContainer.put("test"); | ||
topnCounterMetricsContainer.put("test1"); | ||
topnCounterMetricsContainer.put("test2"); | ||
topnCounterMetricsContainer.removeAll(); | ||
Assert.assertEquals(-1, topnCounterMetricsContainer.get("test")); | ||
Assert.assertEquals(-1, topnCounterMetricsContainer.get("test1")); | ||
Assert.assertEquals(-1, topnCounterMetricsContainer.get("test2")); | ||
} | ||
|
||
@Test | ||
public void testGetTopNCounterAndRemoveAll() { | ||
final int N = 10; | ||
String dataIds = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; | ||
List<Pair<String, AtomicInteger>> dataList = new ArrayList<>(); | ||
for (int i = 0; i < dataIds.length(); i++) { | ||
topnCounterMetricsContainer.put(dataIds.substring(i, i + 1)); | ||
dataList.add(new Pair<>(dataIds.substring(i, i + 1), new AtomicInteger())); | ||
} | ||
Random random = new Random(); | ||
for (int i = 0; i < 10000; i++) { | ||
int j = random.nextInt(dataIds.length()); | ||
topnCounterMetricsContainer.increment(dataIds.substring(j, j + 1)); | ||
dataList.get(j).getSecond().incrementAndGet(); | ||
} | ||
boolean right = true; | ||
Collections.sort(dataList, (a, b) -> b.getSecond().get() - a.getSecond().get()); | ||
List<Pair<String, AtomicInteger>> result = topnCounterMetricsContainer.getTopNCounter(N); | ||
for (Pair<String, AtomicInteger> item : result) { | ||
// ensure every top N count is greater than (N+1)th greatest. | ||
if (item.getSecond().get() < dataList.get(N).getSecond().get()) { | ||
right = false; | ||
break; | ||
} | ||
} | ||
Assert.assertTrue(right); | ||
topnCounterMetricsContainer.removeAll(); | ||
for (int i = 0; i < dataIds.length(); i++) { | ||
Assert.assertEquals(-1, topnCounterMetricsContainer.get(dataIds.substring(i, i + 1))); | ||
} | ||
Assert.assertEquals(0, topnCounterMetricsContainer.getTopNCounter(N).size()); | ||
} | ||
} |
Oops, something went wrong.