NotAShelf/watchdog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: format with golines

Browse source 
Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I11a2f3273abf08c8cf02e0c335e26d826a6a6964
This commit is contained in:
raf 2026-03-01 17:16:15 +03:00
commit bf8390a916
Signed by: NotAShelf
GPG key ID: 29D95B64378DB4BF
5 changed files with 54 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/watchdog/root.go
View file

@ -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)

6
internal/aggregate/metrics.go
View file

@ -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

6
internal/aggregate/uniques_test.go
View file

@ -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,
)
}
}

36
internal/api/handler_test.go
View file

@ -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)

3
internal/config/config.go
View file

@ -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'")
}