diff --git a/go.mod b/go.mod index 47a3f7a..99d00fa 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,17 @@ module ade9/llmproxymetrics go 1.23.3 +require github.com/caarlos0/env v3.5.0+incompatible + require ( - github.com/caarlos0/env v3.5.0+incompatible + github.com/beorn7/perks v1.0.1 // indirect github.com/caarlos0/env/v11 v11.3.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/prometheus/client_golang v1.22.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.62.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + golang.org/x/sys v0.30.0 // indirect + google.golang.org/protobuf v1.36.5 // indirect ) diff --git a/go.sum b/go.sum index 6c728a5..c48a3ab 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,22 @@ +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/caarlos0/env v3.5.0+incompatible h1:Yy0UN8o9Wtr/jGHZDpCBLpNrzcFLLM2yixi/rBrKyJs= github.com/caarlos0/env v3.5.0+incompatible/go.mod h1:tdCsowwCzMLdkqRYDlHpZCp2UooDD3MspDBjZ2AD02Y= github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA= github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q= +github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= diff --git a/llmproxymetrics.go b/llmproxymetrics.go index 6d86188..a85e765 100644 --- a/llmproxymetrics.go +++ b/llmproxymetrics.go @@ -10,8 +10,12 @@ import ( "net/http/httputil" "net/url" "strconv" + "strings" "github.com/caarlos0/env/v11" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/prometheus/client_golang/prometheus/promhttp" ) var cfg config @@ -23,12 +27,14 @@ type config struct { func createProxy(target *url.URL) func(http.ResponseWriter, *http.Request) { return func(w http.ResponseWriter, r *http.Request) { + r.URL.Path = strings.TrimPrefix(r.URL.Path, "/proxy") r.Host = target.Host r.URL.Scheme = target.Scheme r.URL.Host = target.Host director := func(req *http.Request) { req.Header.Set("X-Forwarded-For", r.RemoteAddr) + req.URL = r.URL req.Host = target.Host req.URL.Scheme = target.Scheme req.URL.Host = target.Host @@ -81,9 +87,15 @@ func handleJsonLine(line []byte) { if jsonData["done"].(bool) { duration := jsonData["eval_duration"].(float64) fmt.Printf("Duration: %.2f seconds\n", duration/1000000000.0) + opsProcessed.Inc() } } +var opsProcessed = promauto.NewCounter(prometheus.CounterOpts{ + Name: "total_requests", + Help: "The total number of processed events", +}) + func main() { err := env.Parse(&cfg) if err != nil { @@ -95,7 +107,8 @@ func main() { log.Fatal(err) } - http.HandleFunc("/", createProxy(targetURL)) + http.HandleFunc("/proxy/", createProxy(targetURL)) + http.Handle("/metrics", promhttp.Handler()) log.Printf("Starting proxy server on :%s", strconv.Itoa(cfg.Port)) err = http.ListenAndServe(fmt.Sprintf(":%d", cfg.Port), nil)