Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add external multiaddress to NodeInfoExtended #969

Merged
merged 2 commits into from
May 14, 2024
Merged

Add external multiaddress to NodeInfoExtended #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7d03f
Add external MultiAddress to `NodeInfoExtended`
muXxer May 14, 2024
ba13e6b
Fix docker health test CI job
muXxer May 14, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/docker-network-health.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

# Run network
cd ./tools/docker-network
timeout 10m ./run.sh 0 0 &
timeout 10m ./run.sh &
RUN_PID=$!

# Wait for node-4 to be created before querying it
Expand Down
22 changes: 21 additions & 1 deletion components/dashboard_metrics/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,32 @@ func nodeInfoExtended() *NodeInfoExtended {
var m runtime.MemStats
runtime.ReadMemStats(&m)

getExternalMultiAddr := func() string {
var fallback string

for i, addr := range deps.Host.Addrs() {
if i == 0 {
fallback = addr.String()
}

for _, protocol := range addr.Protocols() {
// search the first dns address
if protocol.Name == "dns" {
return addr.String()
}
}
}

return fallback
}

status := &NodeInfoExtended{
Version: deps.AppInfo.Version,
LatestVersion: deps.AppInfo.LatestGitHubVersion,
Uptime: time.Since(nodeStartupTimestamp).Milliseconds(),
NodeID: deps.Host.ID().String(),
NodeAlias: ParamsNode.Alias,
MultiAddress: getExternalMultiAddr(),
Alias: ParamsNode.Alias,
MemoryUsage: int64(m.HeapAlloc + m.StackSys + m.MSpanSys + m.MCacheSys + m.BuckHashSys + m.GCSys + m.OtherSys),
}

Expand Down
3 changes: 2 additions & 1 deletion components/dashboard_metrics/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ type NodeInfoExtended struct {
LatestVersion string `serix:",lenPrefix=uint8"`
Uptime int64 `serix:""`
NodeID string `serix:",lenPrefix=uint8"`
NodeAlias string `serix:",lenPrefix=uint8"`
MultiAddress string `serix:",lenPrefix=uint8"`
Alias string `serix:",lenPrefix=uint8"`
MemoryUsage int64 `serix:""`
}

Expand Down
2 changes: 1 addition & 1 deletion tools/docker-network/restart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

docker compose kill
docker compose down
./run.sh 0
./run.sh
1 change: 1 addition & 0 deletions tools/docker-network/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ mkdir -p docker-network-snapshots/
chmod o+w docker-network-snapshots/

# Allow docker compose to build and cache an image
echo "Building docker image"
echo $DOCKER_BUILD_CONTEXT $DOCKERFILE_PATH
docker compose build --build-arg WITH_GO_WORK=${WITH_GO_WORK:-0} --build-arg DOCKER_BUILD_CONTEXT=${DOCKER_BUILD_CONTEXT} --build-arg DOCKERFILE_PATH=${DOCKERFILE_PATH}

Expand Down
Loading