provide a way to run app

internal/api/http/handlerbuilder.go

@@ -0,0 +1,42 @@
+package http
+
+import (
+	"log/slog"
+	"net/http"
+	"net/http/pprof"
+
+	"git.loyso.art/frx/devsim/internal/store"
+)
+
+type handlersBuilder struct {
+	mux *http.ServeMux
+}
+
+func NewHandlersBuilder() *handlersBuilder {
+	return &handlersBuilder{
+		mux: http.NewServeMux(),
+	}
+}
+
+// MountStatsHandlers mounts stats related handlers.
+func (h *handlersBuilder) MountStatsHandlers(sr store.Stats, log *slog.Logger) {
+	log = log.With(slog.String("api", "http"))
+
+	mws := multipleMiddlewares(
+		middlewarePanicRecovery(log),
+		middlewareLogger(log),
+	)
+
+	h.mux.Handle("/api/v1/stats/", mws(listStatsHandler(sr)))
+	h.mux.Handle("/api/v1/stats/{id}", mws(postStatsHandler(sr)))
+}
+
+func (s *handlersBuilder) MountProfileHandlers() {
+	s.mux.HandleFunc("/debug/pprof", pprof.Index)
+	s.mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
+	s.mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
+}
+
+func (s *handlersBuilder) Build() http.Handler {
+	return s.mux
+}

internal/api/http/middlewares.go

@@ -0,0 +1,76 @@
+package http
+
+import (
+	"log/slog"
+	"net/http"
+	"time"
+)
+
+type middlewareFunc func(http.Handler) http.Handler
+
+func middlewarePanicRecovery(log *slog.Logger) middlewareFunc {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			defer func() {
+				rec := recover()
+				if rec == nil {
+					return
+				}
+
+				log.ErrorContext(
+					r.Context(), "panic acquired during request",
+					slog.Any("panic", rec),
+				)
+			}()
+
+			next.ServeHTTP(w, r)
+		})
+	}
+}
+
+func middlewareLogger(log *slog.Logger) middlewareFunc {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			start := time.Now()
+
+			requestID := r.Header.Get("x-request-id")
+			if requestID == "" {
+				requestID = randomID()
+			}
+
+			w.Header().Set("x-request-id", requestID)
+
+			method := r.Method
+			path := r.URL.Path
+			query := r.URL.Query().Encode()
+
+			log.InfoContext(
+				r.Context(), "request processing",
+				slog.String("request_id", requestID),
+				slog.String("method", method),
+				slog.String("path", path),
+				slog.String("query", query),
+			)
+
+			next.ServeHTTP(w, r)
+
+			elapsed := time.Since(start)
+			log.InfoContext(
+				r.Context(), "request finished",
+				slog.Duration("elapsed", elapsed.Truncate(time.Millisecond)),
+			)
+		})
+	}
+}
+
+func multipleMiddlewares(mws ...middlewareFunc) middlewareFunc {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			for _, mw := range mws {
+				next = mw(next)
+			}
+
+			next.ServeHTTP(w, r)
+		})
+	}
+}

internal/api/http/server.go

@@ -1,188 +1,55 @@
 package http
 
 import (
-	"encoding/json"
-	"fmt"
-	"log/slog"
+	"context"
+	"crypto/rand"
+	"encoding/hex"
+	"errors"
 	"net/http"
-	"net/http/pprof"
 	"time"
-
-	"git.loyso.art/frx/devsim/internal/entities"
-	"git.loyso.art/frx/devsim/internal/store"
 )
 
-type handlersBuilder struct {
-	mux *http.ServeMux
+type Server struct {
+	srv *http.Server
 }
 
-func NewHandlersBuilder() *handlersBuilder {
-	return &handlersBuilder{
-		mux: http.NewServeMux(),
+func NewServer(addr string) *Server {
+	srv := http.Server{
+		ReadTimeout:       time.Second * 3,
+		WriteTimeout:      time.Second * 3,
+		IdleTimeout:       time.Second * 2,
+		ReadHeaderTimeout: time.Second * 3,
+		Addr:              addr,
+	}
+
+	return &Server{
+		srv: &srv,
 	}
 }
 
-// MountStatsHandlers mounts stats related handlers.
-func (h *handlersBuilder) MountStatsHandlers(sr store.Stats, log *slog.Logger) {
-	log = log.With(slog.String("api", "http"))
-
-	mws := multipleMiddlewares(
-		middlewarePanicRecovery(log),
-		middlewareLogger(log),
-	)
-
-	h.mux.Handle("/api/v1/stats/", mws(listStatsHandler(sr)))
-	h.mux.Handle("/api/v1/stats/{id}", mws(postStatsHandler(sr)))
+func (s *Server) RegisterHandler(h http.Handler) {
+	s.srv.Handler = h
 }
 
-func (s *handlersBuilder) MountProfileHandlers() {
-	s.mux.HandleFunc("/debug/pprof", pprof.Index)
-	s.mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
-	s.mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
-}
-
-func (s *handlersBuilder) Build() http.Handler {
-	return s.mux
-}
-
-// ListenAndServe runs server to accept incoming connections. This function blocks on
-// handling connections.
-func listStatsHandler(sr store.Stats) http.HandlerFunc {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodGet {
-			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
-			return
-		}
-
-		stats, err := sr.List(r.Context())
-		if err != nil {
-			http.Error(w, fmt.Errorf("listing stats: %w", err).Error(), http.StatusInternalServerError)
-			return
-		}
-
-		w.Header().Set("content-type", "application/json")
-		err = json.NewEncoder(w).Encode(stats)
-		if err != nil {
-			http.Error(w, fmt.Errorf("encoding payload: %w", err).Error(), http.StatusInternalServerError)
-		}
-	})
-}
-
-func postStatsHandler(sr store.Stats) http.HandlerFunc {
-	type request struct {
-		IncomingTraffic int `json:"incoming_traffic"`
-		OutgoingTraffic int `json:"outgoing_traffic"`
-		IncomingRPS     int `json:"incoming_rps"`
-		ReadRPS         int `json:"read_rps"`
-		WriteRPS        int `json:"write_rps"`
+func (s *Server) Run() error {
+	err := s.srv.ListenAndServe()
+	if errors.Is(err, http.ErrServerClosed) {
+		return nil
 	}
 
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != http.MethodPost {
-			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
-			return
-		}
-
-		id := r.PathValue("id")
-		if id == "" {
-			http.Error(w, "no id provided", http.StatusBadRequest)
-			return
-		}
-
-		var reqbody request
-		err := json.NewDecoder(r.Body).Decode(&reqbody)
-		if err != nil {
-			http.Error(w, fmt.Errorf("decoding body: %w", err).Error(), http.StatusBadRequest)
-			return
-		}
-
-		ctx := r.Context()
-		err = sr.Upsert(ctx, entities.DeviceStatistics{
-			ID:                   entities.DeviceID(id),
-			IncomingTrafficBytes: reqbody.IncomingTraffic,
-			OutgoingTrafficBytes: reqbody.OutgoingTraffic,
-			IncomingRPS:          reqbody.IncomingRPS,
-			ReadRPS:              reqbody.ReadRPS,
-			WriteRPS:             reqbody.WriteRPS,
-		})
-		if err != nil {
-			http.Error(w, fmt.Errorf("upserting stat metric: %w", err).Error(), http.StatusInternalServerError)
-			return
-		}
-
-		w.WriteHeader(http.StatusOK)
-	})
+	return err
 }
 
-type middlewareFunc func(http.Handler) http.Handler
+func (s *Server) Close() error {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
+	defer cancel()
 
-func middlewarePanicRecovery(log *slog.Logger) middlewareFunc {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			defer func() {
-				rec := recover()
-				if rec == nil {
-					return
-				}
-
-				log.ErrorContext(
-					r.Context(), "panic acquired during request",
-					slog.Any("panic", rec),
-				)
-			}()
-
-			next.ServeHTTP(w, r)
-		})
-	}
-}
-
-func middlewareLogger(log *slog.Logger) middlewareFunc {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			start := time.Now()
-
-			requestID := r.Header.Get("x-request-id")
-			if requestID == "" {
-				requestID = randomID()
-			}
-
-			w.Header().Set("x-request-id", requestID)
-
-			method := r.Method
-			path := r.URL.Path
-			query := r.URL.Query().Encode()
-
-			log.InfoContext(
-				r.Context(), "request processing",
-				slog.String("request_id", requestID),
-				slog.String("method", method),
-				slog.String("path", path),
-				slog.String("query", query),
-			)
-
-			next.ServeHTTP(w, r)
-
-			elapsed := time.Since(start)
-			log.InfoContext(
-				r.Context(), "request finished",
-				slog.Duration("elapsed", elapsed.Truncate(time.Millisecond)),
-			)
-		})
-	}
-}
-
-func multipleMiddlewares(mws ...middlewareFunc) middlewareFunc {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			for _, mw := range mws {
-				next = mw(next)
-			}
-
-			next.ServeHTTP(w, r)
-		})
-	}
+	return s.srv.Shutdown(ctx)
 }
 
 func randomID() string {
-	return ""
+	var randombuffer [4]byte
+	_, _ = rand.Read(randombuffer[:])
+
+	return hex.EncodeToString(randombuffer[:])
 }

internal/api/http/server_test.go

@@ -22,7 +22,7 @@ func prepareEssentials(t testing.TB) (*mock.MockedStore, *slog.Logger) {
 	return mock.NewMock(), log
 }
 
-func TestList(t *testing.T) {
+func TestListSuccess(t *testing.T) {
 	require := require.New(t)
 	store, log := prepareEssentials(t)
 
@@ -63,7 +63,7 @@ func TestList(t *testing.T) {
 	require.ElementsMatch(stats, expectedStatistics)
 }
 
-func TestUpsert(t *testing.T) {
+func TestUpsertSuccess(t *testing.T) {
 	require := require.New(t)
 	store, log := prepareEssentials(t)
 

internal/api/http/statshandlers.go

@@ -0,0 +1,79 @@
+package http
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"git.loyso.art/frx/devsim/internal/entities"
+	"git.loyso.art/frx/devsim/internal/store"
+)
+
+// ListenAndServe runs server to accept incoming connections. This function blocks on
+// handling connections.
+func listStatsHandler(sr store.Stats) http.HandlerFunc {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodGet {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+
+		stats, err := sr.List(r.Context())
+		if err != nil {
+			http.Error(w, fmt.Errorf("listing stats: %w", err).Error(), http.StatusInternalServerError)
+			return
+		}
+
+		w.Header().Set("content-type", "application/json")
+		err = json.NewEncoder(w).Encode(stats)
+		if err != nil {
+			http.Error(w, fmt.Errorf("encoding payload: %w", err).Error(), http.StatusInternalServerError)
+		}
+	})
+}
+
+func postStatsHandler(sr store.Stats) http.HandlerFunc {
+	type request struct {
+		IncomingTraffic int `json:"incoming_traffic"`
+		OutgoingTraffic int `json:"outgoing_traffic"`
+		IncomingRPS     int `json:"incoming_rps"`
+		ReadRPS         int `json:"read_rps"`
+		WriteRPS        int `json:"write_rps"`
+	}
+
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.Method != http.MethodPost {
+			http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+			return
+		}
+
+		id := r.PathValue("id")
+		if id == "" {
+			http.Error(w, "no id provided", http.StatusBadRequest)
+			return
+		}
+
+		var reqbody request
+		err := json.NewDecoder(r.Body).Decode(&reqbody)
+		if err != nil {
+			http.Error(w, fmt.Errorf("decoding body: %w", err).Error(), http.StatusBadRequest)
+			return
+		}
+
+		ctx := r.Context()
+		err = sr.Upsert(ctx, entities.DeviceStatistics{
+			ID:                   entities.DeviceID(id),
+			IncomingTrafficBytes: reqbody.IncomingTraffic,
+			OutgoingTrafficBytes: reqbody.OutgoingTraffic,
+			IncomingRPS:          reqbody.IncomingRPS,
+			ReadRPS:              reqbody.ReadRPS,
+			WriteRPS:             reqbody.WriteRPS,
+		})
+		if err != nil {
+			http.Error(w, fmt.Errorf("upserting stat metric: %w", err).Error(), http.StatusInternalServerError)
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
+	})
+}

internal/store/mongo/store.go

@@ -37,6 +37,13 @@ type repository struct {
 	client *mongo.Client
 }
 
+func (r *repository) Close() error {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+
+	return r.client.Disconnect(ctx)
+}
+
 func (r *repository) StatsRepository() statsRepository {
 	return statsRepository{
 		collection: r.client.Database("bench").Collection("device_stats"),

internal/store/pg/store.go

@@ -34,18 +34,23 @@ func (r *repository) StatsRepository() statsRepository {
 	}
 }
 
+func (r *repository) Close() error {
+	r.db.Close()
+	return nil
+}
+
 type statsRepository struct {
 	db *pgxpool.Pool
 }
 
 type deviceStatsDB struct {
+	UpdatedAt       time.Time
 	DeviceID        string
 	IncomingTraffic int
 	OutgoingTraffic int
 	IncomingRPS     int
 	ReadRPS         int
 	WriteRPS        int
-	UpdatedAt       time.Time
 }
 
 func (s deviceStatsDB) asDomain() entities.DeviceStatistics {