Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[PAN-2877] Switch to using metric names from EIP-2159 #1634

Merged
merged 6 commits into from
Jul 11, 2019
Merged

[PAN-2877] Switch to using metric names from EIP-2159 #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c369d6c
Switch to using metric names from EIP-2159.
ajsutton Jul 3, 2019
556e0f1
Merge branch 'master' into eip-2159
ajsutton Jul 3, 2019
634499a
Merge branch 'master' into eip-2159
ajsutton Jul 5, 2019
ff10b73
Merge branch 'master' into eip-2159
ajsutton Jul 10, 2019
2385bba
Merge branch 'master' into eip-2159
ajsutton Jul 11, 2019
b057d29
Merge branch 'master' into eip-2159
ajsutton Jul 11, 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
6 changes: 3 additions & 3 deletions ...eum/core/src/main/java/tech/pegasys/pantheon/ethereum/chain/DefaultMutableBlockchain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ public DefaultMutableBlockchain(
chainHeadOmmerCount = chainHeadBody.getOmmers().size();

metricsSystem.createLongGauge(
PantheonMetricCategory.BLOCKCHAIN,
"height",
"Height of the chainhead",
PantheonMetricCategory.ETHEREUM,
"blockchain_height",
"The current height of the canonical chain",
this::getChainHeadBlockNumber);
metricsSystem.createLongGauge(
PantheonMetricCategory.BLOCKCHAIN,
Expand Down
6 changes: 3 additions & 3 deletions ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/DefaultSynchronizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,9 @@ public DefaultSynchronizer(
clock);

metricsSystem.createLongGauge(
PantheonMetricCategory.SYNCHRONIZER,
"best_known_block",
"Height of best known block from any connected peer",
PantheonMetricCategory.ETHEREUM,
"best_known_block_number",
"The estimated highest block available",
() -> syncState.syncStatus().getHighestBlock());
metricsSystem.createIntegerGauge(
PantheonMetricCategory.SYNCHRONIZER,
Expand Down
16 changes: 8 additions & 8 deletions ethereum/p2p/src/main/java/tech/pegasys/pantheon/ethereum/p2p/rlpx/RlpxAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ private RlpxAgent(
metricsSystem.createCounter(
PantheonMetricCategory.PEERS, "connected_total", "Total number of peers connected");

metricsSystem.createGauge(
PantheonMetricCategory.PEERS,
"peer_count_current",
"Number of peers currently connected",
() -> (double) getConnectionCount());
metricsSystem.createIntegerGauge(
PantheonMetricCategory.NETWORK,
"peers_limit",
"Maximum P2P peer connections that can be established",
PantheonMetricCategory.ETHEREUM,
"peer_count",
"The current number of peers connected",
this::getConnectionCount);
metricsSystem.createIntegerGauge(
PantheonMetricCategory.ETHEREUM,
"peer_limit",
"The maximum number of peers this node allows to connect",
() -> maxPeers);
}

Expand Down
1 change: 1 addition & 0 deletions metrics/core/src/main/java/tech/pegasys/pantheon/metrics/PantheonMetricCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

public enum PantheonMetricCategory implements MetricCategory {
BLOCKCHAIN("blockchain"),
ETHEREUM("ethereum", false),
EXECUTORS("executors"),
NETWORK("network"),
PEERS("peers"),
Expand Down