Merge branch 'feat/dialer_name' of https://github.com/FGYFFFF/hertz i…

…nto feat/dialer_name

pkg/app/client/client.go

@@ -45,6 +45,8 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"reflect"
+	"strings"
 	"sync"
 	"time"
 
@@ -540,6 +542,30 @@ func (c *Client) SetClientFactory(cf suite.ClientFactory) {
 	c.clientFactory = cf
 }
 
+// GetDialerName returns the name of the dialer
+func (c *Client) GetDialerName() (dName string, err error) {
+	defer func() {
+		err := recover()
+		if err != nil {
+			dName = "unknown"
+		}
+	}()
+
+	opt := c.GetOptions()
+	if opt == nil || opt.Dialer == nil {
+		return "", fmt.Errorf("abnormal process: there is no client options or dialer")
+	}
+
+	dName = reflect.TypeOf(opt.Dialer).String()
+	dSlice := strings.Split(dName, ".")
+	dName = dSlice[0]
+	if dName[0] == '*' {
+		dName = dName[1:]
+	}
+
+	return
+}
+
 // NewClient return a client with options
 func NewClient(opts ...config.ClientOption) (*Client, error) {
 	opt := config.NewClientOptions(opts)

pkg/app/client/client_test.go

@@ -1879,3 +1879,41 @@ func newMockDialerWithCustomFunc(network, address string, timeout time.Duration,
 		timeout:          timeout,
 	}
 }
+
+func TestClientDialerName(t *testing.T) {
+	client, _ := NewClient()
+	dName, err := client.GetDialerName()
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if dName != "netpoll" {
+		t.Errorf("expected 'netpoll', but get %s", dName)
+	}
+
+	client, _ = NewClient(WithDialer(standard.NewDialer()))
+	dName, err = client.GetDialerName()
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if dName != "standard" {
+		t.Errorf("expected 'standard', but get %s", dName)
+	}
+
+	client, _ = NewClient(WithDialer(&mockDialer{}))
+	dName, err = client.GetDialerName()
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if dName != "client" {
+		t.Errorf("expected 'client', but get %s", dName)
+	}
+
+	client.options.Dialer = nil
+	dName, err = client.GetDialerName()
+	if err == nil {
+		t.Errorf("expected an err for abnormal process")
+	}
+	if dName != "" {
+		t.Errorf("expected 'empty string', but get %s", dName)
+	}
+}

pkg/network/dialer/dialer.go

@@ -19,8 +19,6 @@ package dialer
 import (
 	"crypto/tls"
 	"net"
-	"reflect"
-	"strings"
 	"time"
 
 	"github.com/cloudwego/hertz/pkg/network"
@@ -51,21 +49,3 @@ func DialTimeout(network, address string, timeout time.Duration, tlsConfig *tls.
 func AddTLS(conn network.Conn, tlsConfig *tls.Config) (network.Conn, error) {
 	return defaultDialer.AddTLS(conn, tlsConfig)
 }
-
-// GetDialerName returns the name of the dialer
-func GetDialerName() (dName string) {
-	defer func() {
-		err := recover()
-		if err != nil {
-			dName = "unknown"
-		}
-	}()
-
-	dName = reflect.TypeOf(defaultDialer).String()
-	dSlice := strings.Split(dName, ".")
-	dName = dSlice[0]
-	if dName[0] == '*' {
-		dName = dName[1:]
-	}
-	return
-}