support nsresolver in TraceConfig

Author: dbl-x

examples/consumer/trace/main.go

@@ -31,8 +31,8 @@ import (
 func main() {
 	namesrvs := []string{"127.0.0.1:9876"}
 	traceCfg := &primitive.TraceConfig{
-		Access:       primitive.Local,
-		NamesrvAddrs: namesrvs,
+		Access:   primitive.Local,
+		Resolver: primitive.NewPassthroughResolver(namesrvs),
 	}
 
 	c, _ := rocketmq.NewPushConsumer(

examples/producer/trace/main.go

@@ -31,8 +31,8 @@ import (
 func main() {
 	namesrvs := []string{"127.0.0.1:9876"}
 	traceCfg := &primitive.TraceConfig{
-		Access:       primitive.Local,
-		NamesrvAddrs: namesrvs,
+		Access:   primitive.Local,
+		Resolver: primitive.NewPassthroughResolver(namesrvs),
 	}
 
 	p, _ := rocketmq.NewProducer(

internal/trace.go

@@ -241,7 +241,7 @@ func NewTraceDispatcher(traceCfg *primitive.TraceConfig) *traceDispatcher {
 		t = TraceTopicPrefix + traceCfg.TraceTopic
 	}
 
-	srvs, err := NewNamesrv(primitive.NewPassthroughResolver(traceCfg.NamesrvAddrs))
+	srvs, err := NewNamesrv(traceCfg.Resolver)
 	if err != nil {
 		panic(errors.Wrap(err, "new Namesrv failed."))
 	}
@@ -251,7 +251,6 @@ func NewTraceDispatcher(traceCfg *primitive.TraceConfig) *traceDispatcher {
 
 	cliOp := DefaultClientOptions()
 	cliOp.GroupName = traceCfg.GroupName
-	cliOp.NameServerAddrs = traceCfg.NamesrvAddrs
 	cliOp.InstanceName = "INNER_TRACE_CLIENT_DEFAULT"
 	cliOp.RetryTimes = 0
 	cliOp.Namesrv = srvs

primitive/trace.go

@@ -23,5 +23,6 @@ type TraceConfig struct {
 	GroupName    string
 	Access       AccessChannel
 	NamesrvAddrs []string
+	Resolver     NsResolver
 	Credentials  // acl config for trace. omit if acl is closed on broker.
 }