From bcedc52d7cc2939c437b0c5d5e9b14c504ded9e8 Mon Sep 17 00:00:00 2001 From: Aire-One Date: Mon, 23 Sep 2024 03:14:17 +0200 Subject: [PATCH 1/5] refactor: complete rewrite --- .cspell.json | 8 +- .golangci.yaml | 55 +++++- .vscode/launch.json | 16 ++ .vscode/settings.json | 15 +- cmd/labtime/main.go | 26 +++ .../example-config.yaml | 2 +- go.mod | 1 + go.sum | 2 + internal/apps/labtime/app.go | 107 ++++++++++ internal/apps/labtime/flag.go | 18 ++ internal/http/middlewares.go | 33 ++++ internal/monitors/httpmonitor.go | 88 +++++++++ internal/monitors/monitor.go | 6 + internal/scheduler/scheduler.go | 60 ++++++ internal/yamlconfig/yamlconfig.go | 45 +++++ main.go | 182 ------------------ 16 files changed, 465 insertions(+), 199 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 cmd/labtime/main.go rename config/config.yaml => configs/example-config.yaml (71%) create mode 100644 internal/apps/labtime/app.go create mode 100644 internal/apps/labtime/flag.go create mode 100644 internal/http/middlewares.go create mode 100644 internal/monitors/httpmonitor.go create mode 100644 internal/monitors/monitor.go create mode 100644 internal/scheduler/scheduler.go create mode 100644 internal/yamlconfig/yamlconfig.go delete mode 100644 main.go diff --git a/.cspell.json b/.cspell.json index 8726010..f3be4ae 100644 --- a/.cspell.json +++ b/.cspell.json @@ -1,20 +1,26 @@ { "ignorePaths": [ + ".golangci.yaml", // Configuration file with a lot of Go specific words "go.mod", // This file is managed by Go "go.sum", // This file is managed by Go "LICENSE" // This file was automatically generated by Gitea ], "words": [ + "aireone", "buildx", "distroless", "Gitea", "gocron", "golangci", "hadolint", + "healthcheckers", "labtime", "nonroot", "promhttp", + "prommonitors", + "proxied", "sigchan", - "woodpeckerci" + "woodpeckerci", + "yamlconfig" ] } diff --git a/.golangci.yaml b/.golangci.yaml index b4d5a12..5a8a76e 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,7 +1,50 @@ --- -run: - timeout: 5m - # this settings is for the CI pipeline because it fails with the default value - # we should have used the --timeout flag in the CI pipeline - # but to make the linter work locally, I need to have a config file - # so I pushed this config file until we have something to do here +linters: + enable: + - asasalint + - bodyclose + - contextcheck + - copyloopvar + - depguard + - durationcheck + - errcheck + - errname + - errorlint + - gocritic + - godot + - gofumpt + - goimports + - gosec + - gosimple + - govet + - ineffassign + - misspell + - nilerr + - nilnil + - noctx + - nolintlint + - prealloc + - predeclared + - promlinter + - reassign + - revive + - staticcheck + - tenv + - testableexamples + - thelper + - tparallel + - typecheck + - unconvert + - unused + - unparam + - usestdlibvars + - wastedassign +linters-settings: + depguard: + rules: + main: + list-mode: lax + allow: [aireone.xyz/labtime] # It's mendatory to have at least one package in allow or deny list + errcheck: + check-type-assertions: true + check-blank: true diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..0207fed --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,16 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Launch Package", + "type": "go", + "request": "launch", + "mode": "auto", + "program": "${workspaceFolder}/cmd/labtime/main.go", + "args": ["-config", "../../configs/example-config.yaml"] + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index 9d304f4..b81aff7 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,11 +1,8 @@ { - "[go]": { - "editor.codeActionsOnSave": { - // "source.organizeImports": "always" - }, - "editor.formatOnSave": true - }, - "go.formatTool": "goimports", - "go.lintTool": "golangci-lint" - // "go.lintFlags": ["--fast"] // We only have the default linters and it seems they are not marked as fast, but it's fast enough for me + "go.lintTool": "golangci-lint", + "go.lintFlags": ["--fast"], + "go.useLanguageServer": true, + "gopls": { + "formatting.gofumpt": true + } } diff --git a/cmd/labtime/main.go b/cmd/labtime/main.go new file mode 100644 index 0000000..30d787d --- /dev/null +++ b/cmd/labtime/main.go @@ -0,0 +1,26 @@ +package main + +import ( + "log" + "os" + + "aireone.xyz/labtime/internal/apps/labtime" +) + +const ( + loggerPrefix = "main:" +) + +func main() { + logger := log.New(os.Stdout, loggerPrefix, log.LstdFlags|log.Lshortfile) + cfg := labtime.LoadFlag() + + app, err := labtime.NewApp(cfg, logger) + if err != nil { + logger.Fatalf("Error creating app: %v", err) + } + + if err := app.Start(); err != nil { + logger.Fatalf("Error starting app: %v", err) + } +} diff --git a/config/config.yaml b/configs/example-config.yaml similarity index 71% rename from config/config.yaml rename to configs/example-config.yaml index 5c769d4..d782a63 100644 --- a/config/config.yaml +++ b/configs/example-config.yaml @@ -4,4 +4,4 @@ targets: url: https://aireone.xyz interval: 2 - name: Gitea - url: https://gitea.aireone.xyz \ No newline at end of file + url: https://gitea.aireone.xyz diff --git a/go.mod b/go.mod index c62554a..a4c6370 100644 --- a/go.mod +++ b/go.mod @@ -15,6 +15,7 @@ require ( github.com/jonboulle/clockwork v0.4.0 // indirect github.com/klauspost/compress v1.17.9 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.55.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect diff --git a/go.sum b/go.sum index bd00398..7df523f 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2 github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= 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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= diff --git a/internal/apps/labtime/app.go b/internal/apps/labtime/app.go new file mode 100644 index 0000000..2a0a8f4 --- /dev/null +++ b/internal/apps/labtime/app.go @@ -0,0 +1,107 @@ +package labtime + +import ( + "context" + "log" + "net/http" + "os" + "time" + + "aireone.xyz/labtime/internal/monitors" + "aireone.xyz/labtime/internal/scheduler" + "aireone.xyz/labtime/internal/yamlconfig" + "github.com/pkg/errors" + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" +) + +type App struct { + scheduler *scheduler.Scheduler + prometheusHTTPServer *http.Server + + logger *log.Logger +} + +func NewApp(flag *FlagConfig, logger *log.Logger) (*App, error) { + config, err := loadYamlConfig(flag.configFile) + if err != nil { + return nil, errors.Wrap(err, "error loading yaml config") + } + + scheduler, err := createScheduler(config, logger) + if err != nil { + return nil, errors.Wrap(err, "error creating scheduler") + } + + return &App{ + logger: logger, + scheduler: scheduler, + prometheusHTTPServer: &http.Server{ + Addr: ":2112", + ReadTimeout: 5 * time.Second, + WriteTimeout: 10 * time.Second, + IdleTimeout: 15 * time.Second, + }, + }, nil +} + +func loadYamlConfig(configFile string) (*yamlconfig.YamlConfig, error) { + file, err := os.Open(configFile) + if err != nil { + return nil, errors.Wrap(err, "error opening config file") + } + + defer file.Close() + + return yamlconfig.NewYamlConfig(file) +} + +func createScheduler(config *yamlconfig.YamlConfig, logger *log.Logger) (*scheduler.Scheduler, error) { + scheduler, err := scheduler.NewScheduler(logger) + if err != nil { + return nil, errors.Wrap(err, "error creating scheduler") + } + + httpMonitor := prometheus.NewGaugeVec(prometheus.GaugeOpts{ + Name: "labtime_response_time_duration", + Help: "The ping time.", + }, []string{"target_name"}) + prometheus.MustRegister(httpMonitor) + + for _, t := range config.Targets { + if err := scheduler.AddJob(&monitors.HTTPMonitor{ + Label: t.Name, + URL: t.URL, + Logger: logger, + ResponseTimeMonitor: httpMonitor, + }, t.Interval); err != nil { + return nil, errors.Wrap(err, "error adding job") + } + } + + return scheduler, nil +} + +func (a *App) Start() error { + a.scheduler.Start() + + // Serve Prometheus metrics + http.Handle("/metrics", promhttp.Handler()) + if err := a.prometheusHTTPServer.ListenAndServe(); err != nil && err != http.ErrServerClosed { + return errors.Wrap(err, "error starting prometheus http server") + } + + return nil +} + +func (a *App) Shutdown() error { + if err := a.scheduler.Shutdown(); err != nil { + return errors.Wrap(err, "error shutting down scheduler") + } + + if err := a.prometheusHTTPServer.Shutdown(context.TODO()); err != nil { + return errors.Wrap(err, "error shutting down prometheus http server") + } + + return nil +} diff --git a/internal/apps/labtime/flag.go b/internal/apps/labtime/flag.go new file mode 100644 index 0000000..8468d2e --- /dev/null +++ b/internal/apps/labtime/flag.go @@ -0,0 +1,18 @@ +package labtime + +import "flag" + +const ( + defaultConfigFile = "config.yaml" +) + +type FlagConfig struct { + configFile string +} + +func LoadFlag() *FlagConfig { + cfg := FlagConfig{} + flag.StringVar(&cfg.configFile, "config", defaultConfigFile, "Path to the configuration file") + flag.Parse() + return &cfg +} diff --git a/internal/http/middlewares.go b/internal/http/middlewares.go new file mode 100644 index 0000000..1d23354 --- /dev/null +++ b/internal/http/middlewares.go @@ -0,0 +1,33 @@ +package http + +import ( + "log" + "net/http" +) + +type RoundTripperMiddleware struct { + Proxied http.RoundTripper + + OnBefore func(req *http.Request) + OnAfter func(res *http.Response) +} + +func (m RoundTripperMiddleware) RoundTrip(req *http.Request) (res *http.Response, err error) { + m.OnBefore(req) + res, err = m.Proxied.RoundTrip(req) + m.OnAfter(res) + + return res, err +} + +func NewLoggerMiddleware(logger *log.Logger, proxied http.RoundTripper) *RoundTripperMiddleware { + return &RoundTripperMiddleware{ + Proxied: proxied, + OnBefore: func(req *http.Request) { + logger.Printf("Request: %s %s", req.Method, req.URL.String()) + }, + OnAfter: func(res *http.Response) { + logger.Printf("Response: %d", res.StatusCode) + }, + } +} diff --git a/internal/monitors/httpmonitor.go b/internal/monitors/httpmonitor.go new file mode 100644 index 0000000..f5506ef --- /dev/null +++ b/internal/monitors/httpmonitor.go @@ -0,0 +1,88 @@ +package monitors + +import ( + "context" + "fmt" + "log" + "net/http" + "time" + + aireoneHttp "aireone.xyz/labtime/internal/http" + "github.com/pkg/errors" + "github.com/prometheus/client_golang/prometheus" +) + +var ErrInvalidStatusCode = errors.New("expected status code 200") + +type HTTPMonitor struct { + Label string + URL string + + Logger *log.Logger + + ResponseTimeMonitor *prometheus.GaugeVec +} + +func (h *HTTPMonitor) ID() string { + return h.Label +} + +func (h *HTTPMonitor) Run() error { + d, err := h.httpHealthCheck() + if err != nil { + return errors.Wrap(err, "error running http health check") + } + + h.pushToPrometheus(d) + + return nil +} + +func newHTTPDurationMiddleware(duration *time.Duration, proxied http.RoundTripper) *aireoneHttp.RoundTripperMiddleware { + var t time.Time + + return &aireoneHttp.RoundTripperMiddleware{ + Proxied: proxied, + OnBefore: func(_ *http.Request) { + t = time.Now() + }, + OnAfter: func(_ *http.Response) { + *duration = time.Since(t) + }, + } +} + +type HTTPHealthCheckerData struct { + Duration time.Duration +} + +func (h *HTTPMonitor) httpHealthCheck() (*HTTPHealthCheckerData, error) { + r, err := http.NewRequest(http.MethodHead, h.URL, http.NoBody) + if err != nil { + return nil, errors.Wrap(err, "error creating http request") + } + req := r.WithContext(context.TODO()) + + var duration time.Duration + client := &http.Client{ + Transport: aireoneHttp.NewLoggerMiddleware(h.Logger, newHTTPDurationMiddleware(&duration, http.DefaultTransport)), + } + resp, err := client.Do(req) + if err != nil { + return nil, err + } + defer resp.Body.Close() + + if resp.StatusCode != http.StatusOK { + return nil, errors.Wrap(ErrInvalidStatusCode, fmt.Sprintf("got status code %d", resp.StatusCode)) + } + + return &HTTPHealthCheckerData{ + Duration: duration, + }, nil +} + +func (h *HTTPMonitor) pushToPrometheus(d *HTTPHealthCheckerData) { + h.Logger.Printf("Push metrics to Prometheus: Response time for %s: %v", h.Label, d.Duration.Seconds()) + h.ResponseTimeMonitor.With(prometheus.Labels{"target_name": h.Label}).Set(d.Duration.Seconds()) +} diff --git a/internal/monitors/monitor.go b/internal/monitors/monitor.go new file mode 100644 index 0000000..38e4232 --- /dev/null +++ b/internal/monitors/monitor.go @@ -0,0 +1,6 @@ +package monitors + +type Monitor interface { + ID() string + Run() error +} diff --git a/internal/scheduler/scheduler.go b/internal/scheduler/scheduler.go new file mode 100644 index 0000000..1cfb24e --- /dev/null +++ b/internal/scheduler/scheduler.go @@ -0,0 +1,60 @@ +package scheduler + +import ( + "log" + "time" + + "aireone.xyz/labtime/internal/monitors" + "github.com/go-co-op/gocron/v2" + "github.com/pkg/errors" +) + +type Scheduler struct { + scheduler gocron.Scheduler + + logger *log.Logger +} + +func NewScheduler(logger *log.Logger) (*Scheduler, error) { + s, err := gocron.NewScheduler() + if err != nil { + return nil, errors.Wrap(err, "error creating scheduler") + } + + return &Scheduler{ + scheduler: s, + logger: logger, + }, nil +} + +func (s *Scheduler) AddJob(m monitors.Monitor, interval int) error { + j, err := s.scheduler.NewJob( + gocron.DurationJob(time.Duration(interval)*time.Second), + gocron.NewTask(func() { + s.logger.Printf("Running job for HTTP monitor %s\n", m.ID()) + if err := m.Run(); err != nil { + s.logger.Printf("Error running job for HTTP monitor %s: %s\n", m.ID(), err) + } + s.logger.Printf("Job finished for HTTP monitor %s\n", m.ID()) + }), + ) + if err != nil { + return errors.Wrap(err, "error creating job") + } + + s.logger.Printf("Job started for HTTP monitor %s with ID: %s\n", m.ID(), j.ID().String()) + + return nil +} + +func (s *Scheduler) Start() { + s.scheduler.Start() +} + +func (s *Scheduler) Shutdown() error { + if err := s.scheduler.Shutdown(); err != nil { + return errors.Wrap(err, "error shutting down scheduler") + } + + return nil +} diff --git a/internal/yamlconfig/yamlconfig.go b/internal/yamlconfig/yamlconfig.go new file mode 100644 index 0000000..2be324f --- /dev/null +++ b/internal/yamlconfig/yamlconfig.go @@ -0,0 +1,45 @@ +package yamlconfig + +import ( + "io" + + "github.com/pkg/errors" + "gopkg.in/yaml.v3" +) + +var ErrYAMLDecode = errors.New("error decoding YAML file") + +type YamlConfig struct { + // List of targets to ping. + Targets []struct { + // Name of the target. Used to identify the target from Prometheus. + Name string `yaml:"name"` + // URL of the target. The target should be accessible from the machine running the exporter. + // The URL should contain the protocol (http:// or https://) and the port if it's not the default one. + URL string `yaml:"url"` + // Interval to ping the target. Default is 5 seconds. + Interval int `yaml:"interval,omitempty"` + } `yaml:"targets"` +} + +func NewYamlConfig(r io.Reader) (*YamlConfig, error) { + d := yaml.NewDecoder(r) + config := &YamlConfig{} + + if err := d.Decode(&config); err != nil { + return nil, errors.Wrap(ErrYAMLDecode, err.Error()) + } + + applyDefault(config) + + return config, nil +} + +func applyDefault(config *YamlConfig) { + // Set default interval to 5 seconds if not provided + for i := range config.Targets { + if config.Targets[i].Interval == 0 { + config.Targets[i].Interval = 5 + } + } +} diff --git a/main.go b/main.go deleted file mode 100644 index d844ae6..0000000 --- a/main.go +++ /dev/null @@ -1,182 +0,0 @@ -package main - -import ( - "crypto/tls" - "fmt" - "log" - "net/http" - "net/http/httptrace" - "os" - "os/signal" - "time" - - "github.com/go-co-op/gocron/v2" - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promhttp" - "gopkg.in/yaml.v3" -) - -type Config struct { - // List of targets to ping - Targets []struct { - // Name of the target. Used to identify the target from Prometheus. - Name string `yaml:"name"` - // URL of the target. The target should be accessible from the machine running the exporter. - // The URL should contain the protocol (http:// or https://) and the port if it's not the default one. - Url string `yaml:"url"` - // Interval to ping the target. Default is 5 seconds - Interval int `yaml:"interval,omitempty"` - } `yaml:"targets"` -} - -func NewConfig(configPath string) (*Config, error) { - // Create config structure - config := &Config{} - - // Open config file - file, err := os.Open(configPath) - if err != nil { - return nil, err - } - defer file.Close() - - // Init new YAML decode - d := yaml.NewDecoder(file) - - // Start YAML decoding from file - if err := d.Decode(&config); err != nil { - return nil, err - } - - return config, nil -} - -func Ping(url string) (int, time.Duration, error) { - req, err := http.NewRequest(http.MethodHead, url, nil) - if err != nil { - return 0, 0, err - } - - var start, connect, dns, tlsHandshake time.Time - - trace := &httptrace.ClientTrace{ - DNSStart: func(dsi httptrace.DNSStartInfo) { dns = time.Now() }, - DNSDone: func(ddi httptrace.DNSDoneInfo) { - fmt.Printf("DNS Done: %v\n", time.Since(dns)) - }, - - TLSHandshakeStart: func() { tlsHandshake = time.Now() }, - TLSHandshakeDone: func(cs tls.ConnectionState, err error) { - fmt.Printf("TLS Handshake: %v\n", time.Since(tlsHandshake)) - }, - - ConnectStart: func(network, addr string) { connect = time.Now() }, - ConnectDone: func(network, addr string, err error) { - fmt.Printf("Connect time: %v\n", time.Since(connect)) - }, - - GotFirstResponseByte: func() { - fmt.Printf("Time from start to first byte: %v\n", time.Since(start)) - }, - } - - req = req.WithContext(httptrace.WithClientTrace(req.Context(), trace)) - start = time.Now() - - resp, err := http.DefaultTransport.RoundTrip(req) - if err != nil { - return 0, 0, err - } - - defer resp.Body.Close() - - return resp.StatusCode, time.Since(start), nil -} - -func main() { - // Load config - // TODO: Use a flag to specify the config file - config, err := NewConfig("config/config.yaml") - if err != nil { - log.Fatalf("Error loading config: %s", err) - } - // Print config - fmt.Printf("%+v\n", config) - - // create a scheduler - s, err := gocron.NewScheduler() - if err != nil { - log.Fatalf("Error creating the scheduler: %s",err) - } - - // Prometheus metrics - responseTimeMonitor := prometheus.NewGaugeVec(prometheus.GaugeOpts{ - Name: "labtime_response_time_duration", - Help: "The ping time.", - }, []string{"target_name"}) - prometheus.MustRegister(responseTimeMonitor) - - // Intercept the signal to stop the program - go func() { - sigchan := make(chan os.Signal, 1) - signal.Notify(sigchan, os.Interrupt) - <-sigchan - log.Println("Program killed !") - - // do last actions and wait for all write operations to end - - // when you're done, shut it down - err = s.Shutdown() - if err != nil { - log.Fatalf("Error shutting down scheduler: %s", err) - } - - os.Exit(0) - }() - - // add a job to the scheduler - for _, target := range config.Targets { - j, err := s.NewJob( - gocron.DurationJob( - func(interval int) time.Duration { - if interval == 0 { - const defaultInterval = 5 - - return time.Duration(defaultInterval) * time.Second - } - - return time.Duration(interval) * time.Second - }(target.Interval), - ), - gocron.NewTask( - func(url string) { - status, elapsedTime, err := Ping(url) - if err != nil { - fmt.Println(err) - - return - } - - fmt.Printf("%s - Status: %d in %v\n", target.Name, status, elapsedTime.Seconds()) - // push to Prometheus - responseTimeMonitor.With(prometheus.Labels{"target_name": target.Name}).Set(elapsedTime.Seconds()) - }, - target.Url, - ), - ) - if err != nil { - log.Fatalf("Error creating job: %s", err) - } - // each job has a unique id - fmt.Printf("Job %s started with ID: %s\n", target.Name, j.ID().String()) - } - - // start the scheduler - s.Start() - - // Serve Prometheus metrics - http.Handle("/metrics", promhttp.Handler()) - if err := http.ListenAndServe(":2112", nil); err != nil { - log.Fatalf("Error starting server: %s", err) - } -} -- 2.40.1 From 17160e38cffb3dd21ffbec0cdc58154442dc2457 Mon Sep 17 00:00:00 2001 From: Aire-One Date: Mon, 23 Sep 2024 03:54:23 +0200 Subject: [PATCH 2/5] fix: docker build --- .dockerignore | 7 +++++++ Dockerfile | 10 +++++----- configs/example-stack/README.md | 1 + compose.yml => configs/example-stack/compose.yaml | 6 +++--- .../example-stack/prometheus-data/prometheus.yaml | 0 5 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 .dockerignore create mode 100644 configs/example-stack/README.md rename compose.yml => configs/example-stack/compose.yaml (60%) rename prometheus.yml => configs/example-stack/prometheus-data/prometheus.yaml (100%) diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..92da7f2 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,7 @@ +.vscode +.woodpecker + +configs + +.* +renovate.json diff --git a/Dockerfile b/Dockerfile index 37fb561..96ebac8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,11 @@ FROM golang:1.23.1 AS builder WORKDIR /app -COPY go.mod go.sum main.go ./ +COPY go.mod go.sum ./ RUN go mod download -RUN go build + +COPY . . +RUN go build -o labtime cmd/labtime/main.go FROM gcr.io/distroless/base-debian12 @@ -14,12 +16,10 @@ WORKDIR / COPY --from=builder /app/labtime /labtime -# This is the port currently hardcoded in the application EXPOSE 2112 -# For now the config file path/name are hardcoded in the application VOLUME ["/config"] USER nonroot:nonroot -ENTRYPOINT ["/labtime"] \ No newline at end of file +ENTRYPOINT ["/labtime"] diff --git a/configs/example-stack/README.md b/configs/example-stack/README.md new file mode 100644 index 0000000..d5b31c2 --- /dev/null +++ b/configs/example-stack/README.md @@ -0,0 +1 @@ +This is a docker compose stack example to run Prometheus with Grafana to play with the Labtime metrics. diff --git a/compose.yml b/configs/example-stack/compose.yaml similarity index 60% rename from compose.yml rename to configs/example-stack/compose.yaml index d7e315b..89ceb2f 100644 --- a/compose.yml +++ b/configs/example-stack/compose.yaml @@ -5,12 +5,12 @@ services: ports: - 9090:9090 volumes: - - ./prometheus.yml:/etc/prometheus/prometheus.yml + - prometheus-data/prometheus.yaml:/etc/prometheus/prometheus.yaml command: - - '--config.file=/etc/prometheus/prometheus.yml' + - '--config.file=/etc/prometheus/prometheus.yaml' extra_hosts: - "host.docker.internal:host-gateway" grafana: image: grafana/grafana ports: - - 3000:3000 \ No newline at end of file + - 3000:3000 diff --git a/prometheus.yml b/configs/example-stack/prometheus-data/prometheus.yaml similarity index 100% rename from prometheus.yml rename to configs/example-stack/prometheus-data/prometheus.yaml -- 2.40.1 From f085f66d6621b9451f5a1cf2fd97a9008484937f Mon Sep 17 00:00:00 2001 From: Aire-One Date: Mon, 23 Sep 2024 23:46:12 +0200 Subject: [PATCH 3/5] feat: initialize tests --- .woodpecker/test.yaml | 9 ++++++ internal/apps/labtime/app_test.go | 31 ++++++++++++++++++ internal/apps/labtime/flag_test.go | 45 +++++++++++++++++++++++++++ internal/monitors/httpmonitor_test.go | 16 ++++++++++ 4 files changed, 101 insertions(+) create mode 100644 .woodpecker/test.yaml create mode 100644 internal/apps/labtime/app_test.go create mode 100644 internal/apps/labtime/flag_test.go create mode 100644 internal/monitors/httpmonitor_test.go diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml new file mode 100644 index 0000000..a0a7509 --- /dev/null +++ b/.woodpecker/test.yaml @@ -0,0 +1,9 @@ +--- +when: + event: pull_request + +steps: + golang: + image: golang:1.23.1 + commands: + - go test -v ./... diff --git a/internal/apps/labtime/app_test.go b/internal/apps/labtime/app_test.go new file mode 100644 index 0000000..52f5708 --- /dev/null +++ b/internal/apps/labtime/app_test.go @@ -0,0 +1,31 @@ +package labtime + +import ( + "log" + "os" + "testing" +) + +func TestNewApp(t *testing.T) { + flag := &FlagConfig{ + configFile: "../../../configs/example-config.yaml", // we shouldn't rely on the actual file + } + logger := log.New(os.Stdout, "", 0) // silent? + + app, err := NewApp(flag, logger) + if err != nil { + t.Fatalf("unexpected error: %v", err) + } + + if app.logger != logger { + t.Errorf("expected logger to be set") + } + + if app.scheduler == nil { + t.Errorf("expected scheduler to be initialized") + } + + if app.prometheusHTTPServer == nil { + t.Errorf("expected prometheusHTTPServer to be initialized") + } +} diff --git a/internal/apps/labtime/flag_test.go b/internal/apps/labtime/flag_test.go new file mode 100644 index 0000000..9e73848 --- /dev/null +++ b/internal/apps/labtime/flag_test.go @@ -0,0 +1,45 @@ +package labtime + +import ( + "flag" + "os" + "testing" +) + +func TestLoadFlag(t *testing.T) { + tests := []struct { + name string + args []string + expectedFile string + }{ + { + name: "No flag provided", + args: []string{}, + expectedFile: defaultConfigFile, + }, + { + name: "Flag provided", + args: []string{"-config", "custom.yaml"}, + expectedFile: "custom.yaml", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + // Save and restore the original os.Args + oldArgs := os.Args + defer func() { os.Args = oldArgs }() + + // Make sure we are using a clean flag set + flag.CommandLine = flag.NewFlagSet(os.Args[0], flag.ExitOnError) + + os.Args = append([]string{"cmd"}, tt.args...) + + cfg := LoadFlag() + + if cfg.configFile != tt.expectedFile { + t.Errorf("got %s, want %s", cfg.configFile, tt.expectedFile) + } + }) + } +} diff --git a/internal/monitors/httpmonitor_test.go b/internal/monitors/httpmonitor_test.go new file mode 100644 index 0000000..c89e925 --- /dev/null +++ b/internal/monitors/httpmonitor_test.go @@ -0,0 +1,16 @@ +package monitors + +import "testing" + +func TestHTTPMonitor_ID(t *testing.T) { + monitor := &HTTPMonitor{ + Label: "example", + } + + expectedID := "example" + actualID := monitor.ID() + + if actualID != expectedID { + t.Errorf("expected ID to be %s, but got %s", expectedID, actualID) + } +} -- 2.40.1 From 176926f864f2e16ab333289ea76dbf15d03d7dd3 Mon Sep 17 00:00:00 2001 From: Aire-One Date: Mon, 23 Sep 2024 23:46:32 +0200 Subject: [PATCH 4/5] feat: add Makefile --- .dockerignore | 2 ++ .gitignore | 1 + Makefile | 24 ++++++++++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 .gitignore create mode 100644 Makefile diff --git a/.dockerignore b/.dockerignore index 92da7f2..502342e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,8 @@ .vscode .woodpecker +build + configs .* diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..9435e5c --- /dev/null +++ b/Makefile @@ -0,0 +1,24 @@ +BINARY_NAME=labtime + +.PHONY: all +all: lint test build + +.PHONY: clean +clean: + go clean -i ./... + rm -rf build + +.PHONY: lint +lint: + @echo "Running golangci-lint" + golangci-lint run + +.PHONY: test +test: + @echo "Running tests" + go test -v ./... + +.PHONY: build +build: + @echo "Building binary" + go build -o build/$(BINARY_NAME) cmd/labtime/main.go -- 2.40.1 From d6f6274a643a4a1a873f6fa93260269ba22d210d Mon Sep 17 00:00:00 2001 From: Aire-One Date: Mon, 23 Sep 2024 23:46:51 +0200 Subject: [PATCH 5/5] chore: update editorconfig --- .editorconfig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 2791264..d7899ec 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,8 +8,14 @@ indent_style = space indent_size = 4 end_of_line = lf charset = utf-8 -trim_trailing_whitespace = false +trim_trailing_whitespace = true insert_final_newline = true [*.{json,yaml}] indent_size = 2 + +[*.go] +indent_style = tab + +[Makefile] +indent_style = tab -- 2.40.1