c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat(oohelperd): add prometheus metrics (#897)

Browse source 
Closes https://github.com/ooni/probe/issues/2183

While there, avoid exposing nil values for optional fields of the
THResponse struct (i.e., "ip_info" and "tls_handshake").

While there, fix `measurexlite`'s `OperationLogger` test
and make it deterministic rather than racy.
This commit is contained in:
Simone Basso 2022-08-28 23:54:22 +02:00 • committed by GitHub
commit dcdd8fb712
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 98 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/cmd/oohelperd/main.go
View file

@ -14,12 +14,13 @@ import (
"github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/runtimex"
"github.com/prometheus/client_golang/prometheus/promhttp"
)
const maxAcceptableBody = 1 << 24
var (
endpoint = flag.String("endpoint", "127.0.0.1:8080", "Endpoint where to listen")
endpoint = flag.String("endpoint", "127.0.0.1:8080", "API endpoint")
srvAddr = make(chan string, 1) // with buffer
srvCancel context.CancelFunc
srvCtx context.Context
@ -49,6 +50,7 @@ func main() {
true: log.DebugLevel,
false: log.InfoLevel,
}
prometheus := flag.String("prometheus", "127.0.0.1:9091", "Prometheus endpoint")
debug := flag.Bool("debug", false, "Toggle debug mode")
flag.Parse()
log.SetLevel(logmap[*debug])
@ -75,8 +77,13 @@ func main() {
srvAddr <- listener.Addr().String()
srvWg.Add(1)
go srv.Serve(listener)
promMux := http.NewServeMux()
promMux.Handle("/metrics", promhttp.Handler())
promSrv := &http.Server{Addr: *prometheus, Handler: promMux}
go promSrv.ListenAndServe()
<-srvCtx.Done()
shutdown(srv)
shutdown(promSrv)
listener.Close()
srvWg.Done()
}