Remove tracing package and all usages of tracing in CLI (#3374)

go.mod

@@ -38,9 +38,6 @@ require (
 	github.com/tetratelabs/wazero v1.8.0
 	go.lsp.dev/jsonrpc2 v0.10.0
 	go.lsp.dev/protocol v0.12.0
-	go.opentelemetry.io/otel v1.30.0
-	go.opentelemetry.io/otel/sdk v1.30.0
-	go.opentelemetry.io/otel/trace v1.30.0
 	go.uber.org/atomic v1.11.0
 	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.27.0
@@ -117,7 +114,10 @@ require (
 	go.lsp.dev/uri v0.3.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
+	go.opentelemetry.io/otel v1.30.0 // indirect
 	go.opentelemetry.io/otel/metric v1.30.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.30.0 // indirect
+	go.opentelemetry.io/otel/trace v1.30.0 // indirect
 	go.uber.org/mock v0.4.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.18.0 // indirect

private/buf/bufcli/controller.go

@@ -19,7 +19,6 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufapi"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule/bufmoduleapi"
 	"github.com/bufbuild/buf/private/pkg/app/appext"
-	"github.com/bufbuild/buf/private/pkg/tracing"
 )
 
 // NewController returns a new Controller.
@@ -52,7 +51,6 @@ func NewController(
 	}
 	return bufctl.NewController(
 		container.Logger(),
-		tracing.NewTracerForName(container.AppName()),
 		container,
 		newGraphProvider(container, clientProvider),
 		bufmoduleapi.NewModuleKeyProvider(container.Logger(), clientProvider),

private/buf/bufctl/controller.go

@@ -46,7 +46,6 @@ import (
 	"github.com/bufbuild/buf/private/pkg/slicesext"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
 	"github.com/bufbuild/buf/private/pkg/syserror"
-	"github.com/bufbuild/buf/private/pkg/tracing"
 	"github.com/bufbuild/protovalidate-go"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
@@ -133,7 +132,6 @@ type Controller interface {
 
 func NewController(
 	logger *zap.Logger,
-	tracer tracing.Tracer,
 	container app.EnvStdioContainer,
 	graphProvider bufmodule.GraphProvider,
 	moduleKeyProvider bufmodule.ModuleKeyProvider,
@@ -147,7 +145,6 @@ func NewController(
 ) (Controller, error) {
 	return newController(
 		logger,
-		tracer,
 		container,
 		graphProvider,
 		moduleKeyProvider,
@@ -170,7 +167,6 @@ func NewController(
 // deal in the global variables.
 type controller struct {
 	logger             *zap.Logger
-	tracer             tracing.Tracer
 	container          app.EnvStdioContainer
 	moduleDataProvider bufmodule.ModuleDataProvider
 	graphProvider      bufmodule.GraphProvider
@@ -193,7 +189,6 @@ type controller struct {
 
 func newController(
 	logger *zap.Logger,
-	tracer tracing.Tracer,
 	container app.EnvStdioContainer,
 	graphProvider bufmodule.GraphProvider,
 	moduleKeyProvider bufmodule.ModuleKeyProvider,
@@ -207,7 +202,6 @@ func newController(
 ) (*controller, error) {
 	controller := &controller{
 		logger:             logger,
-		tracer:             tracer,
 		container:          container,
 		graphProvider:      graphProvider,
 		moduleDataProvider: moduleDataProvider,
@@ -230,7 +224,6 @@ func newController(
 		httpauthAuthenticator,
 		git.NewCloner(
 			logger,
-			tracer,
 			controller.storageosProvider,
 			controller.commandRunner,
 			gitClonerOptions,
@@ -240,14 +233,12 @@ func newController(
 	controller.buffetchWriter = buffetch.NewWriter(logger)
 	controller.workspaceProvider = bufworkspace.NewWorkspaceProvider(
 		logger,
-		tracer,
 		graphProvider,
 		moduleDataProvider,
 		commitProvider,
 	)
 	controller.workspaceDepManagerProvider = bufworkspace.NewWorkspaceDepManagerProvider(
 		logger,
-		tracer,
 	)
 	return controller, nil
 }
@@ -1005,7 +996,7 @@ func (c *controller) buildImage(
 	}
 	image, err := bufimage.BuildImage(
 		ctx,
-		c.tracer,
+		c.logger,
 		moduleReadBucket,
 		options...,
 	)

private/buf/bufcurl/resolver.go

@@ -21,7 +21,7 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
 	"github.com/bufbuild/buf/private/gen/data/datawkt"
 	"github.com/bufbuild/buf/private/pkg/protoencoding"
-	"github.com/bufbuild/buf/private/pkg/tracing"
+	"go.uber.org/zap"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
@@ -103,10 +103,10 @@ func (c *combinedResolver) ListServices() ([]protoreflect.FullName, error) {
 }
 
 // NewWKTResolver returns a Resolver that can resolve all well-known types.
-func NewWKTResolver(ctx context.Context, tracer tracing.Tracer) (Resolver, error) {
+func NewWKTResolver(ctx context.Context, logger *zap.Logger) (Resolver, error) {
 	moduleSet, err := bufmodule.NewModuleSetBuilder(
 		ctx,
-		tracer,
+		logger,
 		bufmodule.NopModuleDataProvider,
 		bufmodule.NopCommitProvider,
 	).AddLocalModule(
@@ -120,7 +120,7 @@ func NewWKTResolver(ctx context.Context, tracer tracing.Tracer) (Resolver, error
 	module := bufmodule.ModuleSetToModuleReadBucketWithOnlyProtoFiles(moduleSet)
 	image, err := bufimage.BuildImage(
 		ctx,
-		tracer,
+		logger,
 		module,
 		bufimage.WithExcludeSourceCodeInfo(),
 	)

private/buf/bufformat/formatter_test.go

@@ -25,8 +25,8 @@ import (
 	"github.com/bufbuild/buf/private/pkg/diff"
 	"github.com/bufbuild/buf/private/pkg/storage"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
-	"github.com/bufbuild/buf/private/pkg/tracing"
 	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
 )
 
 func TestFormatter(t *testing.T) {
@@ -75,7 +75,7 @@ func testFormatNoDiff(t *testing.T, path string) {
 		runner := command.NewRunner()
 		bucket, err := storageos.NewProvider().NewReadWriteBucket(path)
 		require.NoError(t, err)
-		moduleSetBuilder := bufmodule.NewModuleSetBuilder(ctx, tracing.NopTracer, bufmodule.NopModuleDataProvider, bufmodule.NopCommitProvider)
+		moduleSetBuilder := bufmodule.NewModuleSetBuilder(ctx, zap.NewNop(), bufmodule.NopModuleDataProvider, bufmodule.NopCommitProvider)
 		moduleSetBuilder.AddLocalModule(bucket, path, true)
 		moduleSet, err := moduleSetBuilder.Build()
 		require.NoError(t, err)

private/buf/bufgen/bufgen.go

@@ -28,7 +28,6 @@ import (
 	"github.com/bufbuild/buf/private/pkg/command"
 	"github.com/bufbuild/buf/private/pkg/connectclient"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
-	"github.com/bufbuild/buf/private/pkg/tracing"
 	"go.uber.org/zap"
 )
 
@@ -88,7 +87,6 @@ type Generator interface {
 // NewGenerator returns a new Generator.
 func NewGenerator(
 	logger *zap.Logger,
-	tracer tracing.Tracer,
 	storageosProvider storageos.Provider,
 	runner command.Runner,
 	// Pass a clientConfig instead of a CodeGenerationServiceClient because the
@@ -98,7 +96,6 @@ func NewGenerator(
 ) Generator {
 	return newGenerator(
 		logger,
-		tracer,
 		storageosProvider,
 		runner,
 		clientConfig,

private/buf/bufgen/generator.go

@@ -37,32 +37,28 @@ import (
 	"github.com/bufbuild/buf/private/pkg/slicesext"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
 	"github.com/bufbuild/buf/private/pkg/thread"
-	"github.com/bufbuild/buf/private/pkg/tracing"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/types/pluginpb"
 )
 
 type generator struct {
 	logger              *zap.Logger
-	tracer              tracing.Tracer
 	storageosProvider   storageos.Provider
 	pluginexecGenerator bufprotopluginexec.Generator
 	clientConfig        *connectclient.Config
 }
 
 func newGenerator(
 	logger *zap.Logger,
-	tracer tracing.Tracer,
 	storageosProvider storageos.Provider,
 	runner command.Runner,
 	clientConfig *connectclient.Config,
 ) *generator {
 	return &generator{
 		logger:              logger,
-		tracer:              tracer,
 		storageosProvider:   storageosProvider,
-		pluginexecGenerator: bufprotopluginexec.NewGenerator(logger, tracer, storageosProvider, runner),
+		pluginexecGenerator: bufprotopluginexec.NewGenerator(logger, storageosProvider, runner),
 		clientConfig:        clientConfig,
 	}
 }

private/buf/buflsp/buflsp.go

@@ -28,10 +28,9 @@ import (
 	"github.com/bufbuild/buf/private/pkg/app/appext"
 	"github.com/bufbuild/buf/private/pkg/storage"
 	"github.com/bufbuild/buf/private/pkg/storage/storageos"
-	"github.com/bufbuild/buf/private/pkg/tracing"
+	"github.com/bufbuild/buf/private/pkg/zaputil"
 	"go.lsp.dev/jsonrpc2"
 	"go.lsp.dev/protocol"
-	"go.opentelemetry.io/otel/attribute"
 	"go.uber.org/zap"
 )
 
@@ -65,7 +64,6 @@ func Serve(
 			zap.NewNop(), // The logging from protocol itself isn't very good, we've replaced it with connAdapter here.
 		),
 		logger:      container.Logger(),
-		tracer:      tracing.NewTracerForName(container.AppName()),
 		controller:  controller,
 		checkClient: checkClient,
 		rootBucket:  bucket,
@@ -92,7 +90,6 @@ type lsp struct {
 	client protocol.Client
 
 	logger      *zap.Logger
-	tracer      tracing.Tracer
 	controller  bufctl.Controller
 	checkClient bufcheck.Client
 	rootBucket  storage.ReadBucket
@@ -152,18 +149,7 @@ func (l *lsp) findImportable(
 func (l *lsp) newHandler() jsonrpc2.Handler {
 	actual := protocol.ServerHandler(newServer(l), nil)
 	return func(ctx context.Context, reply jsonrpc2.Replier, req jsonrpc2.Request) (retErr error) {
-		ctx, span := l.tracer.Start(
-			ctx,
-			tracing.WithErr(&retErr),
-			tracing.WithAttributes(attribute.String("method", req.Method())),
-		)
-		defer span.End()
-
-		l.logger.Debug(
-			"processing request",
-			zap.String("method", req.Method()),
-			zap.ByteString("params", req.Params()),
-		)
+		defer zaputil.DebugProfile(l.logger, zap.String("method", req.Method()), zap.ByteString("params", req.Params()))()
 
 		ctx = withRequestID(ctx)
 

private/buf/buflsp/file.go

@@ -31,7 +31,7 @@ import (
 	"github.com/bufbuild/buf/private/bufpkg/bufimage"
 	"github.com/bufbuild/buf/private/bufpkg/bufmodule"
 	"github.com/bufbuild/buf/private/pkg/ioext"
-	"github.com/bufbuild/buf/private/pkg/tracing"
+	"github.com/bufbuild/buf/private/pkg/zaputil"
 	"github.com/bufbuild/protocompile"
 	"github.com/bufbuild/protocompile/ast"
 	"github.com/bufbuild/protocompile/linker"
@@ -40,7 +40,6 @@ import (
 	"github.com/bufbuild/protocompile/reporter"
 	"github.com/google/uuid"
 	"go.lsp.dev/protocol"
-	"go.opentelemetry.io/otel/attribute"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
@@ -256,9 +255,7 @@ func (f *file) RefreshAST(ctx context.Context) bool {
 
 // PublishDiagnostics publishes all of this file's diagnostics to the LSP client.
 func (f *file) PublishDiagnostics(ctx context.Context) {
-	ctx, span := f.lsp.tracer.Start(ctx,
-		tracing.WithAttributes(attribute.String("uri", string(f.uri))))
-	defer span.End()
+	defer zaputil.DebugProfile(f.lsp.logger, zap.String("uri", string(f.uri)))()
 
 	f.lock.Lock(ctx)
 	defer f.lock.Unlock(ctx)
@@ -318,9 +315,7 @@ func (f *file) FindModule(ctx context.Context) {
 
 // IndexImports finds URIs for all of the files imported by this file.
 func (f *file) IndexImports(ctx context.Context) {
-	ctx, span := f.lsp.tracer.Start(ctx,
-		tracing.WithAttributes(attribute.String("uri", string(f.uri))))
-	defer span.End()
+	defer zaputil.DebugProfile(f.lsp.logger, zap.String("uri", string(f.uri)))()
 
 	unlock := f.lock.Lock(ctx)
 	defer unlock()
@@ -611,9 +606,7 @@ func (f *file) RunLints(ctx context.Context) bool {
 // IndexSymbols processes the AST of a file and generates symbols for each symbol in
 // the document.
 func (f *file) IndexSymbols(ctx context.Context) {
-	_, span := f.lsp.tracer.Start(ctx,
-		tracing.WithAttributes(attribute.String("uri", string(f.uri))))
-	defer span.End()
+	defer zaputil.DebugProfile(f.lsp.logger, zap.String("uri", string(f.uri)))()
 
 	unlock := f.lock.Lock(ctx)
 	defer unlock()

private/buf/bufmigrate/bufmigrate.go

@@ -25,7 +25,6 @@ import (
 	"github.com/bufbuild/buf/private/pkg/normalpath"
 	"github.com/bufbuild/buf/private/pkg/storage"
 	"github.com/bufbuild/buf/private/pkg/syserror"
-	"github.com/bufbuild/buf/private/pkg/tracing"
 	"go.uber.org/zap"
 )
 
@@ -78,14 +77,12 @@ type Migrator interface {
 // NewMigrator returns a new Migrator.
 func NewMigrator(
 	logger *zap.Logger,
-	tracer tracing.Tracer,
 	runner command.Runner,
 	moduleKeyProvider bufmodule.ModuleKeyProvider,
 	commitProvider bufmodule.CommitProvider,
 ) Migrator {
 	return newMigrator(
 		logger,
-		tracer,
 		runner,
 		moduleKeyProvider,
 		commitProvider,