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

improve /health endpoint informations #33

Merged
merged 7 commits into from
Dec 10, 2023
Merged

improve /health endpoint informations #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e232975
add --sk to services for available dmsghttp during e2e and integratio…
mrpalide Nov 29, 2023
d11f79f
update dmsg@develp
mrpalide Nov 30, 2023
82695e7
add dmsg_servers to AR health endpoint
mrpalide Nov 30, 2023
17a7097
add dmsg_servers to RF health endpoint
mrpalide Nov 30, 2023
d036af8
add dmsg_servers to TPD health endpoint
mrpalide Nov 30, 2023
0e8c524
update go to 1.21 for dmsg-discovery and dmsg-server on integration env
mrpalide Nov 30, 2023
abf4bc6
fix docker-compose.yml file for dmsg-disc address on services for int…
mrpalide Nov 30, 2023
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
8 changes: 8 additions & 0 deletions cmd/address-resolver/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"log/syslog"
"os"
"strings"
"time"

cc "github.com/ivanpirog/coloredcobra"
logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
Expand Down Expand Up @@ -207,6 +208,13 @@ var RootCmd = &cobra.Command{

defer closeDmsgDC()

go func() {
for {
arAPI.DmsgServers = dmsgDC.ConnectedServersPK()
time.Sleep(time.Second)
}
}()

go dmsghttp.UpdateServers(ctx, dClient, dmsgDisc, dmsgDC, logger)

go func() {
Expand Down
8 changes: 8 additions & 0 deletions cmd/route-finder/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"log"
"log/syslog"
"os"
"time"

cc "github.com/ivanpirog/coloredcobra"
logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
Expand Down Expand Up @@ -168,6 +169,13 @@ var RootCmd = &cobra.Command{

defer closeDmsgDC()

go func() {
for {
rfAPI.DmsgServers = dmsgDC.ConnectedServersPK()
time.Sleep(time.Second)
}
}()

go dmsghttp.UpdateServers(ctx, dClient, dmsgDisc, dmsgDC, logger)

go func() {
Expand Down
8 changes: 8 additions & 0 deletions cmd/transport-discovery/commands/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"log/syslog"
"os"
"strings"
"time"

cc "github.com/ivanpirog/coloredcobra"
logrussyslog "github.com/sirupsen/logrus/hooks/syslog"
Expand Down Expand Up @@ -203,6 +204,13 @@ var RootCmd = &cobra.Command{

defer closeDmsgDC()

go func() {
for {
tpdAPI.DmsgServers = dmsgDC.ConnectedServersPK()
time.Sleep(time.Second)
}
}()

go dmsghttp.UpdateServers(ctx, dClient, dmsgDisc, dmsgDC, logger)

go func() {
Expand Down
12 changes: 6 additions & 6 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ services:
depends_on:
- tpd-redis
- postgres-db
entrypoint: "/release/transport-discovery --pg-host postgres-db --pg-port 5432 --redis redis://tpd-redis:6379"
entrypoint: "/release/transport-discovery --pg-host postgres-db --pg-port 5432 --redis redis://tpd-redis:6379 --sk 85789cd7efcdf35340c8f4cb3e15bccdff57efda49af5bcdddaae57374d25ab8 --dmsg-disc http://dmsg-discovery:9090"
stdin_open: true # docker run -i
tty: true # docker run -t

Expand All @@ -190,7 +190,7 @@ services:
- "9092:9092"
depends_on:
- transport-discovery
entrypoint: "/release/route-finder --pg-host postgres-db --pg-port 5432"
entrypoint: "/release/route-finder --pg-host postgres-db --pg-port 5432 --sk 640905f9fd60d6bf1ee88519f61035765d65319d9f3bac6c5f2fc14ea5cf15ca --dmsg-disc http://dmsg-discovery:9090"
stdin_open: true # docker run -i
tty: true # docker run -t

Expand All @@ -209,7 +209,7 @@ services:
depends_on:
- dmsgd-redis
- transport-discovery
entrypoint: "/usr/local/bin/dmsg-discovery --redis redis://dmsgd-redis:6379 -t"
entrypoint: "/usr/local/bin/dmsg-discovery --redis redis://dmsgd-redis:6379 --sk b3f6706cb72215d3873ef92cc0c6037a47fe651112b1685017d6347eed0fb714 -t"
stdin_open: true # docker run -i
tty: true # docker run -t

Expand Down Expand Up @@ -279,7 +279,7 @@ services:
- PG_USER=postgres
- PG_PASSWORD=postgres
- PG_DATABASE=postgres
entrypoint: "/release/service-discovery --pg-host postgres-db --pg-port 5432 --redis redis://sd-redis:6379"
entrypoint: "/release/service-discovery --pg-host postgres-db --pg-port 5432 --redis redis://sd-redis:6379 --sk ccc3ae9993ed03bed80b1f9feb747d7c6ca3342a65c3923191b7527c2c00ef0f --dmsg-disc http://dmsg-discovery:9090"
stdin_open: true # docker run -i
tty: true # docker run -t

Expand All @@ -303,7 +303,7 @@ services:
- PG_DATABASE=postgres
ports:
- "9096:9096"
entrypoint: "/release/uptime-tracker --pg-host postgres-db --pg-port 5432 --redis redis://ut-redis:6379"
entrypoint: "/release/uptime-tracker --pg-host postgres-db --pg-port 5432 --redis redis://ut-redis:6379 --sk e20681b4fd1eb1904ebfbf8fba79a138bbac481e1c3f77bcfab3a877525fda32 --dmsg-disc http://dmsg-discovery:9090"
stdin_open: true # docker run -i
tty: true # docker run -t

Expand All @@ -322,7 +322,7 @@ services:
depends_on:
- ar-redis
restart: on-failure
entrypoint: "/release/address-resolver --redis redis://ar-redis:6379"
entrypoint: "/release/address-resolver --redis redis://ar-redis:6379 --sk 1fa0a7b80438b8d31655b5c69efd57bcf931ac828438ff2925ab36e4abcc426a --dmsg-disc http://dmsg-discovery:9090"
stdin_open: true # docker run -i
tty: true # docker run -t

Expand Down
2 changes: 1 addition & 1 deletion docker/images/dmsg-discovery/DockerfileInt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-alpine AS builder
FROM golang:1.21-alpine AS builder
ARG CGO_ENABLED=0

ENV CGO_ENABLED=${CGO_ENABLED} \
Expand Down
2 changes: 1 addition & 1 deletion docker/images/dmsg-server/DockerfileInt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19-alpine AS builder
FROM golang:1.21-alpine AS builder
ARG CGO_ENABLED=0

ENV CGO_ENABLED=${CGO_ENABLED} \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ require (
github.com/json-iterator/go v1.1.12
github.com/rs/cors v1.8.2
github.com/sirupsen/logrus v1.9.3
github.com/skycoin/dmsg v1.3.12-0.20231120175607-0b6d5135bbc5
github.com/skycoin/dmsg v1.3.12-0.20231130180155-65d707cd1b01
github.com/skycoin/skywire v1.3.14-0.20231120181804-7c5994927a04
github.com/skycoin/skywire-utilities v0.0.0-20231120175000-12be4345eb26
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/skycoin/dmsg v1.3.12-0.20231120175607-0b6d5135bbc5 h1:yGTInFb9SqchM5w0RrFA4vgq9tzhKQStURpetUor+4s=
github.com/skycoin/dmsg v1.3.12-0.20231120175607-0b6d5135bbc5/go.mod h1:HPGbmjaaKzGGOL8B0Rksc9+asBEAjnmPkJ2t1Hfl+uI=
github.com/skycoin/dmsg v1.3.12-0.20231130180155-65d707cd1b01 h1:dZD0r4a6pyCpyMYzQxdatmmTScpNj0gYlPQghKfBKes=
github.com/skycoin/dmsg v1.3.12-0.20231130180155-65d707cd1b01/go.mod h1:HPGbmjaaKzGGOL8B0Rksc9+asBEAjnmPkJ2t1Hfl+uI=
github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA=
github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o=
github.com/skycoin/skycoin v0.27.1 h1:HatxsRwVSPaV4qxH6290xPBmkH/HgiuAoY2qC+e8C9I=
Expand Down
18 changes: 11 additions & 7 deletions pkg/address-resolver/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,16 @@ type API struct {
closeOnce sync.Once
closeC chan struct{}

dmsgAddr string
dmsgAddr string
DmsgServers []string
}

// HealthCheckResponse is struct of /health endpoint
type HealthCheckResponse struct {
BuildInfo *buildinfo.Info `json:"build_info,omitempty"`
StartedAt time.Time `json:"started_at"`
DmsgAddr string `json:"dmsg_address,omitempty"`
BuildInfo *buildinfo.Info `json:"build_info,omitempty"`
StartedAt time.Time `json:"started_at"`
DmsgAddr string `json:"dmsg_address,omitempty"`
DmsgServers []string `json:"dmsg_servers,omitempty"`
}

// ArData has all the visors that have registered with sudph or stcpr transport
Expand All @@ -97,6 +99,7 @@ func New(log *logging.Logger, s store.Store, nonceStore httpauth.NonceStore,
startedAt: time.Now(),
closeC: make(chan struct{}),
dmsgAddr: dmsgAddr,
DmsgServers: []string{},
}

r := chi.NewRouter()
Expand Down Expand Up @@ -338,9 +341,10 @@ func (a *API) resolve(w http.ResponseWriter, r *http.Request) {
func (a *API) health(w http.ResponseWriter, r *http.Request) {
info := buildinfo.Get()
a.writeJSON(w, r, http.StatusOK, HealthCheckResponse{
BuildInfo: info,
StartedAt: a.startedAt,
DmsgAddr: a.dmsgAddr,
BuildInfo: info,
StartedAt: a.startedAt,
DmsgAddr: a.dmsgAddr,
DmsgServers: a.DmsgServers,
})
}

Expand Down
16 changes: 10 additions & 6 deletions pkg/route-finder/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,15 @@ type API struct {
store store.Store
startedAt time.Time
dmsgAddr string
DmsgServers []string
}

// HealthCheckResponse is struct of /health endpoint
type HealthCheckResponse struct {
BuildInfo *buildinfo.Info `json:"build_info,omitempty"`
StartedAt time.Time `json:"started_at"`
DmsgAddr string `json:"dmsg_address,omitempty"`
BuildInfo *buildinfo.Info `json:"build_info,omitempty"`
StartedAt time.Time `json:"started_at"`
DmsgAddr string `json:"dmsg_address,omitempty"`
DmsgServers []string `json:"dmsg_servers,omitempty"`
}

// New creates a new api
Expand All @@ -46,6 +48,7 @@ func New(s store.Store, logger logrus.FieldLogger, enableMetrics bool, dmsgAddr
store: s,
startedAt: time.Now(),
dmsgAddr: dmsgAddr,
DmsgServers: []string{},
}

r := chi.NewRouter()
Expand Down Expand Up @@ -156,9 +159,10 @@ func (a *API) getPairedRoutes(w http.ResponseWriter, r *http.Request) {
func (a *API) health(w http.ResponseWriter, r *http.Request) {
info := buildinfo.Get()
a.writeJSON(w, r, http.StatusOK, HealthCheckResponse{
BuildInfo: info,
StartedAt: a.startedAt,
DmsgAddr: a.dmsgAddr,
BuildInfo: info,
StartedAt: a.startedAt,
DmsgAddr: a.dmsgAddr,
DmsgServers: a.DmsgServers,
})
}

Expand Down
9 changes: 6 additions & 3 deletions pkg/transport-discovery/api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,15 @@ type API struct {
store store.Store
startedAt time.Time
dmsgAddr string
DmsgServers []string
}

// HealthCheckResponse is struct of /health endpoint
type HealthCheckResponse struct {
BuildInfo *buildinfo.Info `json:"build_info,omitempty"`
StartedAt time.Time `json:"started_at"`
DmsgAddr string `json:"dmsg_address,omitempty"`
BuildInfo *buildinfo.Info `json:"build_info,omitempty"`
StartedAt time.Time `json:"started_at"`
DmsgAddr string `json:"dmsg_address,omitempty"`
DmsgServers []string `json:"dmsg_servers,omitempty"`
}

// New constructs a new API instance.
Expand All @@ -74,6 +76,7 @@ func New(log logrus.FieldLogger, s store.Store, nonceStore httpauth.NonceStore,
store: s,
startedAt: time.Now(),
dmsgAddr: dmsgAddr,
DmsgServers: []string{},
}

r := chi.NewRouter()
Expand Down
7 changes: 4 additions & 3 deletions pkg/transport-discovery/api/endpoints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,10 @@ func (api *API) deregisterTransport(w http.ResponseWriter, r *http.Request) {
func (api *API) health(w http.ResponseWriter, r *http.Request) {
info := buildinfo.Get()
api.writeJSON(w, r, http.StatusOK, HealthCheckResponse{
BuildInfo: info,
StartedAt: api.startedAt,
DmsgAddr: api.dmsgAddr,
BuildInfo: info,
StartedAt: api.startedAt,
DmsgAddr: api.dmsgAddr,
DmsgServers: api.DmsgServers,
})
}

Expand Down
10 changes: 10 additions & 0 deletions vendor/github.com/skycoin/dmsg/pkg/dmsg/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ github.com/rs/cors
## explicit; go 1.13
github.com/sirupsen/logrus
github.com/sirupsen/logrus/hooks/syslog
# github.com/skycoin/dmsg v1.3.12-0.20231120175607-0b6d5135bbc5
# github.com/skycoin/dmsg v1.3.12-0.20231130180155-65d707cd1b01
## explicit; go 1.18
github.com/skycoin/dmsg/internal/servermetrics
github.com/skycoin/dmsg/pkg/direct
Expand Down
Loading