Compare commits
2 Commits
0f2fb51065
...
a6ed3f8f4c
| Author | SHA1 | Date | |
|---|---|---|---|
| a6ed3f8f4c | |||
| 0f2d550a14 |
63
internal/metrics/metrics.go
Normal file
63
internal/metrics/metrics.go
Normal file
@@ -0,0 +1,63 @@
|
||||
package metrics
|
||||
|
||||
import (
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
// 环形秒级窗口,用于计算 QPS / QPM。
|
||||
// 只针对转发请求调用 Inc。
|
||||
|
||||
type bucket struct {
|
||||
second atomic.Int64 // Unix 秒
|
||||
count atomic.Int64
|
||||
}
|
||||
|
||||
var (
|
||||
buckets [60]bucket
|
||||
total atomic.Int64
|
||||
)
|
||||
|
||||
// Inc 增加一次请求计数
|
||||
func Inc() {
|
||||
now := time.Now().Unix()
|
||||
idx := now % 60
|
||||
b := &buckets[idx]
|
||||
for {
|
||||
sec := b.second.Load()
|
||||
if sec == now {
|
||||
b.count.Add(1)
|
||||
break
|
||||
}
|
||||
if b.second.CompareAndSwap(sec, now) {
|
||||
b.count.Store(1)
|
||||
break
|
||||
}
|
||||
}
|
||||
total.Add(1)
|
||||
}
|
||||
|
||||
// QPS 返回当前秒内的请求数
|
||||
func QPS() int64 {
|
||||
now := time.Now().Unix()
|
||||
idx := now % 60
|
||||
b := &buckets[idx]
|
||||
if b.second.Load() == now { return b.count.Load() }
|
||||
return 0
|
||||
}
|
||||
|
||||
// QPM 返回最近 60 秒内的请求总数
|
||||
func QPM() int64 {
|
||||
now := time.Now().Unix()
|
||||
var sum int64
|
||||
for i := range 60 {
|
||||
sec := buckets[i].second.Load()
|
||||
if sec <= now && now-sec < 60 { // 在窗口内
|
||||
sum += buckets[i].count.Load()
|
||||
}
|
||||
}
|
||||
return sum
|
||||
}
|
||||
|
||||
// Total 返回累计转发请求数
|
||||
func Total() int64 { return total.Load() }
|
||||
23
internal/middleware/metrics.go
Normal file
23
internal/middleware/metrics.go
Normal file
@@ -0,0 +1,23 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"anyproxy/internal/metrics"
|
||||
)
|
||||
|
||||
// MetricsHandler 输出当前指标
|
||||
func MetricsHandler(c *gin.Context) {
|
||||
qps := metrics.QPS()
|
||||
qpm := metrics.QPM()
|
||||
c.JSON(200, gin.H{
|
||||
"qps_current": qps,
|
||||
"qps_avg_60s": float64(qpm) / 60.0,
|
||||
"qpm_current": qpm,
|
||||
"qpm_avg_60m": float64(qpm),
|
||||
"total": metrics.Total(),
|
||||
"timestamp": time.Now().Unix(),
|
||||
})
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"sync/atomic"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -16,7 +16,7 @@ func RequestID() gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
id := globalReqID.Add(1)
|
||||
c.Set(RequestIDKey, id)
|
||||
c.Writer.Header().Set("X-Request-ID", fmt.Sprintf("%d", id))
|
||||
c.Writer.Header().Set("X-Request-ID", strconv.FormatInt(id, 10))
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,19 +6,24 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"mime"
|
||||
"net/http"
|
||||
"strings"
|
||||
"sync"
|
||||
"sync/atomic"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
|
||||
"anyproxy/internal/metrics"
|
||||
"anyproxy/internal/middleware"
|
||||
)
|
||||
|
||||
// 转发的总请求计数器
|
||||
var totalForwarded atomic.Int64
|
||||
|
||||
var copyBufPool = sync.Pool{
|
||||
New: func() any { return make([]byte, 32*1024) },
|
||||
}
|
||||
|
||||
// Proxy 封装具体的转发逻辑
|
||||
type Proxy struct {
|
||||
Client *http.Client
|
||||
@@ -72,8 +77,10 @@ func (p *Proxy) forward(c *gin.Context, target string) {
|
||||
return
|
||||
}
|
||||
upReq.Header = c.Request.Header.Clone()
|
||||
|
||||
// 仅在 SSE 时禁用压缩;稍后检测
|
||||
if strings.Contains(strings.ToLower(c.GetHeader("Accept")), "text/event-stream") {
|
||||
// SSE 禁用压缩
|
||||
upReq.Header.Del("Accept-Encoding")
|
||||
}
|
||||
|
||||
resp, err := p.Client.Do(upReq)
|
||||
if err != nil {
|
||||
@@ -83,15 +90,17 @@ func (p *Proxy) forward(c *gin.Context, target string) {
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
|
||||
mediaType, _, _ := mime.ParseMediaType(resp.Header.Get("Content-Type"))
|
||||
isSSE := mediaType == "text/event-stream"
|
||||
// 仅在真正进行了一次上游转发并得到响应后计数
|
||||
metrics.Inc()
|
||||
|
||||
contentType := strings.ToLower(resp.Header.Get("Content-Type"))
|
||||
isSSE := strings.HasPrefix(contentType, "text/event-stream")
|
||||
|
||||
p.Log.Debug("上游响应", "req_id", reqID, "status", resp.StatusCode, "sse", isSSE)
|
||||
|
||||
// 复制上游响应头(最小化过滤)
|
||||
for k, vs := range resp.Header {
|
||||
for _, v := range vs { c.Header(k, v) }
|
||||
}
|
||||
// 复制上游响应头
|
||||
dstHeader := c.Writer.Header()
|
||||
for k, vs := range resp.Header { dstHeader[k] = vs }
|
||||
if isSSE {
|
||||
c.Writer.Header().Del("Content-Length")
|
||||
c.Writer.Header().Del("Transfer-Encoding")
|
||||
@@ -99,14 +108,15 @@ func (p *Proxy) forward(c *gin.Context, target string) {
|
||||
c.Header("Cache-Control", "no-cache")
|
||||
c.Header("Connection", "keep-alive")
|
||||
c.Header("X-Accel-Buffering", "no")
|
||||
// 确保禁用上游压缩避免 SSE 事件被聚合
|
||||
upReq.Header.Del("Accept-Encoding")
|
||||
}
|
||||
c.Status(resp.StatusCode)
|
||||
if f, ok := c.Writer.(http.Flusher); ok { f.Flush() }
|
||||
|
||||
if !isSSE {
|
||||
if _, err := io.Copy(c.Writer, resp.Body); err != nil {
|
||||
buf := copyBufPool.Get().([]byte)
|
||||
_, err := io.CopyBuffer(c.Writer, resp.Body, buf)
|
||||
copyBufPool.Put(buf)
|
||||
if err != nil {
|
||||
p.Log.Error("写入响应体失败", "req_id", reqID, "error", err)
|
||||
}
|
||||
return
|
||||
@@ -137,7 +147,9 @@ func (p *Proxy) forward(c *gin.Context, target string) {
|
||||
|
||||
// HelloPage 返回简单状态页面
|
||||
func HelloPage(c *gin.Context) {
|
||||
count := totalForwarded.Load()
|
||||
count := metrics.Total()
|
||||
qps := metrics.QPS()
|
||||
qpm := metrics.QPM()
|
||||
|
||||
// 推断外部可见协议与主机(支持反向代理常见头)
|
||||
scheme := "http"
|
||||
@@ -152,7 +164,7 @@ func HelloPage(c *gin.Context) {
|
||||
}
|
||||
base := scheme + "://" + host
|
||||
|
||||
str := fmt.Sprintf("AnyProxy 服务器正在运行... 已转发 %d 个请求", count)
|
||||
str := fmt.Sprintf("AnyProxy 服务器正在运行...\n累计转发(不含本页): %d\n当前QPS: %d\n最近1分钟QPM: %d", count, qps, qpm)
|
||||
str += "\n\n使用方法:\n"
|
||||
str += "方式1 - 直接协议路径: \n"
|
||||
str += fmt.Sprintf(" 目标URL: https://example.com/path --> 代理URL: %s/https/example.com/path\n", base)
|
||||
|
||||
@@ -38,14 +38,17 @@ func BuildFromProtocol(protocol, remainder string, originalQuery url.Values) (st
|
||||
func mergeQuery(raw string, original url.Values) (string, error) {
|
||||
parsed, err := url.Parse(raw)
|
||||
if err != nil { return "", err }
|
||||
if parsed.Scheme != "http" && parsed.Scheme != "https" {
|
||||
return "", errors.New("不支持的协议")
|
||||
}
|
||||
if parsed.Host == "" {
|
||||
return "", errors.New("目标地址无效")
|
||||
}
|
||||
// 合并 query
|
||||
q := parsed.Query()
|
||||
for k, vs := range original {
|
||||
for _, v := range vs { q.Add(k, v) }
|
||||
}
|
||||
parsed.RawQuery = q.Encode()
|
||||
if _, err := url.ParseRequestURI(parsed.String()); err != nil {
|
||||
return "", err
|
||||
}
|
||||
return parsed.String(), nil
|
||||
}
|
||||
|
||||
13
main.go
13
main.go
@@ -50,8 +50,16 @@ func main() {
|
||||
|
||||
if cfg.Debug || lvlStr == "debug" { gin.SetMode(gin.DebugMode) } else { gin.SetMode(gin.ReleaseMode) }
|
||||
|
||||
// 可复用的 HTTP 客户端(保持连接复用)
|
||||
transport := &http.Transport{Proxy: http.ProxyFromEnvironment, DisableCompression: true}
|
||||
// 可复用的 HTTP 客户端
|
||||
transport := &http.Transport{
|
||||
Proxy: http.ProxyFromEnvironment,
|
||||
ForceAttemptHTTP2: true,
|
||||
MaxIdleConns: 512,
|
||||
MaxIdleConnsPerHost: 128,
|
||||
IdleConnTimeout: 90 * time.Second,
|
||||
TLSHandshakeTimeout: 10 * time.Second,
|
||||
ExpectContinueTimeout: 1 * time.Second,
|
||||
}
|
||||
client := &http.Client{Transport: transport}
|
||||
if cfg.RequestTimeout > 0 { client.Timeout = time.Duration(cfg.RequestTimeout) * time.Second }
|
||||
|
||||
@@ -61,6 +69,7 @@ func main() {
|
||||
r.Use(middleware.Recovery(logger), middleware.RequestID(), middleware.Logger(logger))
|
||||
|
||||
r.GET("/", proxy.HelloPage) // 欢迎页面
|
||||
r.GET("/metrics", middleware.MetricsHandler) // 指标接口
|
||||
r.Any("/proxy/*proxyPath", p.HandleProxyPath) // 处理 /proxy/*path 形式的请求
|
||||
r.Any(":protocol/*remainder", p.HandleProtocol) // 处理 /:protocol/*remainder 形式的请求
|
||||
|
||||
|
||||
Reference in New Issue
Block a user