Add codestats insertion

+ rebase on main

Author: C

benchttp/service.go

@@ -1,10 +1,8 @@
 package benchttp
 
-import "github.com/benchttp/worker/stats"
-
 // InsertService defines the interface to implement by a
 // data layer facade.
 type InsertionService interface {
 	// Create stores stats in database.
-	Insert(stats.Stats, string, string, string) error
+	Insert(Stats, string, string, string) error
 }

benchttp/stats.go

@@ -13,28 +13,18 @@ type StatsDescriptor struct {
 	FinishedAt time.Time `json:"finishedAt"`
 }
 
-// Codestats represents the code stats related to a computed stats group
-type Codestats struct {
-	Code1xx int `json:"code1xx"`
-	Code2xx int `json:"code2xx"`
-	Code3xx int `json:"code3xx"`
-	Code4xx int `json:"code4xx"`
-	Code5xx int `json:"code5xx"`
-}
-
-// Timestats represents the time stats related to a computed stats group
-type Timestats struct {
-	Min               float64   `json:"min"`
-	Max               float64   `json:"max"`
-	Mean              float64   `json:"mean"`
-	Median            float64   `json:"median"`
-	StandardDeviation float64   `json:"standardDeviation"`
-	Deciles           []float64 `json:"deciles"`
-}
-
 // Stats contains StatsDescriptor, Codestats and stats.Stats of a given computed stats group
 type Stats struct {
-	Descriptor StatsDescriptor `json:"descriptor"`
-	Code       Codestats       `json:"code"`
-	Time       stats.Stats     `json:"time"`
+	Descriptor StatsDescriptor          `json:"descriptor"`
+	Code       stats.StatusDistribution `json:"code"`
+	Time       stats.Common             `json:"time"`
+}
+
+type Config struct {
+	Host     string
+	User     string
+	Password string
+	DBName   string
+	IdleConn int
+	MaxConn  int
 }

main.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/googleapis/google-cloudevents-go/cloud/firestore/v1"
 
+	"github.com/benchttp/worker/benchttp"
 	"github.com/benchttp/worker/firestoreconv"
 	"github.com/benchttp/worker/postgresql"
 	"github.com/benchttp/worker/stats"
@@ -43,17 +44,8 @@ func Digest(ctx context.Context, e firestore.DocumentEventData) error {
 	return nil
 }
 
-type Config struct {
-	Host     string
-	User     string
-	Password string
-	DBName   string
-	IdleConn int
-	MaxConn  int
-}
-
-func envConfig() (Config, error) {
-	var config Config
+func envConfig() (benchttp.Config, error) {
+	var config benchttp.Config
 
 	config.Host = os.Getenv("PSQL_HOST")
 	if config.Host == "" {

postgresql/connection.go

@@ -6,14 +6,14 @@ import (
 
 	_ "github.com/GoogleCloudPlatform/cloudsql-proxy/proxy/dialers/postgres" // blank import
 
-	"github.com/benchttp/worker"
+	"github.com/benchttp/worker/benchttp"
 )
 
 type InsertionService struct {
 	db *sql.DB
 }
 
-func NewInsertionService(config worker.Config) (InsertionService, error) {
+func NewInsertionService(config benchttp.Config) (InsertionService, error) {
 	dbURI := fmt.Sprintf("host=%s user=%s password=%s dbname=%s sslmode=disable",
 		config.Host,
 		config.User,

postgresql/stats.go

@@ -3,11 +3,11 @@ package postgresql
 import (
 	"github.com/lib/pq"
 
-	"github.com/benchttp/worker/stats"
+	"github.com/benchttp/worker/benchttp"
 )
 
 // nolint:gocognit
-func (s InsertionService) Insert(statsToStore stats.Stats, statsID, userID, tag string) error {
+func (s InsertionService) Insert(stats benchttp.Stats, statsID, userID, tag string) error {
 	tx, err := s.db.Begin()
 	if err != nil {
 		return err
@@ -59,12 +59,43 @@ func (s InsertionService) Insert(statsToStore stats.Stats, statsID, userID, tag
 
 	if _, err = insertTimestats.Exec(
 		statsID,
-		statsToStore.Min,
-		statsToStore.Max,
-		statsToStore.Mean,
-		statsToStore.Median,
-		statsToStore.StdDev,
-		pq.Array(statsToStore.Deciles),
+		stats.Time.Min,
+		stats.Time.Max,
+		stats.Time.Mean,
+		stats.Time.Median,
+		stats.Time.StdDev,
+		pq.Array(stats.Time.Deciles),
+	); err != nil {
+		if err := tx.Rollback(); err != nil {
+			return err
+		}
+		return err
+	}
+
+	insertCodestats, err := tx.Prepare(`
+	INSERT INTO codestats(
+		stats_descriptor_id,
+		code_1xx,
+		code_2xx,
+		code_3xx,
+		code_4xx,
+		code_5xx
+	) VALUES($1, $2, $3, $4, $5, $6)`)
+	if err != nil {
+		if err := tx.Rollback(); err != nil {
+			return err
+		}
+		return err
+	}
+	defer insertCodestats.Close()
+
+	if _, err = insertCodestats.Exec(
+		statsID,
+		stats.Code.Status1xx,
+		stats.Code.Status2xx,
+		stats.Code.Status3xx,
+		stats.Code.Status4xx,
+		stats.Code.Status5xx,
 	); err != nil {
 		if err := tx.Rollback(); err != nil {
 			return err