diff --git a/internal/exporter/collector.go b/internal/exporter/collector.go index dd11c26..547b5aa 100644 --- a/internal/exporter/collector.go +++ b/internal/exporter/collector.go @@ -15,12 +15,7 @@ type Collector struct { queue *RequestDataQueue } -func NewCollector( - config *cmd.AppSettings, - cache *cache.Cache, - db *database.Database, - queue *RequestDataQueue, -) *Collector { +func NewCollector(config *cmd.AppSettings, cache *cache.Cache, db *database.Database, queue *RequestDataQueue) *Collector { return &Collector{ config: config, cache: cache, diff --git a/internal/exporter/middleware.go b/internal/exporter/middleware.go index f80b23d..d5f19c4 100644 --- a/internal/exporter/middleware.go +++ b/internal/exporter/middleware.go @@ -8,7 +8,7 @@ import ( "github.com/go-chi/chi/v5/middleware" ) -type RequestData struct { +type requestData struct { Latency time.Duration Request *http.Request Start time.Time @@ -16,22 +16,22 @@ type RequestData struct { type RequestDataQueue struct { mu sync.Mutex - data []RequestData + data []requestData } func NewRequestDataQueue() *RequestDataQueue { return &RequestDataQueue{ - data: []RequestData{}, + data: []requestData{}, } } -func (q *RequestDataQueue) Add(data RequestData) { +func (q *RequestDataQueue) Add(data requestData) { q.mu.Lock() defer q.mu.Unlock() q.data = append(q.data, data) } -func (q *RequestDataQueue) ConsumeAll() []RequestData { +func (q *RequestDataQueue) ConsumeAll() []requestData { q.mu.Lock() defer q.mu.Unlock() data := q.data @@ -57,7 +57,7 @@ func (m Middleware) handler(next http.Handler) http.Handler { next.ServeHTTP(ww, r) m.queue.Add( - RequestData{ + requestData{ Latency: time.Since(start), Request: r, Start: start, diff --git a/main.go b/main.go index 5d9ac8d..ed166b5 100644 --- a/main.go +++ b/main.go @@ -85,12 +85,7 @@ func main() { } } -func enableExporter( - settings *cmd.AppSettings, - cache *cache.Cache, - db *database.Database, - queue *exporter.RequestDataQueue, -) error { +func enableExporter(settings *cmd.AppSettings, cache *cache.Cache, db *database.Database, queue *exporter.RequestDataQueue) error { prometheus.MustRegister(exporter.NewCollector(settings, cache, db, queue)) metricsServer := &http.Server{