removed environ credentials and zap logs from slo

Author: asmyasnikov

tests/slo/database/sql/main.go

@@ -8,8 +8,6 @@ import (
 	"syscall"
 	"time"
 
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/time/rate"
 
@@ -18,34 +16,22 @@ import (
 	"slo/internal/workers"
 )
 
-var logger *zap.Logger
-
 var (
 	label   string
 	jobName string
 )
 
-func init() {
-	var err error
-	logger, err = zap.NewProduction(zap.AddStacktrace(zapcore.PanicLevel))
-	if err != nil {
-		panic(fmt.Errorf("error create logger: %w", err))
-	}
-}
-
 func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT)
 	defer cancel()
 
-	defer func() { _ = logger.Sync() }()
-
 	cfg, err := config.New()
 	if err != nil {
 		panic(fmt.Errorf("create config failed: %w", err))
 	}
 
-	logger.Info("program started")
-	defer logger.Info("program finished")
+	fmt.Println("program started")
+	defer fmt.Println("program finished")
 
 	ctx, cancel = context.WithTimeout(ctx, time.Duration(cfg.Time)*time.Second)
 	defer cancel()
@@ -62,15 +48,15 @@ func main() {
 		_ = s.close(shutdownCtx)
 	}()
 
-	logger.Info("db init ok")
+	fmt.Println("db init ok")
 
 	switch cfg.Mode {
 	case config.CreateMode:
 		err = s.createTable(ctx)
 		if err != nil {
 			panic(fmt.Errorf("create table failed: %w", err))
 		}
-		logger.Info("create table ok")
+		fmt.Println("create table ok")
 
 		gen := generator.New(0)
 
@@ -97,18 +83,18 @@ func main() {
 			panic(err)
 		}
 
-		logger.Info("entries write ok")
+		fmt.Println("entries write ok")
 	case config.CleanupMode:
 		err = s.dropTable(ctx)
 		if err != nil {
 			panic(fmt.Errorf("drop table failed: %w", err))
 		}
 
-		logger.Info("cleanup table ok")
+		fmt.Println("cleanup table ok")
 	case config.RunMode:
 		gen := generator.New(cfg.InitialDataCount)
 
-		w, err := workers.New(cfg, s, logger, label, jobName)
+		w, err := workers.New(cfg, s, label, jobName)
 		if err != nil {
 			panic(fmt.Errorf("create workers failed: %w", err))
 		}
@@ -117,7 +103,7 @@ func main() {
 			if err != nil {
 				panic(fmt.Errorf("workers close failed: %w", err))
 			}
-			logger.Info("workers close ok")
+			fmt.Println("workers close ok")
 		}()
 
 		wg := sync.WaitGroup{}

tests/slo/database/sql/storage.go

@@ -7,8 +7,6 @@ import (
 	"path"
 	"time"
 
-	env "github.com/ydb-platform/ydb-go-sdk-auth-environ"
-	ydbZap "github.com/ydb-platform/ydb-go-sdk-zap"
 	"github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
@@ -93,11 +91,6 @@ func NewStorage(ctx context.Context, cfg *config.Config, poolSize int) (s *Stora
 	s.cc, err = ydb.Open(
 		ctx,
 		s.cfg.Endpoint+s.cfg.DB,
-		env.WithEnvironCredentials(ctx),
-		ydbZap.WithTraces(
-			logger,
-			trace.DetailsAll,
-		),
 	)
 	if err != nil {
 		return nil, fmt.Errorf("ydb.Open error: %w", err)

tests/slo/go.mod

@@ -5,10 +5,7 @@ go 1.20
 require (
 	github.com/prometheus/client_golang v1.14.0
 	github.com/ydb-platform/gorm-driver v0.0.6-0.20230529184330-9104dd08ecae
-	github.com/ydb-platform/ydb-go-sdk-auth-environ v0.1.3
-	github.com/ydb-platform/ydb-go-sdk-zap v0.15.0
 	github.com/ydb-platform/ydb-go-sdk/v3 v3.47.3
-	go.uber.org/zap v1.24.0
 	golang.org/x/sync v0.1.0
 	golang.org/x/time v0.3.0
 	gorm.io/gorm v1.25.1
@@ -37,10 +34,9 @@ require (
 	github.com/syndtr/goleveldb v1.0.0 // indirect
 	github.com/yandex-cloud/go-genproto v0.0.0-20230403093326-123923969dc6 // indirect
 	github.com/ydb-platform/ydb-go-genproto v0.0.0-20230528143953-42c825ace222 // indirect
+	github.com/ydb-platform/ydb-go-sdk-auth-environ v0.1.3 // indirect
 	github.com/ydb-platform/ydb-go-yc v0.10.2 // indirect
 	github.com/ydb-platform/ydb-go-yc-metadata v0.5.3 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.9.0 // indirect
 	golang.org/x/sys v0.7.0 // indirect
 	golang.org/x/text v0.9.0 // indirect

tests/slo/go.sum

@@ -404,8 +404,6 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l
 github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -788,7 +786,6 @@ github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -893,8 +890,6 @@ github.com/ydb-platform/ydb-go-genproto v0.0.0-20230528143953-42c825ace222 h1:8d
 github.com/ydb-platform/ydb-go-genproto v0.0.0-20230528143953-42c825ace222/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
 github.com/ydb-platform/ydb-go-sdk-auth-environ v0.1.3 h1:+DrFgi0hjjLarFcWHwI6WPk28hcWr6N7ga+OHAxtemI=
 github.com/ydb-platform/ydb-go-sdk-auth-environ v0.1.3/go.mod h1:K5wHHoLBfmWc7zyiETOA1Spx7DN+4skQ7YeWy5snXKo=
-github.com/ydb-platform/ydb-go-sdk-zap v0.15.0 h1:PLD1uOWbzLdGRDzhcxmUxXBfkoQ4rHCJI7GmEeikNxU=
-github.com/ydb-platform/ydb-go-sdk-zap v0.15.0/go.mod h1:ctHPgkqBgDmU99nEBO4Vil02JPZI5CWcGwknVtpWYmY=
 github.com/ydb-platform/ydb-go-yc v0.10.2 h1:RAHy6g7ncxk1y0N4oS2MwYXLATqRqKBI6DYXuxpV2wo=
 github.com/ydb-platform/ydb-go-yc v0.10.2/go.mod h1:U1dX3LJy6zADId2DciCXlgrU/vphK1+CQzaefKq21dQ=
 github.com/ydb-platform/ydb-go-yc-metadata v0.5.2/go.mod h1:82SQ4L3PewiEmFW4oTMc1sfPjODasIYxD/SKGsbK74s=
@@ -925,24 +920,13 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
-go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
-go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -1541,12 +1525,10 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

tests/slo/gorm/main.go

@@ -8,8 +8,6 @@ import (
 	"syscall"
 	"time"
 
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/time/rate"
 
@@ -18,39 +16,27 @@ import (
 	"slo/internal/workers"
 )
 
-var logger *zap.Logger
-
 var (
 	label   string
 	jobName string
 )
 
-func init() {
-	var err error
-	logger, err = zap.NewProduction(zap.AddStacktrace(zapcore.PanicLevel))
-	if err != nil {
-		panic(fmt.Errorf("error create logger: %w", err))
-	}
-}
-
 func main() {
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT)
 	defer cancel()
 
-	defer func() { _ = logger.Sync() }()
-
 	cfg, err := config.New()
 	if err != nil {
 		panic(fmt.Errorf("create config failed: %w", err))
 	}
 
-	logger.Info("program started")
-	defer logger.Info("program finished")
+	fmt.Println("program started")
+	defer fmt.Println("program finished")
 
 	ctx, cancel = context.WithTimeout(ctx, time.Duration(cfg.Time)*time.Second)
 	defer cancel()
 
-	s, err := NewStorage(ctx, cfg, cfg.ReadRPS+cfg.WriteRPS)
+	s, err := NewStorage(cfg, cfg.ReadRPS+cfg.WriteRPS)
 	if err != nil {
 		panic(fmt.Errorf("create storage failed: %w", err))
 	}
@@ -62,15 +48,15 @@ func main() {
 		_ = s.close(shutdownCtx)
 	}()
 
-	logger.Info("db init ok")
+	fmt.Println("db init ok")
 
 	switch cfg.Mode {
 	case config.CreateMode:
 		err = s.createTable(ctx)
 		if err != nil {
 			panic(fmt.Errorf("create table failed: %w", err))
 		}
-		logger.Info("create table ok")
+		fmt.Println("create table ok")
 
 		gen := generator.New(0)
 
@@ -97,18 +83,18 @@ func main() {
 			panic(err)
 		}
 
-		logger.Info("entries write ok")
+		fmt.Println("entries write ok")
 	case config.CleanupMode:
 		err = s.dropTable(ctx)
 		if err != nil {
 			panic(fmt.Errorf("create table failed: %w", err))
 		}
 
-		logger.Info("cleanup table ok")
+		fmt.Println("cleanup table ok")
 	case config.RunMode:
 		gen := generator.New(cfg.InitialDataCount)
 
-		w, err := workers.New(cfg, s, logger, label, jobName)
+		w, err := workers.New(cfg, s, label, jobName)
 		if err != nil {
 			panic(fmt.Errorf("create workers failed: %w", err))
 		}
@@ -117,7 +103,7 @@ func main() {
 			if err != nil {
 				panic(fmt.Errorf("workers close failed: %w", err))
 			}
-			logger.Info("workers close ok")
+			fmt.Println("workers close ok")
 		}()
 
 		wg := sync.WaitGroup{}

tests/slo/gorm/storage.go

@@ -7,8 +7,6 @@ import (
 	"time"
 
 	ydb "github.com/ydb-platform/gorm-driver"
-	environ "github.com/ydb-platform/ydb-go-sdk-auth-environ"
-	ydbZap "github.com/ydb-platform/ydb-go-sdk-zap"
 	ydbSDK "github.com/ydb-platform/ydb-go-sdk/v3"
 	"github.com/ydb-platform/ydb-go-sdk/v3/retry"
 	"github.com/ydb-platform/ydb-go-sdk/v3/table"
@@ -50,10 +48,7 @@ type Storage struct {
 	tableOptions string
 }
 
-func NewStorage(ctx context.Context, cfg *config.Config, poolSize int) (*Storage, error) {
-	ctx, cancel := context.WithTimeout(ctx, time.Minute*5)
-	defer cancel()
-
+func NewStorage(cfg *config.Config, poolSize int) (*Storage, error) {
 	s := &Storage{
 		cfg: cfg,
 		tableOptions: fmt.Sprintf(optionsTemplate,
@@ -64,14 +59,6 @@ func NewStorage(ctx context.Context, cfg *config.Config, poolSize int) (*Storage
 	s.db, err = gorm.Open(
 		ydb.Open(
 			cfg.Endpoint+cfg.DB,
-			ydb.With(
-				environ.WithEnvironCredentials(ctx),
-				ydbZap.WithTraces(
-					logger,
-					trace.DetailsAll,
-				),
-				ydbSDK.WithSessionPoolSizeLimit(poolSize),
-			),
 			ydb.WithMaxOpenConns(poolSize),
 			ydb.WithMaxIdleConns(poolSize),
 			ydb.WithTablePathPrefix(label),

tests/slo/internal/metrics/metrics.go

@@ -7,7 +7,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/push"
 	"github.com/ydb-platform/ydb-go-sdk/v3"
-	"go.uber.org/zap"
 )
 
 const (
@@ -25,16 +24,12 @@ type (
 
 		p *push.Pusher
 
-		logger *zap.Logger
-
 		label string
 	}
 )
 
-func New(logger *zap.Logger, url, label, jobName string) (*Metrics, error) {
+func New(url, label, jobName string) (*Metrics, error) {
 	m := &Metrics{
-		logger: logger.Named("metrics"),
-
 		label: label,
 	}
 
@@ -129,15 +124,15 @@ func (m *Metrics) Start(name SpanName) Span {
 func (j Span) Stop(err error, attempts int) {
 	j.m.inflight.WithLabelValues(j.name).Sub(1)
 
-	l := time.Since(j.start).Milliseconds()
+	l := time.Since(j.start)
 
 	if attempts > 1 {
-		j.m.logger.Warn("more than 1 attempt for request",
-			zap.String("request type", j.name),
-			zap.Int("attempts", attempts),
-			zap.Time("start", j.start),
-			zap.Int64("latency", l),
-			zap.Error(err),
+		fmt.Printf("more than 1 attempt for request (request_type: %q, attempts: %d, start: %s, latency: %s, err: %v)\n",
+			j.name,
+			attempts,
+			j.start.Format(time.DateTime),
+			l.String(),
+			err,
 		)
 	}