Remove FuncCall (#4476)

FerretDB · Jul 18, 2024 · 035827a · 035827a
1 parent 8fdcfd9
commit 035827a
Show file tree

Hide file tree

Showing 23 changed files with 0 additions and 325 deletions.
diff --git a/integration/setup/client.go b/integration/setup/client.go
@@ -27,7 +27,6 @@ import (
 	"go.opentelemetry.io/otel"
 
 	"github.com/FerretDB/FerretDB/internal/util/lazyerrors"
-	"github.com/FerretDB/FerretDB/internal/util/observability"
 	"github.com/FerretDB/FerretDB/internal/util/testutil"
 	"github.com/FerretDB/FerretDB/internal/util/testutil/testtb"
 )
@@ -97,8 +96,6 @@ func setupClient(tb testtb.TB, ctx context.Context, uri string, disableOtel bool
 	ctx, span := otel.Tracer("").Start(ctx, "setupClient")
 	defer span.End()
 
-	defer observability.FuncCall(ctx)()
-
 	client, err := makeClient(ctx, uri, disableOtel)
 	if err != nil {
 		tb.Error(err)

diff --git a/integration/setup/listener.go b/integration/setup/listener.go
@@ -28,7 +28,6 @@ import (
 
 	"github.com/FerretDB/FerretDB/internal/clientconn"
 	"github.com/FerretDB/FerretDB/internal/handler/registry"
-	"github.com/FerretDB/FerretDB/internal/util/observability"
 	"github.com/FerretDB/FerretDB/internal/util/password"
 	"github.com/FerretDB/FerretDB/internal/util/state"
 	"github.com/FerretDB/FerretDB/internal/util/testutil"
@@ -108,8 +107,6 @@ func setupListener(tb testtb.TB, ctx context.Context, logger *zap.Logger, opts *
 	_, span := otel.Tracer("").Start(ctx, "setupListener")
 	defer span.End()
 
-	defer observability.FuncCall(ctx)()
-
 	require.Empty(tb, *targetURLF, "-target-url must be empty for in-process FerretDB")
 
 	var handler string

diff --git a/integration/setup/setup.go b/integration/setup/setup.go
@@ -20,7 +20,6 @@ import (
 	"flag"
 	"fmt"
 	"net/url"
-	"runtime/trace"
 	"slices"
 	"strings"
 	"time"
@@ -33,7 +32,6 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/FerretDB/FerretDB/internal/util/iterator"
-	"github.com/FerretDB/FerretDB/internal/util/observability"
 	"github.com/FerretDB/FerretDB/internal/util/testutil"
 	"github.com/FerretDB/FerretDB/internal/util/testutil/testtb"
 
@@ -143,8 +141,6 @@ func SetupWithOpts(tb testtb.TB, opts *SetupOpts) *SetupResult {
 	setupCtx, span := otel.Tracer("").Start(ctx, "SetupWithOpts")
 	defer span.End()
 
-	defer trace.StartRegion(setupCtx, "SetupWithOpts").End()
-
 	if opts == nil {
 		opts = new(SetupOpts)
 	}
@@ -210,8 +206,6 @@ func setupCollection(tb testtb.TB, ctx context.Context, client *mongo.Client, op
 	ctx, span := otel.Tracer("").Start(ctx, "setupCollection")
 	defer span.End()
 
-	defer observability.FuncCall(ctx)()
-
 	var ownDatabase bool
 	databaseName := opts.DatabaseName
 	if databaseName == "" {
@@ -273,7 +267,6 @@ func InsertProviders(tb testtb.TB, ctx context.Context, collection *mongo.Collec
 	for _, provider := range providers {
 		spanName := fmt.Sprintf("insertProviders/%s/%s", collectionName, provider.Name())
 		provCtx, span := otel.Tracer("").Start(ctx, spanName)
-		region := trace.StartRegion(provCtx, spanName)
 
 		docs := shareddata.Docs(provider)
 		require.NotEmpty(tb, docs)
@@ -283,7 +276,6 @@ func InsertProviders(tb testtb.TB, ctx context.Context, collection *mongo.Collec
 		require.Len(tb, res.InsertedIDs, len(docs))
 		inserted = true
 
-		region.End()
 		span.End()
 	}
 
@@ -301,7 +293,6 @@ func insertBenchmarkProvider(tb testtb.TB, ctx context.Context, collection *mong
 
 	spanName := fmt.Sprintf("insertBenchmarkProvider/%s/%s", collectionName, provider.Name())
 	provCtx, span := otel.Tracer("").Start(ctx, spanName)
-	region := trace.StartRegion(provCtx, spanName)
 
 	iter := provider.NewIterator()
 	defer iter.Close()
@@ -326,7 +317,6 @@ func insertBenchmarkProvider(tb testtb.TB, ctx context.Context, collection *mong
 		inserted = true
 	}
 
-	region.End()
 	span.End()
 
 	return

diff --git a/integration/setup/setup_compat.go b/integration/setup/setup_compat.go
@@ -17,15 +17,13 @@ package setup
 import (
 	"context"
 	"fmt"
-	"runtime/trace"
 	"strings"
 
 	"github.com/stretchr/testify/require"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
 
-	"github.com/FerretDB/FerretDB/internal/util/observability"
 	"github.com/FerretDB/FerretDB/internal/util/testutil"
 	"github.com/FerretDB/FerretDB/internal/util/testutil/testtb"
 
@@ -71,8 +69,6 @@ func SetupCompatWithOpts(tb testtb.TB, opts *SetupCompatOpts) *SetupCompatResult
 	setupCtx, span := otel.Tracer("").Start(ctx, "SetupCompatWithOpts")
 	defer span.End()
 
-	defer trace.StartRegion(setupCtx, "SetupCompatWithOpts").End()
-
 	if opts == nil {
 		opts = new(SetupCompatOpts)
 	}
@@ -143,8 +139,6 @@ func setupCompatCollections(tb testtb.TB, ctx context.Context, client *mongo.Cli
 	ctx, span := otel.Tracer("").Start(ctx, "setupCompatCollections")
 	defer span.End()
 
-	defer observability.FuncCall(ctx)()
-
 	database := client.Database(opts.databaseName)
 
 	cleanupDatabase(ctx, tb, database, nil)
@@ -165,7 +159,6 @@ func setupCompatCollections(tb testtb.TB, ctx context.Context, client *mongo.Cli
 
 		spanName := fmt.Sprintf("setupCompatCollections/%s", collectionName)
 		collCtx, span := otel.Tracer("").Start(ctx, spanName)
-		region := trace.StartRegion(collCtx, spanName)
 
 		collection := database.Collection(collectionName)
 
@@ -192,7 +185,6 @@ func setupCompatCollections(tb testtb.TB, ctx context.Context, client *mongo.Cli
 
 		collections = append(collections, collection)
 
-		region.End()
 		span.End()
 	}
 

diff --git a/internal/backends/backend.go b/internal/backends/backend.go
@@ -23,7 +23,6 @@ import (
 
 	"github.com/FerretDB/FerretDB/internal/clientconn/conninfo"
 	"github.com/FerretDB/FerretDB/internal/util/must"
-	"github.com/FerretDB/FerretDB/internal/util/observability"
 	"github.com/FerretDB/FerretDB/internal/util/resource"
 )
 
@@ -94,8 +93,6 @@ type StatusResult struct {
 // connection can be established and authenticated.
 // For that reason, the implementation should not return only cached results.
 func (bc *backendContract) Status(ctx context.Context, params *StatusParams) (*StatusResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	// to both check that conninfo is present (which is important for that method),
 	// and to render doc.go correctly
 	must.NotBeZero(conninfo.Get(ctx))
@@ -143,8 +140,6 @@ type DatabaseInfo struct {
 //
 // Database may not exist; that's not an error.
 func (bc *backendContract) ListDatabases(ctx context.Context, params *ListDatabasesParams) (*ListDatabasesResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := bc.b.ListDatabases(ctx, params)
 	checkError(err)
 
@@ -169,8 +164,6 @@ type DropDatabaseParams struct {
 
 // DropDatabase drops existing database for given parameters (including valid name).
 func (bc *backendContract) DropDatabase(ctx context.Context, params *DropDatabaseParams) error {
-	defer observability.FuncCall(ctx)()
-
 	err := validateDatabaseName(params.Name)
 	if err == nil {
 		err = bc.b.DropDatabase(ctx, params)

diff --git a/internal/backends/collection.go b/internal/backends/collection.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/must"
-	"github.com/FerretDB/FerretDB/internal/util/observability"
 )
 
 // DefaultIndexName is a name of the index that is created when a collection is created.
@@ -103,8 +102,6 @@ type QueryResult struct {
 //
 // Limit, if non-zero, should be applied.
 func (cc *collectionContract) Query(ctx context.Context, params *QueryParams) (*QueryResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	if params == nil {
 		params = new(QueryParams)
 	}
@@ -151,8 +148,6 @@ type ExplainResult struct {
 // The ExplainResult's SortPushdown field is set to true if the backend could have applied the whole requested sorting.
 // If it was possible to apply it only partially or not at all, that field should be set to false.
 func (cc *collectionContract) Explain(ctx context.Context, params *ExplainParams) (*ExplainResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	if params == nil {
 		params = new(ExplainParams)
 	}
@@ -191,8 +186,6 @@ type InsertAllResult struct{}
 //
 // Both database and collection may or may not exist; they should be created automatically if needed.
 func (cc *collectionContract) InsertAll(ctx context.Context, params *InsertAllParams) (*InsertAllResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	now := time.Now()
 	for _, doc := range params.Docs {
 		doc.SetRecordID(types.NextTimestamp(now).Signed())
@@ -226,8 +219,6 @@ type UpdateAllResult struct {
 //
 // Database or collection may not exist; that's not an error.
 func (cc *collectionContract) UpdateAll(ctx context.Context, params *UpdateAllParams) (*UpdateAllResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	for _, doc := range params.Docs {
 		doc.Freeze()
 	}
@@ -259,8 +250,6 @@ type DeleteAllResult struct {
 //
 // Database or collection may not exist; that's not an error.
 func (cc *collectionContract) DeleteAll(ctx context.Context, params *DeleteAllParams) (*DeleteAllResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	must.BeTrue((params.IDs == nil) != (params.RecordIDs == nil))
 
 	res, err := cc.c.DeleteAll(ctx, params)
@@ -295,8 +284,6 @@ type IndexSize struct {
 //
 // The errors for non-existing database and non-existing collection are the same.
 func (cc *collectionContract) Stats(ctx context.Context, params *CollectionStatsParams) (*CollectionStatsResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := cc.c.Stats(ctx, params)
 	checkError(err, ErrorCodeCollectionDoesNotExist)
 
@@ -317,8 +304,6 @@ type CompactResult struct{}
 // If full is true, the operation should try to reduce the disk space as much as possible,
 // even if collection or the whole database will be locked for some time.
 func (cc *collectionContract) Compact(ctx context.Context, params *CompactParams) (*CompactResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := cc.c.Compact(ctx, params)
 	checkError(err, ErrorCodeDatabaseDoesNotExist, ErrorCodeCollectionDoesNotExist)
 
@@ -350,8 +335,6 @@ type IndexKeyPair struct {
 //
 // The errors for non-existing database and non-existing collection are the same.
 func (cc *collectionContract) ListIndexes(ctx context.Context, params *ListIndexesParams) (*ListIndexesResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := cc.c.ListIndexes(ctx, params)
 	checkError(err, ErrorCodeCollectionDoesNotExist)
 
@@ -380,8 +363,6 @@ type CreateIndexesResult struct{}
 //
 // Database or collection may not exist; that's not an error.
 func (cc *collectionContract) CreateIndexes(ctx context.Context, params *CreateIndexesParams) (*CreateIndexesResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := cc.c.CreateIndexes(ctx, params)
 	checkError(err)
 
@@ -404,8 +385,6 @@ type DropIndexesResult struct{}
 //
 // Database or collection may not exist; that's not an error.
 func (cc *collectionContract) DropIndexes(ctx context.Context, params *DropIndexesParams) (*DropIndexesResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := cc.c.DropIndexes(ctx, params)
 	checkError(err)
 

diff --git a/internal/backends/database.go b/internal/backends/database.go
@@ -20,7 +20,6 @@ import (
 	"slices"
 
 	"github.com/FerretDB/FerretDB/internal/util/must"
-	"github.com/FerretDB/FerretDB/internal/util/observability"
 )
 
 // Database is a generic interface for all backends for accessing databases.
@@ -106,8 +105,6 @@ func (ci *CollectionInfo) Capped() bool {
 //
 // Database may not exist; that's not an error.
 func (dbc *databaseContract) ListCollections(ctx context.Context, params *ListCollectionsParams) (*ListCollectionsResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := dbc.db.ListCollections(ctx, params)
 	checkError(err)
 
@@ -142,8 +139,6 @@ func (ccp *CreateCollectionParams) Capped() bool {
 //
 // Database may or may not exist; it should be created automatically if needed.
 func (dbc *databaseContract) CreateCollection(ctx context.Context, params *CreateCollectionParams) error {
-	defer observability.FuncCall(ctx)()
-
 	must.BeTrue(params.CappedSize >= 0)
 	must.BeTrue(params.CappedDocuments >= 0)
 
@@ -166,8 +161,6 @@ type DropCollectionParams struct {
 //
 // The errors for non-existing database and non-existing collection are the same.
 func (dbc *databaseContract) DropCollection(ctx context.Context, params *DropCollectionParams) error {
-	defer observability.FuncCall(ctx)()
-
 	err := validateCollectionName(params.Name)
 	if err == nil {
 		err = dbc.db.DropCollection(ctx, params)
@@ -189,8 +182,6 @@ type RenameCollectionParams struct {
 //
 // The errors for non-existing database and non-existing collection are the same.
 func (dbc *databaseContract) RenameCollection(ctx context.Context, params *RenameCollectionParams) error {
-	defer observability.FuncCall(ctx)()
-
 	err := validateCollectionName(params.OldName)
 
 	if err == nil {
@@ -222,8 +213,6 @@ type DatabaseStatsResult struct {
 // Stats returns statistic estimations about the database.
 // All returned values are not exact, but might be more accurate when Stats is called with `Refresh: true`.
 func (dbc *databaseContract) Stats(ctx context.Context, params *DatabaseStatsParams) (*DatabaseStatsResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := dbc.db.Stats(ctx, params)
 	checkError(err, ErrorCodeDatabaseDoesNotExist)
 

diff --git a/internal/backends/decorators/oplog/collection.go b/internal/backends/decorators/oplog/collection.go
@@ -23,7 +23,6 @@ import (
 	"github.com/FerretDB/FerretDB/internal/backends"
 	"github.com/FerretDB/FerretDB/internal/types"
 	"github.com/FerretDB/FerretDB/internal/util/must"
-	"github.com/FerretDB/FerretDB/internal/util/observability"
 )
 
 // fixed OpLog database and collection names.
@@ -59,8 +58,6 @@ func (c *collection) Query(ctx context.Context, params *backends.QueryParams) (*
 
 // InsertAll implements backends.Collection interface.
 func (c *collection) InsertAll(ctx context.Context, params *backends.InsertAllParams) (*backends.InsertAllResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := c.origC.InsertAll(ctx, params)
 	if err != nil {
 		return nil, err
@@ -99,8 +96,6 @@ func (c *collection) InsertAll(ctx context.Context, params *backends.InsertAllPa
 
 // UpdateAll implements backends.Collection interface.
 func (c *collection) UpdateAll(ctx context.Context, params *backends.UpdateAllParams) (*backends.UpdateAllResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := c.origC.UpdateAll(ctx, params)
 	if err != nil {
 		return nil, err
@@ -143,8 +138,6 @@ func (c *collection) UpdateAll(ctx context.Context, params *backends.UpdateAllPa
 
 // DeleteAll implements backends.Collection interface.
 func (c *collection) DeleteAll(ctx context.Context, params *backends.DeleteAllParams) (*backends.DeleteAllResult, error) {
-	defer observability.FuncCall(ctx)()
-
 	res, err := c.origC.DeleteAll(ctx, params)
 	if err != nil {
 		return nil, err