Update various dependencies

.gitignore

@@ -16,3 +16,6 @@ tmp/*
 
 # ignore goland project files
 .idea/
+
+# Un-ignore anything in the vendor directory
+!vendor/**

backend/couchdb/db.go

@@ -6,7 +6,7 @@ package couchdb
 import (
 	"context"
 
-	"github.com/caarlos0/env"
+	"github.com/caarlos0/env/v10"
 	"github.com/go-kivik/couchdb/v3"
 	kivik "github.com/go-kivik/kivik/v3"
 

backend/k8sapi/client.go

@@ -15,7 +15,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/caarlos0/env"
+	"github.com/caarlos0/env/v10"
 	"github.com/pace/bricks/http/transport"
 	"github.com/pace/bricks/maintenance/log"
 )

backend/objstore/objstore.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/caarlos0/env"
+	"github.com/caarlos0/env/v10"
 	"github.com/minio/minio-go/v7"
 	"github.com/minio/minio-go/v7/pkg/credentials"
 

backend/postgres/errors.go

@@ -8,7 +8,7 @@ import (
 	"io"
 	"net"
 
-	"github.com/go-pg/pg"
+	"github.com/go-pg/pg/v10"
 )
 
 var (

backend/postgres/errors_test.go

@@ -6,7 +6,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/go-pg/pg"
+	"github.com/go-pg/pg/v10"
 	"github.com/stretchr/testify/require"
 
 	pbpostgres "github.com/pace/bricks/backend/postgres"

backend/postgres/health_postgres.go

@@ -7,7 +7,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/go-pg/pg/orm"
+	"github.com/go-pg/pg/v10/orm"
 	"github.com/pace/bricks/maintenance/health/servicehealthcheck"
 )
 

backend/postgres/health_postgres_test.go

@@ -12,7 +12,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-pg/pg/orm"
+	"github.com/go-pg/pg/v10/orm"
 	http2 "github.com/pace/bricks/http"
 	"github.com/pace/bricks/maintenance/errors"
 	"github.com/pace/bricks/maintenance/health/servicehealthcheck"

backend/postgres/hooks.go

@@ -0,0 +1,136 @@
+package postgres
+
+import (
+	"context"
+	"math"
+	"time"
+
+	"github.com/go-pg/pg/v10"
+	"github.com/opentracing/opentracing-go"
+	olog "github.com/opentracing/opentracing-go/log"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/rs/zerolog"
+
+	"github.com/pace/bricks/maintenance/log"
+)
+
+type QueryLogger struct{}
+
+func (QueryLogger) BeforeQuery(_ context.Context, _ *pg.QueryEvent) (context.Context, error) {
+	return nil, nil
+}
+
+func (QueryLogger) AfterQuery(ctx context.Context, event *pg.QueryEvent) error {
+	q, qe := event.UnformattedQuery()
+	if qe == nil {
+		if !(cfg.LogRead || cfg.LogWrite) {
+			return nil
+		}
+		// we can only and should only perfom the following check if we have the information availaible
+		mode := determineQueryMode(string(q))
+		if mode == readMode && !cfg.LogRead {
+			return nil
+		}
+		if mode == writeMode && !cfg.LogWrite {
+			return nil
+		}
+
+	}
+
+	dur := float64(time.Since(event.StartTime)) / float64(time.Millisecond)
+
+	// check if log context is given
+	var logger *zerolog.Logger
+	if ctx != nil {
+		logger = log.Ctx(ctx)
+	} else {
+		logger = log.Logger()
+	}
+
+	// add general info
+	le := logger.Debug().
+		Float64("duration", dur).
+		Str("sentry:category", "postgres")
+
+	// add error or result set info
+	if event.Err != nil {
+		le = le.Err(event.Err)
+	} else {
+		le = le.Int("affected", event.Result.RowsAffected()).
+			Int("rows", event.Result.RowsReturned())
+	}
+
+	if qe != nil {
+		// this is only a display issue not a "real" issue
+		le.Msgf("%v", qe)
+	}
+	le.Msg(string(q))
+
+	return nil
+}
+
+type OpenTracingAdapter struct{}
+
+func (OpenTracingAdapter) BeforeQuery(_ context.Context, _ *pg.QueryEvent) (context.Context, error) {
+	return nil, nil
+}
+
+func (OpenTracingAdapter) AfterQuery(ctx context.Context, event *pg.QueryEvent) error {
+	// start span with general info
+	q, qe := event.UnformattedQuery()
+	if qe != nil {
+		// this is only a display issue not a "real" issue
+		q = []byte(qe.Error())
+	}
+
+	span, _ := opentracing.StartSpanFromContext(event.DB.Context(), "sql: "+getQueryType(string(q)),
+		opentracing.StartTime(event.StartTime))
+
+	span.SetTag("db.system", "postgres")
+
+	fields := []olog.Field{
+		olog.String("query", string(q)),
+	}
+
+	// add error or result set info
+	if event.Err != nil {
+		fields = append(fields, olog.Error(event.Err))
+	} else {
+		fields = append(fields,
+			olog.Int("affected", event.Result.RowsAffected()),
+			olog.Int("rows", event.Result.RowsReturned()))
+	}
+
+	span.LogFields(fields...)
+	span.Finish()
+
+	return nil
+}
+
+type MetricsAdapter struct {
+	opts *pg.Options
+}
+
+func (MetricsAdapter) BeforeQuery(_ context.Context, _ *pg.QueryEvent) (context.Context, error) {
+	return nil, nil
+}
+
+func (m MetricsAdapter) AfterQuery(ctx context.Context, event *pg.QueryEvent) error {
+	dur := float64(time.Since(event.StartTime)) / float64(time.Millisecond)
+	labels := prometheus.Labels{
+		"database": m.opts.Addr + "/" + m.opts.Database,
+	}
+
+	metricQueryTotal.With(labels).Inc()
+
+	if event.Err != nil {
+		metricQueryFailed.With(labels).Inc()
+	} else {
+		r := event.Result
+		metricQueryRowsTotal.With(labels).Add(float64(r.RowsReturned()))
+		metricQueryAffectedTotal.With(labels).Add(math.Max(0, float64(r.RowsAffected())))
+	}
+	metricQueryDurationSeconds.With(labels).Observe(dur)
+
+	return nil
+}

backend/postgres/metrics.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-pg/pg"
+	"github.com/go-pg/pg/v10"
 	"github.com/prometheus/client_golang/prometheus"
 )
 

backend/postgres/postgres.go

@@ -7,20 +7,16 @@ package postgres
 import (
 	"context"
 	"fmt"
-	"math"
 	"os"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/caarlos0/env"
-	"github.com/go-pg/pg"
-	"github.com/opentracing/opentracing-go"
-	olog "github.com/opentracing/opentracing-go/log"
+	"github.com/caarlos0/env/v10"
+	"github.com/go-pg/pg/v10"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/rs/zerolog"
 
 	"github.com/pace/bricks/maintenance/health/servicehealthcheck"
 	"github.com/pace/bricks/maintenance/log"
@@ -224,7 +220,8 @@ func ConnectionPool(opts ...ConfigOption) *pg.DB {
 //
 // Fot a health check for this connection a PgHealthCheck needs to
 // be registered:
-//  servicehealthcheck.RegisterHealthCheck(...)
+//
+//	servicehealthcheck.RegisterHealthCheck(...)
 func CustomConnectionPool(opts *pg.Options) *pg.DB {
 	log.Logger().Info().Str("addr", opts.Addr).
 		Str("user", opts.User).
@@ -233,14 +230,14 @@ func CustomConnectionPool(opts *pg.Options) *pg.DB {
 		Msg("PostgreSQL connection pool created")
 	db := pg.Connect(opts)
 	if cfg.LogWrite || cfg.LogRead {
-		db.OnQueryProcessed(queryLogger)
+		db.AddQueryHook(QueryLogger{})
 	} else {
 		log.Logger().Warn().Msg("Connection pool has logging queries disabled completely")
 	}
-	db.OnQueryProcessed(openTracingAdapter)
-	db.OnQueryProcessed(func(event *pg.QueryProcessedEvent) {
-		metricsAdapter(event, opts)
-	})
+
+	db.AddQueryHook(OpenTracingAdapter{})
+	db.AddQueryHook(MetricsAdapter{opts})
+
 	return db
 }
 
@@ -260,57 +257,6 @@ func determineQueryMode(qry string) queryMode {
 	return writeMode
 }
 
-func queryLogger(event *pg.QueryProcessedEvent) {
-	q, qe := event.UnformattedQuery()
-	if qe == nil {
-		if !(cfg.LogRead || cfg.LogWrite) {
-			return
-		}
-		// we can only and should only perfom the following check if we have the information availaible
-		mode := determineQueryMode(q)
-		if mode == readMode && !cfg.LogRead {
-			return
-		}
-		if mode == writeMode && !cfg.LogWrite {
-			return
-		}
-
-	}
-	ctx := event.DB.Context()
-	dur := float64(time.Since(event.StartTime)) / float64(time.Millisecond)
-
-	// check if log context is given
-	var logger *zerolog.Logger
-	if ctx != nil {
-		logger = log.Ctx(ctx)
-	} else {
-		logger = log.Logger()
-	}
-
-	// add general info
-	le := logger.Debug().
-		Str("file", event.File).
-		Int("line", event.Line).
-		Str("func", event.Func).
-		Int("attempt", event.Attempt).
-		Float64("duration", dur).
-		Str("sentry:category", "postgres")
-
-	// add error or result set info
-	if event.Error != nil {
-		le = le.Err(event.Error)
-	} else {
-		le = le.Int("affected", event.Result.RowsAffected()).
-			Int("rows", event.Result.RowsReturned())
-	}
-
-	if qe != nil {
-		// this is only a display issue not a "real" issue
-		le.Msgf("%v", qe)
-	}
-	le.Msg(q)
-}
-
 var reQueryType = regexp.MustCompile(`(\s)`)
 var reQueryTypeCleanup = regexp.MustCompile(`(?m)(\s+|\n)`)
 
@@ -324,55 +270,3 @@ func getQueryType(s string) string {
 	}
 	return strings.ToUpper(s)
 }
-
-func openTracingAdapter(event *pg.QueryProcessedEvent) {
-	// start span with general info
-	q, qe := event.UnformattedQuery()
-	if qe != nil {
-		// this is only a display issue not a "real" issue
-		q = qe.Error()
-	}
-
-	span, _ := opentracing.StartSpanFromContext(event.DB.Context(), "sql: "+getQueryType(q),
-		opentracing.StartTime(event.StartTime))
-
-	span.SetTag("db.system", "postgres")
-
-	fields := []olog.Field{
-		olog.String("file", event.File),
-		olog.Int("line", event.Line),
-		olog.String("func", event.Func),
-		olog.Int("attempt", event.Attempt),
-		olog.String("query", q),
-	}
-
-	// add error or result set info
-	if event.Error != nil {
-		fields = append(fields, olog.Error(event.Error))
-	} else {
-		fields = append(fields,
-			olog.Int("affected", event.Result.RowsAffected()),
-			olog.Int("rows", event.Result.RowsReturned()))
-	}
-
-	span.LogFields(fields...)
-	span.Finish()
-}
-
-func metricsAdapter(event *pg.QueryProcessedEvent, opts *pg.Options) {
-	dur := float64(time.Since(event.StartTime)) / float64(time.Millisecond)
-	labels := prometheus.Labels{
-		"database": opts.Addr + "/" + opts.Database,
-	}
-
-	metricQueryTotal.With(labels).Inc()
-
-	if event.Error != nil {
-		metricQueryFailed.With(labels).Inc()
-	} else {
-		r := event.Result
-		metricQueryRowsTotal.With(labels).Add(float64(r.RowsReturned()))
-		metricQueryAffectedTotal.With(labels).Add(math.Max(0, float64(r.RowsAffected())))
-	}
-	metricQueryDurationSeconds.With(labels).Observe(dur)
-}

backend/postgres/query_ctx.go

@@ -6,8 +6,8 @@ package postgres
 import (
 	"context"
 
-	"github.com/go-pg/pg"
-	"github.com/go-pg/pg/orm"
+	"github.com/go-pg/pg/v10"
+	"github.com/go-pg/pg/v10/orm"
 )
 
 type pgPoolAdapter struct {