refactor: dependency injection instead of package globals (#57)

* refactor: export Settings type, Setup returns value

* refactor: resolver.Setup takes explicit Settings struct

* refactor: GetHeadersWithoutTrustedHeaders takes explicit header params

* refactor: server constructors take narrow config

* refactor: Router struct with handler methods, remove geoSvc global

* refactor: wire DI through main, remove setting.App references

* refactor: remove App global, use returned Settings

* refactor: update router tests for DI

* chore: fix lint issues — rename ServerTimeouts to Timeouts, fix shadowed variables
This commit is contained in:
2026-07-21 18:37:21 +02:00
committed by GitHub
parent 3874f6af3f
commit 2e32a20f60
19 changed files with 298 additions and 253 deletions
+12 -9
View File
@@ -6,18 +6,21 @@ import (
"log"
"net/http"
"github.com/dcarrillo/whatismyip/internal/setting"
"github.com/prometheus/client_golang/prometheus/promhttp"
)
type Prometheus struct {
server *http.Server
ctx context.Context
server *http.Server
ctx context.Context
addr string
timeouts Timeouts
}
func NewPrometheusServer(ctx context.Context) *Prometheus {
func NewPrometheusServer(ctx context.Context, addr string, timeouts Timeouts) *Prometheus {
return &Prometheus{
ctx: ctx,
ctx: ctx,
addr: addr,
timeouts: timeouts,
}
}
@@ -26,13 +29,13 @@ func (p *Prometheus) Start() {
mux.Handle("/metrics", promhttp.Handler())
p.server = &http.Server{
Addr: setting.App.PrometheusAddress,
Addr: p.addr,
Handler: mux,
ReadTimeout: setting.App.Server.ReadTimeout,
WriteTimeout: setting.App.Server.WriteTimeout,
ReadTimeout: p.timeouts.ReadTimeout,
WriteTimeout: p.timeouts.WriteTimeout,
}
log.Printf("Starting Prometheus server listening on %s", setting.App.PrometheusAddress)
log.Printf("Starting Prometheus server listening on %s", p.addr)
go func() {
if err := p.server.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
log.Fatal(err)