Log server version and attached clients

Author: stefanvanburen

private/buf/buflsp/buflsp.go

@@ -21,11 +21,13 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
+	"runtime/debug"
 	"sync"
 	"sync/atomic"
 
 	"buf.build/go/app/appext"
 	"buf.build/go/standard/xlog/xslog"
+	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufctl"
 	"github.com/bufbuild/buf/private/pkg/storage"
 	"github.com/bufbuild/buf/private/pkg/wasm"
@@ -49,15 +51,23 @@ func Serve(
 	stream jsonrpc2.Stream,
 	queryExecutor *incremental.Executor,
 ) (jsonrpc2.Conn, error) {
+	logger := container.Logger()
+	version := bufcli.Version
+	if buildInfo, ok := debug.ReadBuildInfo(); ok && buildInfo.Main.Version != "" {
+		version = buildInfo.Main.Version
+	}
+	logger = logger.With(slog.String("buf_version", version))
+	logger.Info("starting LSP server")
+
 	conn := jsonrpc2.NewConn(stream)
 	lsp := &lsp{
 		conn: conn,
 		client: protocol.ClientDispatcher(
-			&connWrapper{Conn: conn, logger: container.Logger()},
+			&connWrapper{Conn: conn, logger: logger},
 			zap.NewNop(), // The logging from protocol itself isn't very good, we've replaced it with connAdapter here.
 		),
 		container:     container,
-		logger:        container.Logger(),
+		logger:        logger,
 		controller:    controller,
 		wasmRuntime:   wasmRuntime,
 		wktBucket:     wktBucket,

private/buf/buflsp/server.go

@@ -25,6 +25,7 @@ import (
 
 	celpv "buf.build/go/protovalidate/cel"
 	"buf.build/go/standard/xslices"
+	"github.com/bufbuild/buf/private/buf/bufcli"
 	"github.com/bufbuild/buf/private/buf/bufformat"
 	"github.com/bufbuild/protocompile/parser"
 	"github.com/bufbuild/protocompile/reporter"
@@ -93,9 +94,24 @@ func (s *server) Initialize(
 		return nil, err
 	}
 
+	if params.ClientInfo != nil {
+		s.logger.Info(
+			"client attached",
+			"client_name", params.ClientInfo.Name,
+			"client_version", params.ClientInfo.Version,
+		)
+	}
+
+	// Set initial trace value, if provided.
+	if params.Trace != "" {
+		s.lsp.traceValue.Store(&params.Trace)
+	}
+
 	info := &protocol.ServerInfo{Name: serverName}
 	if buildInfo, ok := debug.ReadBuildInfo(); ok {
 		info.Version = buildInfo.Main.Version
+	} else {
+		info.Version = bufcli.Version
 	}
 
 	// The LSP protocol library doesn't actually provide SemanticTokensOptions