style: coed cleanup and fix styling

internal/logging/accesslog/back_scanner_test.go

@@ -139,12 +139,12 @@ func logEntry() []byte {
 		Format: FormatJSON,
 	})
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Write([]byte("hello"))
+		_, _ = w.Write([]byte("hello"))
 	}))
 	srv.URL = "http://localhost:8080"
 	defer srv.Close()
 	// make a request to the server
-	req, _ := http.NewRequest("GET", srv.URL, nil)
+	req, _ := http.NewRequest(http.MethodGet, srv.URL, nil)
 	res := httptest.NewRecorder()
 	// server the request
 	srv.Config.Handler.ServeHTTP(res, req)
@@ -179,7 +179,10 @@ func TestReset(t *testing.T) {
 		t.Errorf("scanner error: %v", err)
 	}
 	expect.Equal(t, linesRead, nLines)
-	s.Reset()
+	err = s.Reset()
+	if err != nil {
+		t.Errorf("failed to reset scanner: %v", err)
+	}
 
 	linesRead = 0
 	for s.Scan() {
@@ -191,7 +194,7 @@ func TestReset(t *testing.T) {
 	expect.Equal(t, linesRead, nLines)
 }
 
-// 100000 log entries
+// 100000 log entries.
 func BenchmarkBackScanner(b *testing.B) {
 	mockFile := NewMockFile()
 	line := logEntry()

internal/logging/accesslog/formatter.go

@@ -94,32 +94,6 @@ func (f *CombinedFormatter) AppendRequestLog(line []byte, req *http.Request, res
 	return line
 }
 
-type zeroLogStringStringMapMarshaler struct {
-	values map[string]string
-}
-
-func (z *zeroLogStringStringMapMarshaler) MarshalZerologObject(e *zerolog.Event) {
-	if len(z.values) == 0 {
-		return
-	}
-	for k, v := range z.values {
-		e.Str(k, v)
-	}
-}
-
-type zeroLogStringStringSliceMapMarshaler struct {
-	values map[string][]string
-}
-
-func (z *zeroLogStringStringSliceMapMarshaler) MarshalZerologObject(e *zerolog.Event) {
-	if len(z.values) == 0 {
-		return
-	}
-	for k, v := range z.values {
-		e.Strs(k, v)
-	}
-}
-
 func (f *JSONFormatter) AppendRequestLog(line []byte, req *http.Request, res *http.Response) []byte {
 	query := f.cfg.Query.ZerologQuery(req.URL.Query())
 	headers := f.cfg.Headers.ZerologHeaders(req.Header)

internal/logging/memlogger/mem_logger.go

@@ -27,10 +27,6 @@ type memLogger struct {
 
 type MemLogger io.Writer
 
-type buffer struct {
-	data []byte
-}
-
 const (
 	maxMemLogSize         = 16 * 1024
 	truncateSize          = maxMemLogSize / 2
@@ -59,64 +55,6 @@ func Events() (<-chan []byte, func()) {
 	return memLoggerInstance.events()
 }
 
-func (m *memLogger) truncateIfNeeded(n int) {
-	m.RLock()
-	needTruncate := m.Len()+n > maxMemLogSize
-	m.RUnlock()
-
-	if needTruncate {
-		m.Lock()
-		defer m.Unlock()
-		needTruncate = m.Len()+n > maxMemLogSize
-		if !needTruncate {
-			return
-		}
-
-		m.Truncate(truncateSize)
-	}
-}
-
-func (m *memLogger) notifyWS(pos, n int) {
-	if m.connChans.Size() == 0 && m.listeners.Size() == 0 {
-		return
-	}
-
-	timeout := time.NewTimer(3 * time.Second)
-	defer timeout.Stop()
-
-	m.notifyLock.RLock()
-	defer m.notifyLock.RUnlock()
-
-	m.connChans.Range(func(ch chan *logEntryRange, _ struct{}) bool {
-		select {
-		case ch <- &logEntryRange{pos, pos + n}:
-			return true
-		case <-timeout.C:
-			return false
-		}
-	})
-
-	if m.listeners.Size() > 0 {
-		msg := m.Buffer.Bytes()[pos : pos+n]
-		m.listeners.Range(func(ch chan []byte, _ struct{}) bool {
-			select {
-			case <-timeout.C:
-				return false
-			case ch <- msg:
-				return true
-			}
-		})
-	}
-}
-
-func (m *memLogger) writeBuf(b []byte) (pos int, err error) {
-	m.Lock()
-	defer m.Unlock()
-	pos = m.Len()
-	_, err = m.Buffer.Write(b)
-	return
-}
-
 // Write implements io.Writer.
 func (m *memLogger) Write(p []byte) (n int, err error) {
 	n = len(p)
@@ -159,6 +97,64 @@ func (m *memLogger) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	m.wsStreamLog(r.Context(), conn, logCh)
 }
 
+func (m *memLogger) truncateIfNeeded(n int) {
+	m.RLock()
+	needTruncate := m.Len()+n > maxMemLogSize
+	m.RUnlock()
+
+	if needTruncate {
+		m.Lock()
+		defer m.Unlock()
+		needTruncate = m.Len()+n > maxMemLogSize
+		if !needTruncate {
+			return
+		}
+
+		m.Truncate(truncateSize)
+	}
+}
+
+func (m *memLogger) notifyWS(pos, n int) {
+	if m.connChans.Size() == 0 && m.listeners.Size() == 0 {
+		return
+	}
+
+	timeout := time.NewTimer(3 * time.Second)
+	defer timeout.Stop()
+
+	m.notifyLock.RLock()
+	defer m.notifyLock.RUnlock()
+
+	m.connChans.Range(func(ch chan *logEntryRange, _ struct{}) bool {
+		select {
+		case ch <- &logEntryRange{pos, pos + n}:
+			return true
+		case <-timeout.C:
+			return false
+		}
+	})
+
+	if m.listeners.Size() > 0 {
+		msg := m.Bytes()[pos : pos+n]
+		m.listeners.Range(func(ch chan []byte, _ struct{}) bool {
+			select {
+			case <-timeout.C:
+				return false
+			case ch <- msg:
+				return true
+			}
+		})
+	}
+}
+
+func (m *memLogger) writeBuf(b []byte) (pos int, err error) {
+	m.Lock()
+	defer m.Unlock()
+	pos = m.Len()
+	_, err = m.Buffer.Write(b)
+	return
+}
+
 func (m *memLogger) events() (logs <-chan []byte, cancel func()) {
 	ch := make(chan []byte)
 	m.notifyLock.Lock()
@@ -181,7 +177,7 @@ func (m *memLogger) wsInitial(ctx context.Context, conn *websocket.Conn) error {
 	m.Lock()
 	defer m.Unlock()
 
-	return m.writeBytes(ctx, conn, m.Buffer.Bytes())
+	return m.writeBytes(ctx, conn, m.Bytes())
 }
 
 func (m *memLogger) wsStreamLog(ctx context.Context, conn *websocket.Conn, ch <-chan *logEntryRange) {
@@ -191,7 +187,7 @@ func (m *memLogger) wsStreamLog(ctx context.Context, conn *websocket.Conn, ch <-
 			return
 		case logRange := <-ch:
 			m.RLock()
-			msg := m.Buffer.Bytes()[logRange.Start:logRange.End]
+			msg := m.Bytes()[logRange.Start:logRange.End]
 			err := m.writeBytes(ctx, conn, msg)
 			m.RUnlock()
 			if err != nil {