更新及提升test coverage

client/egrpc/component_test.go

@@ -7,14 +7,15 @@ import (
 	"net"
 	"testing"
 
-	"github.com/gotomicro/ego/core/elog"
-	"github.com/gotomicro/ego/internal/test/errcode"
-	"github.com/gotomicro/ego/internal/test/helloworld"
-	"github.com/gotomicro/ego/server/egrpc"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/test/bufconn"
 	"google.golang.org/protobuf/proto"
+
+	"github.com/gotomicro/ego/core/elog"
+	"github.com/gotomicro/ego/internal/test/errcode"
+	"github.com/gotomicro/ego/internal/test/helloworld"
+	"github.com/gotomicro/ego/server/egrpc"
 )
 
 var svc *egrpc.Component

client/egrpc/interceptor.go

@@ -319,7 +319,6 @@ func (c *Container) loggerUnaryClientInterceptor() grpc.UnaryClientInterceptor {
 			if value := tools.ContextValue(ctx, key); value != "" {
 				// 替换context
 				ctx = metadata.AppendToOutgoingContext(ctx, key, value)
-
 				// grpc metadata 存在同一个 key set 多次，客户端可通过日志排查这种错误使用。
 				if md, ok := metadata.FromOutgoingContext(ctx); ok {
 					fields = append(fields, elog.FieldCustomKeyValue(key, strings.Join(md[strings.ToLower(key)], ";")))
@@ -390,7 +389,10 @@ func customHeader(egoLogExtraKeys []string) grpc.UnaryClientInterceptor {
 	return func(ctx context.Context, method string, req, res interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
 		for _, key := range egoLogExtraKeys {
 			if value := tools.GrpcHeaderValue(ctx, key); value != "" {
-				ctx = transport.WithValue(ctx, key, value)
+				if ctx.Value(key) != nil {
+					ctx = context.WithValue(ctx, key, value)
+				}
+				//ctx = transport.WithValue(ctx, key, value)
 			}
 		}
 		return invoker(ctx, method, req, res, cc, opts...)

client/egrpc/interceptor_test.go

@@ -3,21 +3,22 @@ package egrpc
 import (
 	"bytes"
 	"context"
-	"io/ioutil"
+	"io"
 	"log"
 	"net/http/httptest"
 	"os"
 	"testing"
 	"time"
 
-	"github.com/gotomicro/ego/core/util/xtime"
-	"github.com/gotomicro/ego/internal/test/helloworld"
-	"github.com/gotomicro/ego/internal/tools"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/test/bufconn"
+
+	"github.com/gotomicro/ego/core/util/xtime"
+	"github.com/gotomicro/ego/internal/test/helloworld"
+	"github.com/gotomicro/ego/internal/tools"
 )
 
 func Test_customHeader(t *testing.T) {
@@ -138,7 +139,7 @@ func TestPrometheusUnary(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	text, err := ioutil.ReadAll(res.Body)
+	text, err := io.ReadAll(res.Body)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -184,8 +185,8 @@ type GreeterHeader struct {
 // SayHello ...
 func (g GreeterHeader) SayHello(context context.Context, request *helloworld.HelloRequest) (*helloworld.HelloResponse, error) {
 	appName := tools.GrpcHeaderValue(context, "app")
-	//cpu := tools.GrpcHeaderValue(context, "enable-cpu-usage")
-	//assert.Equal(g.t, "true", cpu)
+	// cpu := tools.GrpcHeaderValue(context, "enable-cpu-usage")
+	// assert.Equal(g.t, "true", cpu)
 	assert.Equal(g.t, "egrpc.test", appName)
 
 	return &helloworld.HelloResponse{

client/egrpc/resolver/resolver_registry_test.go

@@ -5,10 +5,11 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/gotomicro/ego/core/eregistry"
-	"github.com/gotomicro/ego/server"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/resolver"
+
+	"github.com/gotomicro/ego/core/eregistry"
+	"github.com/gotomicro/ego/server"
 )
 
 func TestResolver(t *testing.T) {
@@ -18,6 +19,7 @@ func TestResolver(t *testing.T) {
 			t: t,
 		},
 	}
+	assert.Equal(t, "test", builder.Scheme())
 	targetName := "test:///hello"
 	target, err := parseTarget(targetName)
 	assert.NoError(t, err)

client/ehttp/component_test.go

@@ -0,0 +1,21 @@
+package ehttp
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/gotomicro/ego/core/elog"
+)
+
+func TestNewComponent(t *testing.T) {
+	// Normal case
+	t.Run("Normal case", func(t *testing.T) {
+		config := &Config{Addr: "http://hello.com"}
+		logger := elog.DefaultLogger
+		component := newComponent("hello", config, logger)
+		assert.Equal(t, "hello", component.name)
+	})
+
+	// Other case...
+}

client/ehttp/config_test.go

@@ -0,0 +1,33 @@
+package ehttp
+
+import (
+	"reflect"
+	"runtime"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/gotomicro/ego/core/util/xtime"
+)
+
+func Test_DefaultConfig(t *testing.T) {
+	assert.True(t, reflect.DeepEqual(&Config{
+		Addr:                       "",
+		Debug:                      false,
+		RawDebug:                   false,
+		ReadTimeout:                xtime.Duration("2s"),
+		SlowLogThreshold:           xtime.Duration("500ms"),
+		IdleConnTimeout:            90 * time.Second,
+		MaxIdleConns:               100,
+		MaxIdleConnsPerHost:        runtime.GOMAXPROCS(0) + 1,
+		EnableTraceInterceptor:     true,
+		EnableKeepAlives:           true,
+		EnableAccessInterceptor:    false,
+		EnableAccessInterceptorRes: false,
+		EnableMetricInterceptor:    false,
+		PathRelabel:                nil,
+		cookieJar:                  nil,
+		httpClient:                 nil,
+	}, DefaultConfig()))
+}

client/ehttp/config_test/conf.toml

@@ -0,0 +1,5 @@
+[test]
+"name" = "hello"
+
+[test1]
+"name" = "world"

client/ehttp/container_test.go

@@ -0,0 +1,20 @@
+package ehttp
+
+import (
+	"os"
+	"testing"
+
+	"github.com/BurntSushi/toml"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/gotomicro/ego/core/econf"
+)
+
+func TestLoad(t *testing.T) {
+	file, err := os.Open("./config_test/conf.toml")
+	assert.NoError(t, err)
+	err = econf.LoadFromReader(file, toml.Unmarshal)
+	assert.NoError(t, err)
+	container := Load("test").Build().name
+	assert.Equal(t, "test", container)
+}

client/ehttp/interceptor.go

@@ -2,8 +2,6 @@ package ehttp
 
 import (
 	"context"
-	"github.com/gotomicro/ego/core/transport"
-	"github.com/spf13/cast"
 	"log"
 	"net/http"
 	"net/url"
@@ -12,6 +10,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/gotomicro/ego/core/transport"
+	"github.com/spf13/cast"
+
 	"github.com/go-resty/resty/v2"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
@@ -58,7 +59,7 @@ func logAccess(name string, config *Config, logger *elog.Component, req *resty.R
 
 	// 支持自定义log
 	for _, key := range loggerKeys {
-		if value := transport.Value(req.Context(), key); value != nil {
+		if value := req.Context().Value(key); value != nil {
 			fields = append(fields, elog.FieldCustomKeyValue(key, cast.ToString(value)))
 		}
 	}
@@ -138,6 +139,17 @@ func fixedInterceptor(name string, config *Config, logger *elog.Component, build
 }
 
 func logInterceptor(name string, config *Config, logger *elog.Component, builder resolver.Resolver) (resty.RequestMiddleware, resty.ResponseMiddleware, resty.ErrorHook) {
+	loggerKeys := transport.CustomContextKeys()
+	beforeFn := func(cli *resty.Client, req *resty.Request) error {
+		// 增加header
+		for _, key := range loggerKeys {
+			if value := req.Context().Value(key); value != nil {
+				req.SetHeader(key, cast.ToString(value))
+			}
+		}
+		return nil
+	}
+
 	afterFn := func(cli *resty.Client, response *resty.Response) error {
 		logAccess(name, config, logger, response.Request, response, nil)
 		return nil
@@ -149,7 +161,7 @@ func logInterceptor(name string, config *Config, logger *elog.Component, builder
 			logAccess(name, config, logger, req, nil, err)
 		}
 	}
-	return nil, afterFn, errorFn
+	return beforeFn, afterFn, errorFn
 }
 
 func metricInterceptor(name string, config *Config, logger *elog.Component, builder resolver.Resolver) (resty.RequestMiddleware, resty.ResponseMiddleware, resty.ErrorHook) {

client/ehttp/interceptor_test.go

@@ -0,0 +1,74 @@
+package ehttp
+
+import (
+	"context"
+	"net/url"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/go-resty/resty/v2"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/gotomicro/ego/core/elog"
+)
+
+func TestLogAccess(t *testing.T) {
+	name := "test"
+	config := &Config{}
+	logger := &elog.Component{}
+	u, err := url.Parse("https://hello.com/xxx")
+	assert.NoError(t, err)
+	ctx := context.WithValue(context.Background(), urlKey{}, u)
+	req := resty.New().R().SetContext(ctx)
+	res := &resty.Response{}
+	logAccess(name, config, logger, req, res, err)
+	assert.NoError(t, err)
+}
+
+func TestBeg(t *testing.T) {
+	ctx := context.Background()
+	now := time.Now()
+	ctx = context.WithValue(ctx, begKey{}, now)
+
+	result := beg(ctx)
+	assert.Equal(t, now, result)
+}
+
+type CustomResolver struct {
+	Address string
+}
+
+func (r *CustomResolver) GetAddr() string {
+	return r.Address
+}
+
+func TestFixedInterceptor(t *testing.T) {
+	name := "test"
+	config := &Config{}
+	logger := &elog.Component{}
+	builder := &CustomResolver{Address: "https://test.com"}
+
+	client := resty.New()
+	request := client.R()
+	request.SetContext(context.Background())
+	request.URL = "https://hello.com/world"
+	middleware, _, _ := fixedInterceptor(name, config, logger, builder)
+
+	// case 1
+	config.Addr = ""
+	err := middleware(client, request)
+	assert.NoError(t, err)
+
+	// case 2
+	config.Addr = "https://xxxxx.com/xxx"
+	err = middleware(client, request)
+	assert.NoError(t, err)
+	assert.Equal(t, "https://test.com", client.HostURL)
+}
+
+func TestFileWithLineNum(t *testing.T) {
+	file := "/usr/local/go/src/testing/testing.go"
+	got := fileWithLineNum()
+	assert.True(t, true, strings.HasPrefix(got, file))
+}

client/ehttp/options_test.go

@@ -0,0 +1,53 @@
+package ehttp
+
+import (
+	"reflect"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestOptions(t *testing.T) {
+	c := &Container{
+		config: &Config{},
+	}
+	expectedAddr := "127.0.0.1:8080"
+	expectedReadTimeOut := time.Duration(5)
+	expectedSlowLogThreshold := time.Duration(5)
+	expectedIdleConnTimeOut := time.Duration(5)
+
+	WithAddr(expectedAddr)(c)
+	WithDebug(true)(c)
+	WithRawDebug(false)(c)
+	WithReadTimeout(expectedReadTimeOut)(c)
+	WithSlowLogThreshold(expectedSlowLogThreshold)(c)
+	WithIdleConnTimeout(expectedIdleConnTimeOut)(c)
+	WithMaxIdleConns(3)(c)
+	WithMaxIdleConnsPerHost(3)(c)
+	WithEnableTraceInterceptor(true)(c)
+	WithEnableKeepAlives(true)(c)
+	WithEnableMetricInterceptor(true)(c)
+	WithEnableAccessInterceptor(true)(c)
+	WithEnableAccessInterceptorRes(true)(c)
+	WithPathRelabel("hello", "test")(c)
+	WithJar(nil)(c)
+	WithHTTPClient(nil)(c)
+
+	assert.Equal(t, expectedAddr, c.config.Addr)
+	assert.Equal(t, true, c.config.Debug)
+	assert.Equal(t, false, c.config.RawDebug)
+	assert.Equal(t, expectedReadTimeOut, c.config.ReadTimeout)
+	assert.Equal(t, expectedSlowLogThreshold, c.config.SlowLogThreshold)
+	assert.Equal(t, expectedIdleConnTimeOut, c.config.IdleConnTimeout)
+	assert.Equal(t, 3, c.config.MaxIdleConns)
+	assert.Equal(t, 3, c.config.MaxIdleConnsPerHost)
+	assert.Equal(t, true, c.config.EnableTraceInterceptor)
+	assert.Equal(t, true, c.config.EnableKeepAlives)
+	assert.Equal(t, true, c.config.EnableMetricInterceptor)
+	assert.Equal(t, true, c.config.EnableAccessInterceptor)
+	assert.Equal(t, true, c.config.EnableAccessInterceptorRes)
+	reflect.DeepEqual(Relabel{Match: "hello", Replacement: "test"}, c.config.PathRelabel)
+	assert.Equal(t, nil, c.config.cookieJar)
+	reflect.DeepEqual(nil, c.config.httpClient)
+}