Skip to content

fix beat #1174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wsy6543 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix beat #1174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions internal/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,8 +411,8 @@ func GetOrNewRocketMQClient(option ClientOptions, callbackCh chan interface{}) R
}

func (c *rmqClient) Start() {
//ctx, cancel := context.WithCancel(context.Background())
//c.cancel = cancel
// ctx, cancel := context.WithCancel(context.Background())
// c.cancel = cancel
atomic.AddInt32(&c.instanceCount, 1)
c.once.Do(func() {
if !c.option.Credentials.IsEmpty() {
Expand Down Expand Up @@ -467,9 +467,10 @@ func (c *rmqClient) Start() {
go primitive.WithRecover(func() {
op := func() {
c.GetNameSrv().cleanOfflineBroker()
c.SendHeartbeatToAllBrokerWithLock()
if c.option.InstanceName != TraceInstanceName {
c.SendHeartbeatToAllBrokerWithLock()
}
}

time.Sleep(time.Second)
op()

Expand Down
9 changes: 5 additions & 4 deletions internal/trace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (ctx *TraceContext) marshal2Bean() *TraceTransferBean {
} else {
buffer.WriteString(bean.Topic)
}
//buffer.WriteString(bean.Topic)
// buffer.WriteString(bean.Topic)
buffer.WriteRune(contentSplitter)
buffer.WriteString(bean.MsgId)
buffer.WriteRune(contentSplitter)
Expand Down Expand Up @@ -208,8 +208,9 @@ const (
maxMsgSize = 128000 - 10*1000
batchSize = 100

TraceTopicPrefix = SystemTopicPrefix + "TRACE_DATA_"
TraceGroupName = "_INNER_TRACE_PRODUCER"
TraceTopicPrefix = SystemTopicPrefix + "TRACE_DATA_"
TraceGroupName = "_INNER_TRACE_PRODUCER"
TraceInstanceName = "INNER_TRACE_CLIENT_DEFAULT"
)

type TraceDispatcher interface {
Expand Down Expand Up @@ -276,7 +277,7 @@ func NewTraceDispatcher(traceCfg *primitive.TraceConfig) *traceDispatcher {
cliOp := DefaultClientOptions()
cliOp.GroupName = traceCfg.GroupName
cliOp.NameServerAddrs = traceCfg.NamesrvAddrs
cliOp.InstanceName = "INNER_TRACE_CLIENT_DEFAULT"
cliOp.InstanceName = TraceInstanceName
cliOp.RetryTimes = 0
cliOp.Namesrv = srvs
cliOp.Credentials = traceCfg.Credentials
Expand Down
Loading