Merge branch 'main' into allow-dashes-coll-1280

.golangci-new.yml

@@ -10,7 +10,15 @@ linters-settings:
     errorf: false
     asserts: true
     comparison: true
-
+  revive:
+    ignore-generated-header: true
+    severity: warning
+    # TODO enable-all-rules: true
+    rules:
+      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
+      - name: exported
+        arguments: [checkPrivateReceivers]
+      - name: package-comments
   staticcheck:
     checks: ["all"]
   wsl:
@@ -48,7 +56,6 @@ linters:
     - lll
     - misspell
     - nolintlint
-    - revive
     - unused
     - whitespace
 

.golangci.yml

@@ -86,13 +86,6 @@ linters-settings:
     allow-no-explanation: []
     require-explanation: true
     require-specific: true
-  revive:
-    ignore-generated-header: true
-    severity: warning
-    # TODO enable-all-rules: true
-    rules:
-      - name: exported
-        # TODO arguments: [checkPrivateReceivers]
   staticcheck:
     checks:
       - all
@@ -122,7 +115,6 @@ linters:
     - lll
     - misspell
     - nolintlint
-    - revive
     - staticcheck
     - unused
     - whitespace

Taskfile.yml

@@ -234,23 +234,31 @@ tasks:
     desc: "Run FerretDB"
     deps: [build-testcover]
     cmds:
-      - bin/ferretdb-testcover{{exeExt}} -test.coverprofile=cover.txt -- --test-records-dir=records --mode=diff-normal --listen-addr=:27017
+      - >
+        bin/ferretdb-testcover{{exeExt}} -test.coverprofile=cover.txt -- --test-records-dir=records
+        --mode=diff-normal --listen-addr=:27017
 
   run-tigris:
     deps: [build-testcover]
     cmds:
-      - bin/ferretdb-testcover{{exeExt}} -test.coverprofile=cover.txt -- --test-records-dir=records --mode=diff-normal --listen-addr=:27017 --handler=tigris
+      - >
+        bin/ferretdb-testcover{{exeExt}} -test.coverprofile=cover.txt -- --test-records-dir=records
+        --mode=diff-normal --listen-addr=:27017 --handler=tigris
 
   run-cockroach:
     deps: [build-testcover]
     cmds:
-      - bin/ferretdb-testcover{{exeExt}} -test.coverprofile=cover.txt -- --test-records-dir=records --mode=diff-normal --listen-addr=:27017 --postgresql-url=postgres://cockroach@127.0.0.1:26257/ferretdb
+      - >
+        bin/ferretdb-testcover{{exeExt}} -test.coverprofile=cover.txt -- --test-records-dir=records
+        --mode=diff-normal --listen-addr=:27017 --postgresql-url=postgres://cockroach@127.0.0.1:26257/ferretdb
 
   run-proxy:
     desc: "Run FerretDB in diff-proxy mode"
     deps: [build-testcover]
     cmds:
-      - bin/ferretdb-testcover{{exeExt}} -test.coverprofile=cover.txt -- --test-records-dir=records --mode=diff-proxy --listen-addr=:27017
+      - >
+        bin/ferretdb-testcover{{exeExt}} -test.coverprofile=cover.txt -- --test-records-dir=records
+        --mode=diff-proxy --listen-addr=:27017
 
   lint:
     desc: "Run linters"

cmd/ferretdb/main.go

@@ -26,7 +26,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/AlekSi/pointer"
 	"github.com/alecthomas/kong"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/expfmt"
@@ -62,8 +61,7 @@ var cli struct {
 
 	MetricsUUID bool `default:"false" help:"Add instance UUID to all metrics."`
 
-	// TODO switch to string for 3 states
-	Telemetry bool `default:"false" help:"Enable basic telemetry. See https://beacon.ferretdb.io."`
+	Telemetry telemetry.Flag `default:"" help:"Enable or disable basic telemetry. See https://beacon.ferretdb.io."`
 
 	Handler string `default:"pg" help:"${help_handler}"`
 
@@ -199,13 +197,10 @@ func setupLogger(stateProvider *state.Provider) *zap.Logger {
 }
 
 // runTelemetryReporter runs telemetry reporter until ctx is canceled.
-func runTelemetryReporter(ctx context.Context, enabled bool, opts *telemetry.NewReporterOpts) {
-	// TODO probably move out of this function
-	opts.P.Update(func(s *state.State) { s.Telemetry = pointer.ToBool(enabled) })
-
+func runTelemetryReporter(ctx context.Context, opts *telemetry.NewReporterOpts) {
 	r, err := telemetry.NewReporter(opts)
 	if err != nil {
-		opts.L.Fatal("Failed to create telemetry reporter.", zap.Error(err))
+		opts.L.Sugar().Fatalf("Failed to create telemetry reporter: %s.", err)
 	}
 
 	r.Run(ctx)
@@ -253,9 +248,11 @@ func run() {
 		defer wg.Done()
 		runTelemetryReporter(
 			ctx,
-			cli.Telemetry,
 			&telemetry.NewReporterOpts{
 				URL:            cli.Test.Telemetry.URL,
+				F:              &cli.Telemetry,
+				DNT:            os.Getenv("DO_NOT_TRACK"),
+				ExecName:       os.Args[0],
 				P:              stateProvider,
 				L:              logger.Named("telemetry"),
 				UndecidedDelay: cli.Test.Telemetry.UndecidedDelay,

integration/setup/setup.go

@@ -23,7 +23,6 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest"
 	"golang.org/x/exp/slices"
 
 	"github.com/FerretDB/FerretDB/integration/shareddata"
@@ -68,7 +67,7 @@ func SetupWithOpts(tb testing.TB, opts *SetupOpts) *SetupResult {
 	if *debugSetupF {
 		level = zap.NewAtomicLevelAt(zap.DebugLevel)
 	}
-	logger := zaptest.NewLogger(tb, zaptest.Level(level), zaptest.WrapOptions(zap.AddCaller(), zap.Development()))
+	logger := testutil.Logger(tb, level)
 
 	port := *targetPortF
 	if port == 0 {

integration/setup/setup_compat.go

@@ -25,7 +25,6 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest"
 	"golang.org/x/exp/slices"
 
 	"github.com/FerretDB/FerretDB/integration/shareddata"
@@ -92,7 +91,7 @@ func SetupCompatWithOpts(tb testing.TB, opts *SetupCompatOpts) *SetupCompatResul
 	if *debugSetupF {
 		level = zap.NewAtomicLevelAt(zap.DebugLevel)
 	}
-	logger := zaptest.NewLogger(tb, zaptest.Level(level), zaptest.WrapOptions(zap.AddCaller(), zap.Development()))
+	logger := testutil.Logger(tb, level)
 
 	targetPort := *targetPortF
 	if targetPort == 0 {

internal/handlers/pg/pgdb/pgdb_test.go

@@ -22,7 +22,6 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest"
 
 	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
@@ -31,8 +30,8 @@ import (
 func getPool(ctx context.Context, tb testing.TB) *Pool {
 	tb.Helper()
 
-	l := zaptest.NewLogger(tb, zaptest.WrapOptions(zap.AddCaller(), zap.Development()))
-	pool, err := NewPool(ctx, testutil.PostgreSQLURL(tb, nil), l, false)
+	logger := testutil.Logger(tb, zap.NewAtomicLevelAt(zap.DebugLevel))
+	pool, err := NewPool(ctx, testutil.PostgreSQLURL(tb, nil), logger, false)
 	require.NoError(tb, err)
 	tb.Cleanup(pool.Close)
 

internal/handlers/tigris/tigrisdb/tigrisdb_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/tigrisdata/tigris-client-go/config"
 	"github.com/tigrisdata/tigris-client-go/driver"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zaptest"
 
 	"github.com/FerretDB/FerretDB/internal/util/testutil"
 )
@@ -37,7 +36,7 @@ func TestCreateCollectionIfNotExist(t *testing.T) {
 		URL: testutil.TigrisURL(t),
 	}
 
-	logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller(), zap.Development()))
+	logger := testutil.Logger(t, zap.NewAtomicLevelAt(zap.DebugLevel))
 	tdb, err := New(cfg, logger)
 	require.NoError(t, err)
 

internal/util/debug/debug.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package debug provides debug facilities.
 package debug
 
 import (

internal/util/hex/hex.go

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package hex provides helpers for working with hex dumps.
 package hex
 
 import (