-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4680 from chimp1984/add-InventoryMonitor-module
Add inventory monitor module
- Loading branch information
Showing
40 changed files
with
1,750 additions
and
226 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
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
176 changes: 176 additions & 0 deletions
176
core/src/main/java/bisq/core/network/p2p/inventory/GetInventoryRequestHandler.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,176 @@ | ||
| /* | ||
| * This file is part of Bisq. | ||
| * | ||
| * Bisq is free software: you can redistribute it and/or modify it | ||
| * under the terms of the GNU Affero General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
| * License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package bisq.core.network.p2p.inventory; | ||
|
|
||
| import bisq.core.dao.monitoring.BlindVoteStateMonitoringService; | ||
| import bisq.core.dao.monitoring.DaoStateMonitoringService; | ||
| import bisq.core.dao.monitoring.ProposalStateMonitoringService; | ||
| import bisq.core.dao.monitoring.model.BlindVoteStateBlock; | ||
| import bisq.core.dao.monitoring.model.DaoStateBlock; | ||
| import bisq.core.dao.monitoring.model.ProposalStateBlock; | ||
| import bisq.core.dao.state.DaoStateService; | ||
| import bisq.core.network.p2p.inventory.messages.GetInventoryRequest; | ||
| import bisq.core.network.p2p.inventory.messages.GetInventoryResponse; | ||
| import bisq.core.network.p2p.inventory.model.InventoryItem; | ||
|
|
||
| import bisq.network.p2p.network.Connection; | ||
| import bisq.network.p2p.network.MessageListener; | ||
| import bisq.network.p2p.network.NetworkNode; | ||
| import bisq.network.p2p.network.Statistic; | ||
| import bisq.network.p2p.peers.PeerManager; | ||
| import bisq.network.p2p.storage.P2PDataStorage; | ||
| import bisq.network.p2p.storage.payload.ProtectedStorageEntry; | ||
|
|
||
| import bisq.common.app.Version; | ||
| import bisq.common.config.Config; | ||
| import bisq.common.proto.network.NetworkEnvelope; | ||
| import bisq.common.util.Profiler; | ||
| import bisq.common.util.Utilities; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.inject.Named; | ||
|
|
||
| import com.google.common.base.Enums; | ||
| import com.google.common.base.Optional; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.LinkedList; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
|
|
||
| import java.lang.management.ManagementFactory; | ||
|
|
||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
| @Slf4j | ||
| public class GetInventoryRequestHandler implements MessageListener { | ||
| private final NetworkNode networkNode; | ||
| private final PeerManager peerManager; | ||
| private final P2PDataStorage p2PDataStorage; | ||
| private final DaoStateService daoStateService; | ||
| private final DaoStateMonitoringService daoStateMonitoringService; | ||
| private final ProposalStateMonitoringService proposalStateMonitoringService; | ||
| private final BlindVoteStateMonitoringService blindVoteStateMonitoringService; | ||
| private final int maxConnections; | ||
|
|
||
| @Inject | ||
| public GetInventoryRequestHandler(NetworkNode networkNode, | ||
| PeerManager peerManager, | ||
| P2PDataStorage p2PDataStorage, | ||
| DaoStateService daoStateService, | ||
| DaoStateMonitoringService daoStateMonitoringService, | ||
| ProposalStateMonitoringService proposalStateMonitoringService, | ||
| BlindVoteStateMonitoringService blindVoteStateMonitoringService, | ||
| @Named(Config.MAX_CONNECTIONS) int maxConnections) { | ||
| this.networkNode = networkNode; | ||
| this.peerManager = peerManager; | ||
| this.p2PDataStorage = p2PDataStorage; | ||
| this.daoStateService = daoStateService; | ||
| this.daoStateMonitoringService = daoStateMonitoringService; | ||
| this.proposalStateMonitoringService = proposalStateMonitoringService; | ||
| this.blindVoteStateMonitoringService = blindVoteStateMonitoringService; | ||
| this.maxConnections = maxConnections; | ||
|
|
||
| this.networkNode.addMessageListener(this); | ||
| } | ||
|
|
||
| @Override | ||
| public void onMessage(NetworkEnvelope networkEnvelope, Connection connection) { | ||
| if (networkEnvelope instanceof GetInventoryRequest) { | ||
| // Data | ||
| GetInventoryRequest getInventoryRequest = (GetInventoryRequest) networkEnvelope; | ||
| Map<InventoryItem, Integer> dataObjects = new HashMap<>(); | ||
| p2PDataStorage.getMapForDataResponse(getInventoryRequest.getVersion()).values().stream() | ||
| .map(e -> e.getClass().getSimpleName()) | ||
| .forEach(className -> { | ||
| Optional<InventoryItem> optionalEnum = Enums.getIfPresent(InventoryItem.class, className); | ||
| if (optionalEnum.isPresent()) { | ||
| InventoryItem key = optionalEnum.get(); | ||
| dataObjects.putIfAbsent(key, 0); | ||
| int prev = dataObjects.get(key); | ||
| dataObjects.put(key, prev + 1); | ||
| } | ||
| }); | ||
| p2PDataStorage.getMap().values().stream() | ||
| .map(ProtectedStorageEntry::getProtectedStoragePayload) | ||
| .filter(Objects::nonNull) | ||
| .map(e -> e.getClass().getSimpleName()) | ||
| .forEach(className -> { | ||
| Optional<InventoryItem> optionalEnum = Enums.getIfPresent(InventoryItem.class, className); | ||
| if (optionalEnum.isPresent()) { | ||
| InventoryItem key = optionalEnum.get(); | ||
| dataObjects.putIfAbsent(key, 0); | ||
| int prev = dataObjects.get(key); | ||
| dataObjects.put(key, prev + 1); | ||
| } | ||
| }); | ||
| Map<InventoryItem, String> inventory = new HashMap<>(); | ||
| dataObjects.forEach((key, value) -> inventory.put(key, String.valueOf(value))); | ||
|
|
||
| // DAO | ||
| int numBsqBlocks = daoStateService.getBlocks().size(); | ||
| inventory.put(InventoryItem.numBsqBlocks, String.valueOf(numBsqBlocks)); | ||
|
|
||
| int daoStateChainHeight = daoStateService.getChainHeight(); | ||
| inventory.put(InventoryItem.daoStateChainHeight, String.valueOf(daoStateChainHeight)); | ||
|
|
||
| LinkedList<DaoStateBlock> daoStateBlockChain = daoStateMonitoringService.getDaoStateBlockChain(); | ||
| if (!daoStateBlockChain.isEmpty()) { | ||
| String daoStateHash = Utilities.bytesAsHexString(daoStateBlockChain.getLast().getMyStateHash().getHash()); | ||
| inventory.put(InventoryItem.daoStateHash, daoStateHash); | ||
| } | ||
|
|
||
| LinkedList<ProposalStateBlock> proposalStateBlockChain = proposalStateMonitoringService.getProposalStateBlockChain(); | ||
| if (!proposalStateBlockChain.isEmpty()) { | ||
| String proposalHash = Utilities.bytesAsHexString(proposalStateBlockChain.getLast().getMyStateHash().getHash()); | ||
| inventory.put(InventoryItem.proposalHash, proposalHash); | ||
| } | ||
|
|
||
| LinkedList<BlindVoteStateBlock> blindVoteStateBlockChain = blindVoteStateMonitoringService.getBlindVoteStateBlockChain(); | ||
| if (!blindVoteStateBlockChain.isEmpty()) { | ||
| String blindVoteHash = Utilities.bytesAsHexString(blindVoteStateBlockChain.getLast().getMyStateHash().getHash()); | ||
| inventory.put(InventoryItem.blindVoteHash, blindVoteHash); | ||
| } | ||
|
|
||
| // network | ||
| inventory.put(InventoryItem.maxConnections, String.valueOf(maxConnections)); | ||
| inventory.put(InventoryItem.numConnections, String.valueOf(networkNode.getAllConnections().size())); | ||
| inventory.put(InventoryItem.peakNumConnections, String.valueOf(peerManager.getPeakNumConnections())); | ||
| inventory.put(InventoryItem.numAllConnectionsLostEvents, String.valueOf(peerManager.getNumAllConnectionsLostEvents())); | ||
| inventory.put(InventoryItem.sentBytes, String.valueOf(Statistic.totalSentBytesProperty().get())); | ||
| inventory.put(InventoryItem.sentBytesPerSec, String.valueOf(Statistic.totalSentBytesPerSecProperty().get())); | ||
| inventory.put(InventoryItem.receivedBytes, String.valueOf(Statistic.totalReceivedBytesProperty().get())); | ||
| inventory.put(InventoryItem.receivedBytesPerSec, String.valueOf(Statistic.totalReceivedBytesPerSecProperty().get())); | ||
| inventory.put(InventoryItem.receivedMessagesPerSec, String.valueOf(Statistic.numTotalReceivedMessagesPerSecProperty().get())); | ||
| inventory.put(InventoryItem.sentMessagesPerSec, String.valueOf(Statistic.numTotalSentMessagesPerSecProperty().get())); | ||
|
|
||
| // node | ||
| inventory.put(InventoryItem.version, Version.VERSION); | ||
| inventory.put(InventoryItem.usedMemory, String.valueOf(Profiler.getUsedMemoryInBytes())); | ||
| inventory.put(InventoryItem.jvmStartTime, String.valueOf(ManagementFactory.getRuntimeMXBean().getStartTime())); | ||
|
|
||
| log.info("Send inventory {} to {}", inventory, connection.getPeersNodeAddressOptional()); | ||
| GetInventoryResponse getInventoryResponse = new GetInventoryResponse(inventory); | ||
| networkNode.sendMessage(connection, getInventoryResponse); | ||
| } | ||
| } | ||
|
|
||
| public void shutDown() { | ||
| networkNode.removeMessageListener(this); | ||
| } | ||
| } |
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
Oops, something went wrong.