perf: use fasthttp for health checks; upgrade go to 1.25.3

2026-03-29 21:31:48 +02:00 · 2025-10-17 22:50:13 +08:00
parent 3e73be60a1
commit 5a91db8d10
12 changed files with 172 additions and 144 deletions
--- a/internal/dnsproviders/go.mod
+++ b/internal/dnsproviders/go.mod
@@ -1,12 +1,12 @@
 module github.com/yusing/godoxy/internal/dnsproviders

-go 1.25.2
+go 1.25.3

 replace github.com/yusing/godoxy => ../..

 require (
 	github.com/go-acme/lego/v4 v4.26.0
-	github.com/yusing/godoxy v0.18.6
+	github.com/yusing/godoxy v0.19.2
 )

 require (
@@ -75,7 +75,7 @@ require (
 	github.com/vultr/govultr/v3 v3.24.0 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	github.com/yusing/gointernals v0.1.16 // indirect
-	github.com/yusing/goutils v0.6.1 // indirect
+	github.com/yusing/goutils v0.7.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
 	go.opentelemetry.io/otel v1.38.0 // indirect
@@ -93,7 +93,7 @@ require (
 	golang.org/x/text v0.30.0 // indirect
 	golang.org/x/tools v0.38.0 // indirect
 	google.golang.org/api v0.252.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f // indirect
 	google.golang.org/grpc v1.76.0 // indirect
 	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
--- a/internal/dnsproviders/go.sum
+++ b/internal/dnsproviders/go.sum
@@ -182,8 +182,8 @@ github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zU
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yusing/gointernals v0.1.16 h1:GrhZZdxzA+jojLEqankctJrOuAYDb7kY1C93S1pVR34=
 github.com/yusing/gointernals v0.1.16/go.mod h1:B/0FVXt4WPmgzVy3ynzkqKi+BSGaJVmwCJBRXYapo34=
-github.com/yusing/goutils v0.6.1 h1:PQmWQEBV+xkI6vnyreQ2uT1PFWTQNkZfHM7Oczuih/s=
-github.com/yusing/goutils v0.6.1/go.mod h1:3dgYe/A3+8wT88/iAHwXdL44q5bP+qVo2WAOiPBqOrg=
+github.com/yusing/goutils v0.7.0 h1:I5hd8GwZ+3WZqFPK0tWqek1Q5MY6Xg29hKZcwwQi4SY=
+github.com/yusing/goutils v0.7.0/go.mod h1:CtF/KFH4q8jkr7cvBpkaExnudE0lLu8sLe43F73Bn5Q=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 h1:q4XOmH/0opmeuJtPsbFNivyl7bCt7yRBbeEm2sC/XtQ=
@@ -237,8 +237,8 @@ google.golang.org/genproto v0.0.0-20250908214217-97024824d090 h1:ywCL7vA2n3vVHyf
 google.golang.org/genproto v0.0.0-20250908214217-97024824d090/go.mod h1:zwJI9HzbJJlw2KXy0wX+lmT2JuZoaKK9JC4ppqmxxjk=
 google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1 h1:APHvLLYBhtZvsbnpkfknDZ7NyH4z5+ub/I0u8L3Oz6g=
 google.golang.org/genproto/googleapis/api v0.0.0-20250826171959-ef028d996bc1/go.mod h1:xUjFWUnWDpZ/C0Gu0qloASKFb6f8/QXiiXhSPFsD668=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff h1:A90eA31Wq6HOMIQlLfzFwzqGKBTuaVztYu/g8sn+8Zc=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20251007200510-49b9836ed3ff/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f h1:1FTH6cpXFsENbPR5Bu8NQddPSaUUE6NA2XdZdDSAJK4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20251014184007-4626949a642f/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
 google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
 google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
 google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
--- a/internal/watcher/health/monitor/agent_proxied.go
+++ b/internal/watcher/health/monitor/agent_proxied.go
@@ -1,21 +1,16 @@
 package monitor

 import (
-	"fmt"
-	"net/http"
 	"net/url"
-	"time"

-	"github.com/bytedance/sonic"
 	agentPkg "github.com/yusing/godoxy/agent/pkg/agent"
 	"github.com/yusing/godoxy/internal/types"
-	httputils "github.com/yusing/goutils/http"
 )

 type (
 	AgentProxiedMonitor struct {
-		agent       *agentPkg.AgentConfig
-		endpointURL string
+		agent *agentPkg.AgentConfig
+		query string
 		*monitor
 	}
 	AgentCheckHealthTarget struct {
@@ -51,40 +46,19 @@ func (target *AgentCheckHealthTarget) displayURL() *url.URL {

 func NewAgentProxiedMonitor(agent *agentPkg.AgentConfig, config *types.HealthCheckConfig, target *AgentCheckHealthTarget) *AgentProxiedMonitor {
 	mon := &AgentProxiedMonitor{
-		agent:       agent,
-		endpointURL: agentPkg.EndpointHealth + "?" + target.buildQuery(),
+		agent: agent,
+		query: target.buildQuery(),
 	}
 	mon.monitor = newMonitor(target.displayURL(), config, mon.CheckHealth)
 	return mon
 }

-func (mon *AgentProxiedMonitor) CheckHealth() (result types.HealthCheckResult, err error) {
-	startTime := time.Now()
-
-	ctx, cancel := mon.ContextWithTimeout("timeout querying agent")
-	defer cancel()
-	resp, err := mon.agent.DoHealthCheck(ctx, mon.endpointURL)
-	if err != nil {
-		return result, err
-	}
-
-	data, release, err := httputils.ReadAllBody(resp)
-	resp.Body.Close()
-	if err != nil {
-		return result, err
-	}
-	defer release(data)
-
-	endTime := time.Now()
-	switch resp.StatusCode {
-	case http.StatusOK:
-		err = sonic.Unmarshal(data, &result)
-	default:
-		err = fmt.Errorf("HTTP %d %s", resp.StatusCode, data)
-	}
-	if err == nil && result.Latency != 0 {
-		// use godoxy to agent latency
-		result.Latency = endTime.Sub(startTime)
+func (mon *AgentProxiedMonitor) CheckHealth() (types.HealthCheckResult, error) {
+	resp, err := mon.agent.DoHealthCheck(mon.config.Timeout, mon.query)
+	result := types.HealthCheckResult{
+		Healthy: resp.Healthy,
+		Detail:  resp.Detail,
+		Latency: resp.Latency,
 	}
 	return result, err
 }
--- a/internal/watcher/health/monitor/http.go
+++ b/internal/watcher/health/monitor/http.go
@@ -3,10 +3,10 @@ package monitor
 import (
 	"crypto/tls"
 	"errors"
-	"net/http"
 	"net/url"
 	"time"

+	"github.com/valyala/fasthttp"
 	"github.com/yusing/godoxy/internal/types"
 	"github.com/yusing/goutils/version"
 )
@@ -16,65 +16,53 @@ type HTTPHealthMonitor struct {
 	method string
 }

-var pinger = &http.Client{
-	Transport: &http.Transport{
-		DisableKeepAlives:     true,
-		ForceAttemptHTTP2:     false,
-		TLSHandshakeTimeout:   3 * time.Second,
-		ResponseHeaderTimeout: 5 * time.Second,
-		TLSClientConfig: &tls.Config{
-			InsecureSkipVerify: true,
-		},
-		MaxIdleConnsPerHost: 1,
-		IdleConnTimeout:     10 * time.Second,
-	},
-	CheckRedirect: func(r *http.Request, via []*http.Request) error {
-		return http.ErrUseLastResponse
+var pinger = &fasthttp.Client{
+	ReadTimeout:                   5 * time.Second,
+	WriteTimeout:                  3 * time.Second,
+	MaxConnDuration:               0,
+	DisableHeaderNamesNormalizing: true,
+	DisablePathNormalizing:        true,
+	TLSConfig: &tls.Config{
+		InsecureSkipVerify: true,
 	},
+	MaxConnsPerHost:          1,
+	NoDefaultUserAgentHeader: true,
 }

 func NewHTTPHealthMonitor(url *url.URL, config *types.HealthCheckConfig) *HTTPHealthMonitor {
 	mon := new(HTTPHealthMonitor)
 	mon.monitor = newMonitor(url, config, mon.CheckHealth)
 	if config.UseGet {
-		mon.method = http.MethodGet
+		mon.method = fasthttp.MethodGet
 	} else {
-		mon.method = http.MethodHead
+		mon.method = fasthttp.MethodHead
 	}
 	return mon
 }

 func (mon *HTTPHealthMonitor) CheckHealth() (types.HealthCheckResult, error) {
-	ctx, cancel := mon.ContextWithTimeout("ping request timed out")
-	defer cancel()
+	req := fasthttp.AcquireRequest()
+	defer fasthttp.ReleaseRequest(req)

-	req, err := http.NewRequestWithContext(
-		ctx,
-		mon.method,
-		mon.url.Load().JoinPath(mon.config.Path).String(),
-		nil,
-	)
-	if err != nil {
-		return types.HealthCheckResult{}, err
-	}
-	req.Close = true
+	resp := fasthttp.AcquireResponse()
+	defer fasthttp.ReleaseResponse(resp)
+
+	req.SetRequestURI(mon.url.Load().JoinPath(mon.config.Path).String())
+	req.Header.SetMethod(mon.method)
 	req.Header.Set("User-Agent", "GoDoxy/"+version.Get().String())
 	req.Header.Set("Accept", "text/plain,text/html,*/*;q=0.8")
 	req.Header.Set("Accept-Encoding", "identity")
 	req.Header.Set("Cache-Control", "no-cache")
 	req.Header.Set("Pragma", "no-cache")
+	req.SetConnectionClose()

 	start := time.Now()
-	resp, respErr := pinger.Do(req)
-	if respErr == nil {
-		resp.Body.Close()
-	}
-
+	respErr := pinger.DoTimeout(req, resp, mon.config.Timeout)
 	lat := time.Since(start)

 	switch {
 	case respErr != nil:
-		// treat tls error as healthy
+		// treat TLS error as healthy
 		var tlsErr *tls.CertificateVerificationError
 		if ok := errors.As(respErr, &tlsErr); !ok {
 			return types.HealthCheckResult{
@@ -82,10 +70,10 @@ func (mon *HTTPHealthMonitor) CheckHealth() (types.HealthCheckResult, error) {
 				Detail:  respErr.Error(),
 			}, nil
 		}
-	case resp.StatusCode == http.StatusServiceUnavailable:
+	case resp.StatusCode() == fasthttp.StatusServiceUnavailable:
 		return types.HealthCheckResult{
 			Latency: lat,
-			Detail:  resp.Status,
+			Detail:  fasthttp.StatusMessage(resp.StatusCode()),
 		}, nil
 	}

--- a/internal/watcher/health/monitor/monitor.go
+++ b/internal/watcher/health/monitor/monitor.go
@@ -2,7 +2,6 @@ package monitor

 import (
 	"context"
-	"errors"
 	"fmt"
 	"math/rand"
 	"net/url"
@@ -110,7 +109,7 @@ func (mon *monitor) ContextWithTimeout(cause string) (ctx context.Context, cance
 	default:
 		ctx = context.Background()
 	}
-	return context.WithTimeoutCause(ctx, mon.config.Timeout, errors.New(cause))
+	return context.WithTimeoutCause(ctx, mon.config.Timeout, gperr.New(cause))
 }

 // Start implements task.TaskStarter.