gopls/internal/regtest: eliminate log duplication
The regtest runner currently logs every framed connection, which results
in duplicate RPC tracing (one from the client perspective, one from the
server perspective).
This is unnecessarily noisy. Just log the first connection (currently
from the client perspective).
Change-Id: I4164cde8263e4267e4e45369bd54176c782c4707
Reviewed-on: https://go-review.googlesource.com/c/tools/+/270357
Run-TryBot: Robert Findley <rfindley@google.com>
gopls-CI: kokoro <noreply+kokoro@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Trust: Robert Findley <rfindley@google.com>
Reviewed-by: Heschi Kreinick <heschi@google.com>
Reviewed-by: Peter Weinberger <pjw@google.com>
diff --git a/gopls/internal/regtest/runner.go b/gopls/internal/regtest/runner.go
index b9d646e..6ec6ed1 100644
--- a/gopls/internal/regtest/runner.go
+++ b/gopls/internal/regtest/runner.go
@@ -321,8 +321,8 @@
}
type loggingFramer struct {
- mu sync.Mutex
- buffers []*safeBuffer
+ mu sync.Mutex
+ buf *safeBuffer
}
// safeBuffer is a threadsafe buffer for logs.
@@ -340,11 +340,17 @@
func (s *loggingFramer) framer(f jsonrpc2.Framer) jsonrpc2.Framer {
return func(nc net.Conn) jsonrpc2.Stream {
s.mu.Lock()
- buf := &safeBuffer{buf: bytes.Buffer{}}
- s.buffers = append(s.buffers, buf)
+ framed := false
+ if s.buf == nil {
+ s.buf = &safeBuffer{buf: bytes.Buffer{}}
+ framed = true
+ }
s.mu.Unlock()
stream := f(nc)
- return protocol.LoggingStream(stream, buf)
+ if framed {
+ return protocol.LoggingStream(stream, s.buf)
+ }
+ return stream
}
}
@@ -352,13 +358,14 @@
s.mu.Lock()
defer s.mu.Unlock()
- for i, buf := range s.buffers {
- fmt.Fprintf(os.Stderr, "#### Start Gopls Test Logs %d of %d for %q\n", i+1, len(s.buffers), testname)
- buf.mu.Lock()
- io.Copy(w, &buf.buf)
- buf.mu.Unlock()
- fmt.Fprintf(os.Stderr, "#### End Gopls Test Logs %d of %d for %q\n", i+1, len(s.buffers), testname)
+ if s.buf == nil {
+ return
}
+ fmt.Fprintf(os.Stderr, "#### Start Gopls Test Logs for %q\n", testname)
+ s.buf.mu.Lock()
+ io.Copy(w, &s.buf.buf)
+ s.buf.mu.Unlock()
+ fmt.Fprintf(os.Stderr, "#### End Gopls Test Logs for %q\n", testname)
}
func singletonServer(ctx context.Context, t *testing.T) jsonrpc2.StreamServer {
