55a246869e
The standard Prometheus ProcessCollector uses procfs (Linux-only /proc), so process_resident_memory_bytes and process_virtual_memory_bytes were silently absent on FreeBSD, Darwin, and other non-Linux platforms. - Switch to a custom prometheus.Registry to isolate GOST metrics from the default registry auto-registrations - Add gopsutil/v3-based process collector (process_other.go) for platforms without procfs (!linux && !windows) - Keep standard ProcessCollector (process_standard.go) on Linux/Windows - Update metrics service and handler/metrics to serve from promhttp.HandlerFor(customRegistry) instead of promhttp.Handler() - Add Registry() accessor for the custom registry Fixes go-gost/gost#509
117 lines
2.2 KiB
Go
117 lines
2.2 KiB
Go
package metrics
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"net/http"
|
|
"time"
|
|
|
|
"github.com/go-gost/core/auth"
|
|
"github.com/go-gost/core/handler"
|
|
md "github.com/go-gost/core/metadata"
|
|
xmetrics "github.com/go-gost/x/metrics"
|
|
"github.com/go-gost/x/registry"
|
|
"github.com/prometheus/client_golang/prometheus/promhttp"
|
|
)
|
|
|
|
func init() {
|
|
registry.HandlerRegistry().Register("metrics", NewHandler)
|
|
}
|
|
|
|
type metricsHandler struct {
|
|
handler http.Handler
|
|
mux *http.ServeMux
|
|
md metadata
|
|
options handler.Options
|
|
}
|
|
|
|
func NewHandler(opts ...handler.Option) handler.Handler {
|
|
options := handler.Options{}
|
|
for _, opt := range opts {
|
|
opt(&options)
|
|
}
|
|
|
|
return &metricsHandler{
|
|
options: options,
|
|
}
|
|
}
|
|
|
|
func (h *metricsHandler) Init(md md.Metadata) (err error) {
|
|
if err = h.parseMetadata(md); err != nil {
|
|
return
|
|
}
|
|
|
|
xmetrics.Enable(true)
|
|
|
|
h.handler = promhttp.HandlerFor(xmetrics.Registry(), promhttp.HandlerOpts{})
|
|
|
|
mux := http.NewServeMux()
|
|
mux.Handle(h.md.path, http.HandlerFunc(h.handleFunc))
|
|
h.mux = mux
|
|
|
|
return
|
|
}
|
|
|
|
func (h *metricsHandler) Handle(ctx context.Context, conn net.Conn, opts ...handler.HandleOption) error {
|
|
l := &singleConnListener{
|
|
conn: make(chan net.Conn, 1),
|
|
}
|
|
l.send(conn)
|
|
|
|
s := http.Server{
|
|
Handler: h.mux,
|
|
}
|
|
s.Serve(l)
|
|
|
|
return s.Shutdown(ctx)
|
|
}
|
|
|
|
func (h *metricsHandler) Close() error {
|
|
return nil
|
|
}
|
|
|
|
func (h *metricsHandler) handleFunc(w http.ResponseWriter, r *http.Request) {
|
|
if auther := h.options.Auther; auther != nil {
|
|
u, p, _ := r.BasicAuth()
|
|
if _, ok := auther.Authenticate(r.Context(), u, p, auth.WithService(h.options.Service)); !ok {
|
|
w.WriteHeader(http.StatusUnauthorized)
|
|
return
|
|
}
|
|
}
|
|
|
|
log := h.options.Logger
|
|
start := time.Now()
|
|
|
|
h.handler.ServeHTTP(w, r)
|
|
|
|
log = log.WithFields(map[string]any{
|
|
"remote": r.RemoteAddr,
|
|
"duration": time.Since(start),
|
|
})
|
|
log.Infof("%s %s", r.Method, r.RequestURI)
|
|
}
|
|
|
|
type singleConnListener struct {
|
|
conn chan net.Conn
|
|
}
|
|
|
|
func (l *singleConnListener) Accept() (net.Conn, error) {
|
|
if conn, ok := <-l.conn; ok {
|
|
return conn, nil
|
|
}
|
|
return nil, net.ErrClosed
|
|
}
|
|
|
|
func (l *singleConnListener) Close() error {
|
|
return nil
|
|
}
|
|
|
|
func (l *singleConnListener) Addr() net.Addr {
|
|
return &net.TCPAddr{}
|
|
}
|
|
|
|
func (l *singleConnListener) send(conn net.Conn) {
|
|
l.conn <- conn
|
|
close(l.conn)
|
|
}
|