From bf8390a91675684c76f6b35ef7d284b8a9a7450b Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 1 Mar 2026 17:16:15 +0300 Subject: [PATCH] chore: format with `golines` Signed-off-by: NotAShelf Change-Id: I11a2f3273abf08c8cf02e0c335e26d826a6a6964 --- cmd/watchdog/root.go | 14 ++++++++++-- internal/aggregate/metrics.go | 6 ++++- internal/aggregate/uniques_test.go | 6 ++++- internal/api/handler_test.go | 36 +++++++++++++++++++++++++----- internal/config/config.go | 3 ++- 5 files changed, 54 insertions(+), 11 deletions(-) diff --git a/cmd/watchdog/root.go b/cmd/watchdog/root.go index cdad894..25afc6b 100644 --- a/cmd/watchdog/root.go +++ b/cmd/watchdog/root.go @@ -47,7 +47,13 @@ func Run(configPath string) error { metricsAgg.MustRegister(promRegistry) // Create HTTP handlers - ingestionHandler := api.NewIngestionHandler(*cfg, pathNormalizer, pathRegistry, refRegistry, metricsAgg) + ingestionHandler := api.NewIngestionHandler( + *cfg, + pathNormalizer, + pathRegistry, + refRegistry, + metricsAgg, + ) // Setup routes mux := http.NewServeMux() @@ -58,7 +64,11 @@ func Run(configPath string) error { }) if cfg.Security.MetricsAuth.Enabled { - metricsHandler = basicAuth(metricsHandler, cfg.Security.MetricsAuth.Username, cfg.Security.MetricsAuth.Password) + metricsHandler = basicAuth( + metricsHandler, + cfg.Security.MetricsAuth.Username, + cfg.Security.MetricsAuth.Password, + ) } mux.Handle(cfg.Server.MetricsPath, metricsHandler) diff --git a/internal/aggregate/metrics.go b/internal/aggregate/metrics.go index 929623f..3c6a587 100644 --- a/internal/aggregate/metrics.go +++ b/internal/aggregate/metrics.go @@ -27,7 +27,11 @@ type MetricsAggregator struct { } // Creates a new metrics aggregator with dynamic labels based on config -func NewMetricsAggregator(pathRegistry *PathRegistry, eventRegistry *CustomEventRegistry, cfg config.Config) *MetricsAggregator { +func NewMetricsAggregator( + pathRegistry *PathRegistry, + eventRegistry *CustomEventRegistry, + cfg config.Config, +) *MetricsAggregator { // Build label names based on what's enabled in config labels := []string{"path"} // path is always included diff --git a/internal/aggregate/uniques_test.go b/internal/aggregate/uniques_test.go index 0be3758..a556f87 100644 --- a/internal/aggregate/uniques_test.go +++ b/internal/aggregate/uniques_test.go @@ -92,7 +92,11 @@ func TestUniquesEstimatorDailyRotation(t *testing.T) { expectedSalt := DailySalt(time.Now()) if currentSalt != expectedSalt { - t.Errorf("Expected estimator to use current day's salt, got %s, expected %s", currentSalt, expectedSalt) + t.Errorf( + "Expected estimator to use current day's salt, got %s, expected %s", + currentSalt, + expectedSalt, + ) } } diff --git a/internal/api/handler_test.go b/internal/api/handler_test.go index b043622..7fff678 100644 --- a/internal/api/handler_test.go +++ b/internal/api/handler_test.go @@ -38,7 +38,11 @@ func TestIngestionHandler_Pageview(t *testing.T) { pathNorm := normalize.NewPathNormalizer(cfg.Site.Path) pathRegistry := aggregate.NewPathRegistry(cfg.Limits.MaxPaths) refRegistry := normalize.NewReferrerRegistry(cfg.Limits.MaxSources) - metricsAgg := aggregate.NewMetricsAggregator(pathRegistry, aggregate.NewCustomEventRegistry(100), cfg) + metricsAgg := aggregate.NewMetricsAggregator( + pathRegistry, + aggregate.NewCustomEventRegistry(100), + cfg, + ) handler := NewIngestionHandler(cfg, pathNorm, pathRegistry, refRegistry, metricsAgg) @@ -80,7 +84,11 @@ func TestIngestionHandler_CustomEvent(t *testing.T) { pathNorm := normalize.NewPathNormalizer(cfg.Site.Path) pathRegistry := aggregate.NewPathRegistry(cfg.Limits.MaxPaths) refRegistry := normalize.NewReferrerRegistry(cfg.Limits.MaxSources) - metricsAgg := aggregate.NewMetricsAggregator(pathRegistry, aggregate.NewCustomEventRegistry(100), cfg) + metricsAgg := aggregate.NewMetricsAggregator( + pathRegistry, + aggregate.NewCustomEventRegistry(100), + cfg, + ) handler := NewIngestionHandler(cfg, pathNorm, pathRegistry, refRegistry, metricsAgg) @@ -114,7 +122,11 @@ func TestIngestionHandler_WrongDomain(t *testing.T) { pathNorm := normalize.NewPathNormalizer(cfg.Site.Path) pathRegistry := aggregate.NewPathRegistry(cfg.Limits.MaxPaths) refRegistry := normalize.NewReferrerRegistry(cfg.Limits.MaxSources) - metricsAgg := aggregate.NewMetricsAggregator(pathRegistry, aggregate.NewCustomEventRegistry(100), cfg) + metricsAgg := aggregate.NewMetricsAggregator( + pathRegistry, + aggregate.NewCustomEventRegistry(100), + cfg, + ) handler := NewIngestionHandler(cfg, pathNorm, pathRegistry, refRegistry, metricsAgg) @@ -144,7 +156,11 @@ func TestIngestionHandler_MethodNotAllowed(t *testing.T) { pathNorm := normalize.NewPathNormalizer(cfg.Site.Path) pathRegistry := aggregate.NewPathRegistry(cfg.Limits.MaxPaths) refRegistry := normalize.NewReferrerRegistry(cfg.Limits.MaxSources) - metricsAgg := aggregate.NewMetricsAggregator(pathRegistry, aggregate.NewCustomEventRegistry(100), cfg) + metricsAgg := aggregate.NewMetricsAggregator( + pathRegistry, + aggregate.NewCustomEventRegistry(100), + cfg, + ) handler := NewIngestionHandler(cfg, pathNorm, pathRegistry, refRegistry, metricsAgg) @@ -171,7 +187,11 @@ func TestIngestionHandler_InvalidJSON(t *testing.T) { pathNorm := normalize.NewPathNormalizer(cfg.Site.Path) pathRegistry := aggregate.NewPathRegistry(cfg.Limits.MaxPaths) refRegistry := normalize.NewReferrerRegistry(cfg.Limits.MaxSources) - metricsAgg := aggregate.NewMetricsAggregator(pathRegistry, aggregate.NewCustomEventRegistry(100), cfg) + metricsAgg := aggregate.NewMetricsAggregator( + pathRegistry, + aggregate.NewCustomEventRegistry(100), + cfg, + ) handler := NewIngestionHandler(cfg, pathNorm, pathRegistry, refRegistry, metricsAgg) @@ -206,7 +226,11 @@ func TestIngestionHandler_DeviceClassification(t *testing.T) { pathNorm := normalize.NewPathNormalizer(cfg.Site.Path) pathRegistry := aggregate.NewPathRegistry(cfg.Limits.MaxPaths) refRegistry := normalize.NewReferrerRegistry(cfg.Limits.MaxSources) - metricsAgg := aggregate.NewMetricsAggregator(pathRegistry, aggregate.NewCustomEventRegistry(100), cfg) + metricsAgg := aggregate.NewMetricsAggregator( + pathRegistry, + aggregate.NewCustomEventRegistry(100), + cfg, + ) handler := NewIngestionHandler(cfg, pathNorm, pathRegistry, refRegistry, metricsAgg) diff --git a/internal/config/config.go b/internal/config/config.go index a03a864..1714196 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -112,7 +112,8 @@ func (c *Config) Validate() error { } // Validate salt_rotation - if c.Site.SaltRotation != "" && c.Site.SaltRotation != "daily" && c.Site.SaltRotation != "hourly" { + if c.Site.SaltRotation != "" && c.Site.SaltRotation != "daily" && + c.Site.SaltRotation != "hourly" { return fmt.Errorf("site.salt_rotation must be 'daily' or 'hourly'") }