WIP: 3PH

rpc/bench_test.go

@@ -76,7 +76,7 @@ func BenchmarkPingPong(b *testing.B) {
 	p1, p2 := net.Pipe()
 	srv := testcp.PingPong_ServerToClient(pingPongServer{})
 	conn1 := rpc.NewConn(rpc.NewStreamTransport(p2), &rpc.Options{
-		ErrorReporter:   testErrorReporter{tb: b},
+		Logger:          testErrorReporter{tb: b},
 		BootstrapClient: capnp.Client(srv),
 	})
 	defer func() {
@@ -86,7 +86,7 @@ func BenchmarkPingPong(b *testing.B) {
 		}
 	}()
 	conn2 := rpc.NewConn(rpc.NewStreamTransport(p1), &rpc.Options{
-		ErrorReporter: testErrorReporter{tb: b},
+		Logger: testErrorReporter{tb: b},
 	})
 	defer func() {
 		if err := conn2.Close(); err != nil {

rpc/errors.go

@@ -19,11 +19,35 @@ var (
 )
 
 type errReporter struct {
-	ErrorReporter
+	Logger Logger
+}
+
+func (er errReporter) Debug(msg string, args ...any) {
+	if er.Logger != nil {
+		er.Logger.Debug(msg, args...)
+	}
+}
+
+func (er errReporter) Info(msg string, args ...any) {
+	if er.Logger != nil {
+		er.Logger.Info(msg, args...)
+	}
+}
+
+func (er errReporter) Warn(msg string, args ...any) {
+	if er.Logger != nil {
+		er.Logger.Warn(msg, args...)
+	}
+}
+
+func (er errReporter) Error(msg string, args ...any) {
+	if er.Logger != nil {
+		er.Logger.Error(msg, args...)
+	}
 }
 
 func (er errReporter) ReportError(err error) {
-	if er.ErrorReporter != nil && err != nil {
-		er.ErrorReporter.ReportError(err)
+	if err != nil {
+		er.Error(err.Error())
 	}
 }