Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/consumer/trace/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions examples/producer/trace/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
13 changes: 12 additions & 1 deletion internal/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,18 @@ func NewTraceDispatcher(traceCfg *primitive.TraceConfig) *traceDispatcher {
t = TraceTopicPrefix + traceCfg.TraceTopic
}

srvs, err := NewNamesrv(primitive.NewPassthroughResolver(traceCfg.NamesrvAddrs))
if len(traceCfg.NamesrvAddrs) == 0 && traceCfg.Resolver == nil {
panic("no NamesrvAddrs or Resolver configured")
}

var srvs *namesrvs
var err error
if len(traceCfg.NamesrvAddrs) > 0 {
srvs, err = NewNamesrv(primitive.NewPassthroughResolver(traceCfg.NamesrvAddrs))
} else {
srvs, err = NewNamesrv(traceCfg.Resolver)
}

if err != nil {
panic(errors.Wrap(err, "new Namesrv failed."))
}
Expand Down
1 change: 1 addition & 0 deletions primitive/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}