Remove read timeout log from critical section

Author: fbiville

neo4j/internal/bolt/bolt3.go

@@ -97,8 +97,6 @@ func NewBolt3(serverName string, conn net.Conn, logger log.Logger, boltLog log.B
 				boltLogger: boltLog,
 			},
 			connReadTimeout: -1,
-			logger:          logger,
-			logName:         log.Bolt3,
 		},
 		birthDate: time.Now(),
 		log:       logger,
@@ -199,7 +197,6 @@ func (b *bolt3) connect(minor int, auth map[string]interface{}, userAgent string
 	b.connId = succ.connectionId
 	connectionLogId := fmt.Sprintf("%s@%s", b.connId, b.serverName)
 	b.logId = connectionLogId
-	b.in.logId = connectionLogId
 	b.in.hyd.logId = connectionLogId
 	b.out.logId = connectionLogId
 	b.serverVersion = succ.server

neo4j/internal/bolt/bolt3server_test.go

@@ -91,7 +91,7 @@ func (s *bolt3server) waitForHello() {
 }
 
 func (s *bolt3server) receiveMsg() *testStruct {
-	_, buf, err := dechunkMessage(s.conn, []byte{}, -1, nil, "", "")
+	_, buf, err := dechunkMessage(s.conn, []byte{}, -1)
 	if err != nil {
 		panic(err)
 	}

neo4j/internal/bolt/bolt4.go

@@ -114,8 +114,6 @@ func NewBolt4(serverName string, conn net.Conn, logger log.Logger, boltLog log.B
 				boltLogger: boltLog,
 			},
 			connReadTimeout: -1,
-			logger:          logger,
-			logName:         log.Bolt4,
 		},
 	}
 	b.out = outgoing{
@@ -271,7 +269,6 @@ func (b *bolt4) connect(minor int, auth map[string]interface{}, userAgent string
 	connectionLogId := fmt.Sprintf("%s@%s", b.connId, b.serverName)
 	b.logId = connectionLogId
 	b.in.hyd.logId = connectionLogId
-	b.in.logId = connectionLogId
 	b.out.logId = connectionLogId
 
 	b.initializeReadTimeoutHint(succ.configurationHints)

neo4j/internal/bolt/bolt4server_test.go

@@ -104,7 +104,7 @@ func (s *bolt4server) waitForHello() map[string]interface{} {
 }
 
 func (s *bolt4server) receiveMsg() *testStruct {
-	_, buf, err := dechunkMessage(s.conn, []byte{}, -1, nil, "", "")
+	_, buf, err := dechunkMessage(s.conn, []byte{}, -1)
 	if err != nil {
 		panic(err)
 	}

neo4j/internal/bolt/chunker_test.go

@@ -81,7 +81,7 @@ func TestChunker(ot *testing.T) {
 
 	receiveAndAssertMessage := func(t *testing.T, conn net.Conn, expected []byte) {
 		t.Helper()
-		_, msg, err := dechunkMessage(conn, []byte{}, -1, nil, "", "")
+		_, msg, err := dechunkMessage(conn, []byte{}, -1)
 		AssertNoError(t, err)
 		assertSlices(t, msg, expected)
 	}

neo4j/internal/bolt/dechunker.go

@@ -23,7 +23,6 @@ import (
 	"context"
 	"encoding/binary"
 	rio "github.com/neo4j/neo4j-go-driver/v4/neo4j/internal/racingio"
-	"github.com/neo4j/neo4j-go-driver/v4/neo4j/log"
 	"net"
 	"time"
 )
@@ -34,21 +33,15 @@ import (
 // Reads will race against the provided context ctx
 // If the server provides the connection read timeout hint readTimeout, a new context will be created from that timeout
 // and the user-provided context ctx before every read
-func dechunkMessage(
-	conn net.Conn,
-	msgBuf []byte,
-	readTimeout time.Duration,
-	logger log.Logger,
-	logName string,
-	logId string) ([]byte, []byte, error) {
+func dechunkMessage(conn net.Conn, msgBuf []byte, readTimeout time.Duration) ([]byte, []byte, error) {
 
 	sizeBuf := []byte{0x00, 0x00}
 	off := 0
 
 	reader := rio.NewRacingReader(conn)
 
 	for {
-		updatedCtx, cancelFunc := newContext(readTimeout, logger, logName, logId)
+		updatedCtx, cancelFunc := newContext(readTimeout)
 		_, err := reader.ReadFull(updatedCtx, sizeBuf)
 		if err != nil {
 			return msgBuf, nil, err
@@ -72,7 +65,7 @@ func dechunkMessage(
 			msgBuf = newMsgBuf
 		}
 		// Read the chunk into buffer
-		updatedCtx, cancelFunc = newContext(readTimeout, logger, logName, logId)
+		updatedCtx, cancelFunc = newContext(readTimeout)
 		_, err = reader.ReadFull(updatedCtx, msgBuf[off:(off+chunkSize)])
 		if err != nil {
 			return msgBuf, nil, err
@@ -85,29 +78,10 @@ func dechunkMessage(
 }
 
 // newContext computes a new context and cancel function if a readTimeout is set
-func newContext(
-	readTimeout time.Duration,
-	logger log.Logger,
-	logName string,
-	logId string) (context.Context, context.CancelFunc) {
-
+func newContext(readTimeout time.Duration) (context.Context, context.CancelFunc) {
 	ctx := context.Background()
 	if readTimeout >= 0 {
-		newCtx, cancelFunc := context.WithTimeout(ctx, readTimeout)
-		logger.Debugf(logName, logId,
-			"read timeout of %s applied, chunk read deadline is now: %s",
-			readTimeout.String(),
-			deadlineOf(newCtx),
-		)
-		return newCtx, cancelFunc
+		return context.WithTimeout(ctx, readTimeout)
 	}
 	return ctx, nil
 }
-
-func deadlineOf(ctx context.Context) string {
-	deadline, hasDeadline := ctx.Deadline()
-	if !hasDeadline {
-		return "N/A (no deadline set)"
-	}
-	return deadline.String()
-}

neo4j/internal/bolt/dechunker_test.go

@@ -22,7 +22,6 @@ package bolt
 import (
 	"bytes"
 	"encoding/binary"
-	"github.com/neo4j/neo4j-go-driver/v4/neo4j/log"
 	"net"
 	"reflect"
 	"testing"
@@ -82,7 +81,7 @@ func TestDechunker(t *testing.T) {
 		go func() {
 			AssertWriteSucceeds(t, cli, str.Bytes())
 		}()
-		buf, msgBuf, err = dechunkMessage(serv, buf, -1, nil, "", "")
+		buf, msgBuf, err = dechunkMessage(serv, buf, -1)
 		AssertNoError(t, err)
 		AssertLen(t, msgBuf, int(msg.size))
 		// Check content of buffer
@@ -122,7 +121,7 @@ func TestDechunkerWithTimeout(ot *testing.T) {
 			AssertWriteSucceeds(t, cli, []byte{0x00, 0x00})
 		}()
 		buffer := make([]byte, 2)
-		_, _, err := dechunkMessage(serv, buffer, timeout, log.Void{}, "", "")
+		_, _, err := dechunkMessage(serv, buffer, timeout)
 		AssertNoError(t, err)
 		AssertTrue(t, reflect.DeepEqual(buffer, []byte{0xCA, 0xFE}))
 	})
@@ -131,7 +130,7 @@ func TestDechunkerWithTimeout(ot *testing.T) {
 		serv, cli := net.Pipe()
 		defer closePipe(ot, serv, cli)
 
-		_, _, err := dechunkMessage(serv, nil, timeout, log.Void{}, "", "")
+		_, _, err := dechunkMessage(serv, nil, timeout)
 
 		AssertError(t, err)
 		AssertStringContain(t, err.Error(), "context deadline exceeded")

neo4j/internal/bolt/hydratedehydrate_test.go

@@ -56,7 +56,7 @@ func TestDehydrateHydrate(ot *testing.T) {
 		go func() {
 			out.send(cli)
 		}()
-		_, byts, err := dechunkMessage(serv, []byte{}, -1, nil, "", "")
+		_, byts, err := dechunkMessage(serv, []byte{}, -1)
 		if err != nil {
 			t.Fatal(err)
 		}

neo4j/internal/bolt/incoming.go

@@ -20,7 +20,6 @@
 package bolt
 
 import (
-	"github.com/neo4j/neo4j-go-driver/v4/neo4j/log"
 	"net"
 	"time"
 )
@@ -29,17 +28,12 @@ type incoming struct {
 	buf             []byte // Reused buffer
 	hyd             hydrator
 	connReadTimeout time.Duration
-	logger          log.Logger
-	logName         string
-	logId           string
 }
 
 func (i *incoming) next(rd net.Conn) (interface{}, error) {
-	// Get next message from transport layer
 	var err error
 	var msg []byte
-	i.buf, msg, err = dechunkMessage(rd, i.buf, i.connReadTimeout, i.logger,
-		i.logName, i.logId)
+	i.buf, msg, err = dechunkMessage(rd, i.buf, i.connReadTimeout)
 	if err != nil {
 		return nil, err
 	}

neo4j/internal/bolt/outgoing_test.go

@@ -109,7 +109,7 @@ func TestOutgoing(ot *testing.T) {
 		}()
 
 		// Dechunk it
-		_, byts, err := dechunkMessage(serv, []byte{}, -1, nil, "", "")
+		_, byts, err := dechunkMessage(serv, []byte{}, -1)
 		if err != nil {
 			t.Fatal(err)
 		}