gopls/internal/server: fix event labels after the big rename

The old names predate the big directory renaming we did about a year ago. For the record: why can't these event.Start calls be emitted by the generated server handler code? Two reasons: 1) they sometimes have arguments specific to the call; and 2) they cover only the handler proper, but not the time to send the RPC reply message. Had they been automatically generated in the caller, some care would be required to exclude the RPC reply time. Change-Id: I290537579200aab162ac06522a482b4f4e4f7a28 Reviewed-on: https://go-review.googlesource.com/c/tools/+/663135 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Jonathan Amsterdam <jba@google.com> Auto-Submit: Alan Donovan <adonovan@google.com>

Author: adonovan

gopls/internal/server/call_hierarchy.go

@@ -14,7 +14,7 @@ import (
 )
 
 func (s *server) PrepareCallHierarchy(ctx context.Context, params *protocol.CallHierarchyPrepareParams) ([]protocol.CallHierarchyItem, error) {
-ctx, done := event.Start(ctx, "lsp.Server.prepareCallHierarchy")
+ctx, done := event.Start(ctx, "server.PrepareCallHierarchy")
 defer done()
 
 fh, snapshot, release, err := s.fileOf(ctx, params.TextDocument.URI)
@@ -29,7 +29,7 @@ func (s *server) PrepareCallHierarchy(ctx context.Context, params *protocol.Call
 }
 
 func (s *server) IncomingCalls(ctx context.Context, params *protocol.CallHierarchyIncomingCallsParams) ([]protocol.CallHierarchyIncomingCall, error) {
-ctx, done := event.Start(ctx, "lsp.Server.incomingCalls")
+ctx, done := event.Start(ctx, "server.IncomingCalls")
 defer done()
 
 fh, snapshot, release, err := s.fileOf(ctx, params.Item.URI)
@@ -44,7 +44,7 @@ func (s *server) IncomingCalls(ctx context.Context, params *protocol.CallHierarc
 }
 
 func (s *server) OutgoingCalls(ctx context.Context, params *protocol.CallHierarchyOutgoingCallsParams) ([]protocol.CallHierarchyOutgoingCall, error) {
-ctx, done := event.Start(ctx, "lsp.Server.outgoingCalls")
+ctx, done := event.Start(ctx, "server.OutgoingCalls")
 defer done()
 
 fh, snapshot, release, err := s.fileOf(ctx, params.Item.URI)

gopls/internal/server/code_action.go

@@ -22,7 +22,7 @@ import (
 )
 
 func (s *server) CodeAction(ctx context.Context, params *protocol.CodeActionParams) ([]protocol.CodeAction, error) {
-ctx, done := event.Start(ctx, "lsp.Server.codeAction")
+ctx, done := event.Start(ctx, "server.CodeAction")
 defer done()
 
 fh, snapshot, release, err := s.fileOf(ctx, params.TextDocument.URI)
@@ -225,7 +225,7 @@ func triggerKind(params *protocol.CodeActionParams) protocol.CodeActionTriggerKi
 // This feature allows capable clients to preview and selectively apply the diff
 // instead of applying the whole thing unconditionally through workspace/applyEdit.
 func (s *server) ResolveCodeAction(ctx context.Context, ca *protocol.CodeAction) (*protocol.CodeAction, error) {
-ctx, done := event.Start(ctx, "lsp.Server.resolveCodeAction")
+ctx, done := event.Start(ctx, "server.ResolveCodeAction")
 defer done()
 
 // Only resolve the code action if there is Data provided.

gopls/internal/server/code_lens.go

@@ -22,7 +22,7 @@ import (
 // CodeLens reports the set of available CodeLenses
 // (range-associated commands) in the given file.
 func (s *server) CodeLens(ctx context.Context, params *protocol.CodeLensParams) ([]protocol.CodeLens, error) {
-ctx, done := event.Start(ctx, "lsp.Server.codeLens", label.URI.Of(params.TextDocument.URI))
+ctx, done := event.Start(ctx, "server.CodeLens", label.URI.Of(params.TextDocument.URI))
 defer done()
 
 fh, snapshot, release, err := s.fileOf(ctx, params.TextDocument.URI)

gopls/internal/server/command.go

@@ -47,7 +47,7 @@ import (
 )
 
 func (s *server) ExecuteCommand(ctx context.Context, params *protocol.ExecuteCommandParams) (any, error) {
-ctx, done := event.Start(ctx, "lsp.Server.executeCommand")
+ctx, done := event.Start(ctx, "server.ExecuteCommand")
 defer done()
 
 // For test synchronization, always create a progress notification.
@@ -1652,7 +1652,7 @@ func (c *commandHandler) DiagnoseFiles(ctx context.Context, args command.Diagnos
 // Though note that implementing pull diagnostics may cause some servers to
 // request diagnostics in an ad-hoc manner, and break our intentional pacing.
 
-ctx, done := event.Start(ctx, "lsp.server.DiagnoseFiles")
+ctx, done := event.Start(ctx, "commandHandler.DiagnoseFiles")
 defer done()
 
 snapshots := make(map[*cache.Snapshot]bool)

gopls/internal/server/completion.go

@@ -27,7 +27,7 @@ func (s *server) Completion(ctx context.Context, params *protocol.CompletionPara
 recordLatency(ctx, rerr)
 }()
 
-ctx, done := event.Start(ctx, "lsp.Server.completion", label.URI.Of(params.TextDocument.URI))
+ctx, done := event.Start(ctx, "server.Completion", label.URI.Of(params.TextDocument.URI))
 defer done()
 
 fh, snapshot, release, err := s.fileOf(ctx, params.TextDocument.URI)

gopls/internal/server/definition.go

@@ -24,7 +24,7 @@ func (s *server) Definition(ctx context.Context, params *protocol.DefinitionPara
 recordLatency(ctx, rerr)
 }()
 
-ctx, done := event.Start(ctx, "lsp.Server.definition", label.URI.Of(params.TextDocument.URI))
+ctx, done := event.Start(ctx, "server.Definition", label.URI.Of(params.TextDocument.URI))
 defer done()
 
 // TODO(rfindley): definition requests should be multiplexed across all views.
@@ -46,7 +46,7 @@ func (s *server) Definition(ctx context.Context, params *protocol.DefinitionPara
 }
 
 func (s *server) TypeDefinition(ctx context.Context, params *protocol.TypeDefinitionParams) ([]protocol.Location, error) {
-ctx, done := event.Start(ctx, "lsp.Server.typeDefinition", label.URI.Of(params.TextDocument.URI))
+ctx, done := event.Start(ctx, "server.TypeDefinition", label.URI.Of(params.TextDocument.URI))
 defer done()
 
 // TODO(rfindley): type definition requests should be multiplexed across all views.

gopls/internal/server/diagnostics.go

@@ -200,7 +200,7 @@ func (s *server) diagnoseChangedViews(ctx context.Context, modID uint64, lastCha
 // snapshot (or a subsequent snapshot in the same View) is eventually
 // diagnosed.
 func (s *server) diagnoseSnapshot(ctx context.Context, snapshot *cache.Snapshot, changedURIs []protocol.DocumentURI, delay time.Duration) {
-ctx, done := event.Start(ctx, "Server.diagnoseSnapshot", snapshot.Labels()...)
+ctx, done := event.Start(ctx, "server.diagnoseSnapshot", snapshot.Labels()...)
 defer done()
 
 if delay > 0 {
@@ -241,7 +241,7 @@ func (s *server) diagnoseSnapshot(ctx context.Context, snapshot *cache.Snapshot,
 }
 
 func (s *server) diagnoseChangedFiles(ctx context.Context, snapshot *cache.Snapshot, uris []protocol.DocumentURI) (diagMap, error) {
-ctx, done := event.Start(ctx, "Server.diagnoseChangedFiles", snapshot.Labels()...)
+ctx, done := event.Start(ctx, "server.diagnoseChangedFiles", snapshot.Labels()...)
 defer done()
 
 toDiagnose := make(map[metadata.PackageID]*metadata.Package)
@@ -311,7 +311,7 @@ func (s *server) diagnoseChangedFiles(ctx context.Context, snapshot *cache.Snaps
 }
 
 func (s *server) diagnose(ctx context.Context, snapshot *cache.Snapshot) (diagMap, error) {
-ctx, done := event.Start(ctx, "Server.diagnose", snapshot.Labels()...)
+ctx, done := event.Start(ctx, "server.diagnose", snapshot.Labels()...)
 defer done()
 
 // Wait for a free diagnostics slot.
@@ -640,7 +640,7 @@ func (s *server) updateCriticalErrorStatus(ctx context.Context, snapshot *cache.
 // updateDiagnostics records the result of diagnosing a snapshot, and publishes
 // any diagnostics that need to be updated on the client.
 func (s *server) updateDiagnostics(ctx context.Context, snapshot *cache.Snapshot, diagnostics diagMap, final bool) {
-ctx, done := event.Start(ctx, "Server.publishDiagnostics")
+ctx, done := event.Start(ctx, "server.publishDiagnostics")
 defer done()
 
 s.diagnosticsMu.Lock()

gopls/internal/server/folding_range.go

@@ -15,7 +15,7 @@ import (
 )
 
 func (s *server) FoldingRange(ctx context.Context, params *protocol.FoldingRangeParams) ([]protocol.FoldingRange, error) {
-ctx, done := event.Start(ctx, "lsp.Server.foldingRange", label.URI.Of(params.TextDocument.URI))
+ctx, done := event.Start(ctx, "server.FoldingRange", label.URI.Of(params.TextDocument.URI))
 defer done()
 
 fh, snapshot, release, err := s.fileOf(ctx, params.TextDocument.URI)

gopls/internal/server/format.go

@@ -17,7 +17,7 @@ import (
 )
 
 func (s *server) Formatting(ctx context.Context, params *protocol.DocumentFormattingParams) ([]protocol.TextEdit, error) {
-ctx, done := event.Start(ctx, "lsp.Server.formatting", label.URI.Of(params.TextDocument.URI))
+ctx, done := event.Start(ctx, "server.Formatting", label.URI.Of(params.TextDocument.URI))
 defer done()
 
 fh, snapshot, release, err := s.fileOf(ctx, params.TextDocument.URI)

gopls/internal/server/general.go

@@ -38,7 +38,7 @@ import (
 )
 
 func (s *server) Initialize(ctx context.Context, params *protocol.ParamInitialize) (*protocol.InitializeResult, error) {
-ctx, done := event.Start(ctx, "lsp.Server.initialize")
+ctx, done := event.Start(ctx, "server.Initialize")
 defer done()
 
 var clientName string
@@ -208,7 +208,7 @@ func (s *server) Initialize(ctx context.Context, params *protocol.ParamInitializ
 }
 
 func (s *server) Initialized(ctx context.Context, params *protocol.InitializedParams) error {
-ctx, done := event.Start(ctx, "lsp.Server.initialized")
+ctx, done := event.Start(ctx, "server.Initialized")
 defer done()
 
 s.stateMu.Lock()
@@ -635,7 +635,7 @@ func (s *server) fileOf(ctx context.Context, uri protocol.DocumentURI) (file.Han
 // Shutdown implements the 'shutdown' LSP handler. It releases resources
 // associated with the server and waits for all ongoing work to complete.
 func (s *server) Shutdown(ctx context.Context) error {
-ctx, done := event.Start(ctx, "lsp.Server.shutdown")
+ctx, done := event.Start(ctx, "server.Shutdown")
 defer done()
 
 s.stateMu.Lock()
@@ -662,7 +662,7 @@ func (s *server) Shutdown(ctx context.Context) error {
 }
 
 func (s *server) Exit(ctx context.Context) error {
-ctx, done := event.Start(ctx, "lsp.Server.exit")
+ctx, done := event.Start(ctx, "server.Exit")
 defer done()
 
 s.stateMu.Lock()