api: remove service health from prometheus, implement godoxy metrics

agent/pkg/agent/config.go

@@ -36,7 +36,7 @@ const (
 	EndpointProxyHTTP  = "/proxy/http"
 	EndpointHealth     = "/health"
 	EndpointLogs       = "/logs"
-	EndpointSystemInfo = "/system-info"
+	EndpointSystemInfo = "/system_info"
 
 	AgentHost = certs.CertsDNSName
 

agent/pkg/agent/requests.go

@@ -16,6 +16,20 @@ func (cfg *AgentConfig) Do(ctx context.Context, method, endpoint string, body io
 	return cfg.httpClient.Do(req)
 }
 
+func (cfg *AgentConfig) Forward(req *http.Request, endpoint string) ([]byte, int, error) {
+	req = req.WithContext(req.Context())
+	req.URL.Host = AgentHost
+	req.URL.Scheme = "https"
+	req.URL.Path = APIEndpointBase + endpoint
+	resp, err := cfg.httpClient.Do(req)
+	if err != nil {
+		return nil, 0, err
+	}
+	defer resp.Body.Close()
+	data, _ := io.ReadAll(resp.Body)
+	return data, resp.StatusCode, nil
+}
+
 func (cfg *AgentConfig) Fetch(ctx context.Context, endpoint string) ([]byte, int, error) {
 	resp, err := cfg.Do(ctx, "GET", endpoint, nil)
 	if err != nil {

agent/pkg/handler/handler.go

@@ -15,6 +15,7 @@ import (
 	E "github.com/yusing/go-proxy/internal/error"
 	"github.com/yusing/go-proxy/internal/logging"
 	"github.com/yusing/go-proxy/internal/logging/memlogger"
+	"github.com/yusing/go-proxy/internal/metrics/systeminfo"
 	"github.com/yusing/go-proxy/internal/task"
 	"github.com/yusing/go-proxy/internal/utils/strutils"
 )
@@ -49,7 +50,7 @@ func NewAgentHandler() http.Handler {
 	})
 	mux.HandleMethods("GET", agent.EndpointHealth, CheckHealth)
 	mux.HandleMethods("GET", agent.EndpointLogs, memlogger.LogsWS(nil))
-	mux.HandleMethods("GET", agent.EndpointSystemInfo, SystemInfo)
+	mux.HandleMethods("GET", agent.EndpointSystemInfo, systeminfo.Poller.ServeHTTP)
 	mux.ServeMux.HandleFunc("/", DockerSocketHandler())
 	return mux
 }

agent/pkg/handler/system_info.go

@@ -1,17 +0,0 @@
-package handler
-
-import (
-	"net/http"
-
-	"github.com/yusing/go-proxy/internal/api/v1/utils"
-	"github.com/yusing/go-proxy/internal/metrics"
-)
-
-func SystemInfo(w http.ResponseWriter, r *http.Request) {
-	info, err := metrics.GetSystemInfo(r.Context())
-	if err != nil {
-		utils.HandleErr(w, r, err)
-		return
-	}
-	utils.RespondJSON(w, r, info)
-}