Merge branch 'main' into main

contrib/log/zap/zap.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
 
 	"github.com/go-kratos/kratos/v2/log"
 )
@@ -32,6 +33,11 @@ func NewLogger(zlog *zap.Logger) *Logger {
 }
 
 func (l *Logger) Log(level log.Level, keyvals ...interface{}) error {
+	// If logging at this level is completely disabled, skip the overhead of
+	// string formatting.
+	if zapcore.Level(level) < zapcore.DPanicLevel && !l.log.Core().Enabled(zapcore.Level(level)) {
+		return nil
+	}
 	var (
 		msg    = ""
 		keylen = len(keyvals)

transport/http/client_test.go

@@ -42,6 +42,15 @@ func (x *mockCallOption) after(_ *callInfo, _ *csAttempt) {
 	log.Println("run in mockCallOption.after")
 }
 
+func TestWithSubset(t *testing.T) {
+	co := &clientOptions{}
+	o := WithSubset(1)
+	o(co)
+	if co.subsetSize != 1 {
+		t.Error("expected subset size to be 1")
+	}
+}
+
 func TestWithTransport(t *testing.T) {
 	ov := &mockRoundTripper{}
 	o := WithTransport(ov)
@@ -71,10 +80,6 @@ func TestWithBlock(t *testing.T) {
 	}
 }
 
-func TestWithBalancer(_ *testing.T) {
-	// TODO
-}
-
 func TestWithTLSConfig(t *testing.T) {
 	ov := &tls.Config{}
 	o := WithTLSConfig(ov)

transport/http/server_test.go

@@ -308,10 +308,6 @@ func TestTimeout(t *testing.T) {
 	}
 }
 
-func TestLogger(_ *testing.T) {
-	// TODO
-}
-
 func TestRequestDecoder(t *testing.T) {
 	o := &Server{}
 	v := func(*http.Request, interface{}) error { return nil }