Merge branch 'master' into sql_null_params

Author: 1NepuNep1

CHANGELOG.md

@@ -1,6 +1,6 @@
 * Supported `sql.Null*` from `database/sql` as query params in `toValue` func
 
-## v3.117.3
+## v3.118.0
 * Added support for nullable `Date32`, `Datetime64`, `Timestamp64`, and `Interval64` types in the `optional` parameter builder
 * Added method `query.WithIssuesHandler` to get query issues
 

internal/version/version.go

@@ -2,8 +2,8 @@ package version
 
 const (
 	Major = "3"
-	Minor = "117"
-	Patch = "2"
+	Minor = "118"
+	Patch = "0"
 
 	Package = "ydb-go-sdk"
 )

tests/slo/database/sql/query/main.go

@@ -127,6 +127,7 @@ func main() {
 		go w.Metrics(ctx, &wg, metricsRL)
 
 		wg.Wait()
+		w.FailOnError()
 	default:
 		panic(fmt.Errorf("unknown mode: %v", cfg.Mode))
 	}

tests/slo/database/sql/table/main.go

@@ -127,6 +127,7 @@ func main() {
 		go w.Metrics(ctx, &wg, metricsRL)
 
 		wg.Wait()
+		w.FailOnError()
 	default:
 		panic(fmt.Errorf("unknown mode: %v", cfg.Mode))
 	}

tests/slo/internal/log/log.go

@@ -16,3 +16,7 @@ func Printf(format string, args ...any) {
 func Println(args ...any) {
 	fmt.Println(append([]any{timestampPrefix()}, args...)...)
 }
+
+func Panicf(format string, args ...any) {
+	panic(fmt.Sprintf(timestampPrefix()+format, args...))
+}

tests/slo/internal/metrics/metrics.go

@@ -1,12 +1,17 @@
 package metrics
 
 import (
+	"context"
+	"errors"
 	"fmt"
 	"time"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/push"
+	dto "github.com/prometheus/client_model/go"
 	"github.com/ydb-platform/ydb-go-sdk/v3"
+
+	"slo/internal/log"
 )
 
 const (
@@ -20,7 +25,8 @@ type (
 		ref   string
 		label string
 
-		errorsTotal *prometheus.CounterVec
+		errorsTotal   *prometheus.CounterVec
+		timeoutsTotal *prometheus.CounterVec
 
 		operationsTotal         *prometheus.CounterVec
 		operationsSuccessTotal  *prometheus.CounterVec
@@ -60,6 +66,13 @@ func New(url, ref, label, jobName string) (*Metrics, error) {
 		},
 		[]string{"error_type"},
 	)
+	m.timeoutsTotal = prometheus.NewCounterVec(
+		prometheus.CounterOpts{
+			Name: "sdk_timeouts_total",
+			Help: "Total number of timeout errors",
+		},
+		[]string{},
+	)
 
 	m.operationsTotal = prometheus.NewCounterVec(
 		prometheus.CounterOpts{
@@ -208,6 +221,9 @@ func (j Span) Finish(err error, attempts int) {
 	j.m.retryAttemptsTotal.WithLabelValues(j.name).Add(float64(attempts))
 
 	if err != nil {
+		if errors.Is(err, context.DeadlineExceeded) {
+			j.m.timeoutsTotal.WithLabelValues().Add(1)
+		}
 		j.m.errorsTotal.WithLabelValues(err.Error()).Add(1)
 		j.m.retriesFailureTotal.WithLabelValues(j.name).Add(float64(attempts))
 		j.m.operationsFailureTotal.WithLabelValues(j.name).Add(1)
@@ -218,3 +234,47 @@ func (j Span) Finish(err error, attempts int) {
 		j.m.operationLatencySeconds.WithLabelValues(j.name, OperationStatusSuccess).Observe(latency.Seconds())
 	}
 }
+
+func getCounterVecTotal(counterVec *prometheus.CounterVec) float64 {
+	ch := make(chan prometheus.Metric, 100)
+	go func() {
+		counterVec.Collect(ch)
+		close(ch)
+	}()
+
+	var total float64
+	for m := range ch {
+		pb := &dto.Metric{}
+		_ = m.Write(pb)
+		if pb.GetCounter() != nil {
+			total += pb.GetCounter().GetValue()
+		}
+	}
+
+	return total
+}
+
+func (m *Metrics) OperationsTotal() float64 {
+	return getCounterVecTotal(m.operationsTotal)
+}
+
+func (m *Metrics) ErrorsTotal() float64 {
+	return getCounterVecTotal(m.errorsTotal)
+}
+
+func (m *Metrics) TimeoutsTotal() float64 {
+	return getCounterVecTotal(m.timeoutsTotal)
+}
+
+func (m *Metrics) FailOnError() {
+	if m.ErrorsTotal() > 0 {
+		log.Panicf(
+			"unretriable (or not successfully retried) errors: %.0f errors out of %.0f operations",
+			m.ErrorsTotal(),
+			m.OperationsTotal(),
+		)
+	}
+	if m.TimeoutsTotal() > 0 {
+		log.Panicf("there are user timeouts: %.0f timeouts", m.TimeoutsTotal())
+	}
+}

tests/slo/internal/workers/workers.go

@@ -35,6 +35,10 @@ func New(cfg *config.Config, s ReadWriter, ref, label, jobName string) (*Workers
 	}, nil
 }
 
+func (w *Workers) FailOnError() {
+	w.m.FailOnError()
+}
+
 func (w *Workers) Close() error {
 	return w.m.Reset()
 }

tests/slo/native/query/main.go

@@ -143,6 +143,7 @@ func main() {
 		go w.Metrics(ctx, &wg, metricsRL)
 
 		wg.Wait()
+		w.FailOnError()
 	default:
 		panic(fmt.Errorf("unknown mode: %v", cfg.Mode))
 	}

tests/slo/native/table/main.go

@@ -127,6 +127,7 @@ func main() {
 		go w.Metrics(ctx, &wg, metricsRL)
 
 		wg.Wait()
+		w.FailOnError()
 	default:
 		panic(fmt.Errorf("unknown mode: %v", cfg.Mode))
 	}

tests/slo/native/table/over/query/service/main.go

@@ -127,6 +127,7 @@ func main() {
 		go w.Metrics(ctx, &wg, metricsRL)
 
 		wg.Wait()
+		w.FailOnError()
 	default:
 		panic(fmt.Errorf("unknown mode: %v", cfg.Mode))
 	}