status-im
/
go-libp2p-pubsub
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

initialize tracer with peer ID, trace RPC from join/leave announcements

This commit is contained in:
vyzo 2019-11-11 18:32:12 +02:00
parent 958e09a5b3
commit fb11aa9857
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pubsub.go
View File

@ -326,7 +326,7 @@ func WithDiscovery(d discovery.Discovery, opts ...DiscoverOpt) Option {
// WithEventTracer provides a tracer for the pubsub system // WithEventTracer provides a tracer for the pubsub system
func WithEventTracer(tracer EventTracer) Option { func WithEventTracer(tracer EventTracer) Option {
return func(p *PubSub) error { return func(p *PubSub) error {
p.tracer = &pubsubTracer{tracer: tracer} p.tracer = &pubsubTracer{tracer: tracer, pid: p.host.ID()}
return nil return nil
} }
} }
@ -582,8 +582,10 @@ func (p *PubSub) announce(topic string, sub bool) {
for pid, peer := range p.peers { for pid, peer := range p.peers {
select { select {
case peer <- out: case peer <- out:
p.tracer.SendRPC(out, pid)
default: default:
log.Infof("Can't send announce message to peer %s: queue full; scheduling retry", pid) log.Infof("Can't send announce message to peer %s: queue full; scheduling retry", pid)
p.tracer.DropRPC(out, pid)
go p.announceRetry(pid, topic, sub) go p.announceRetry(pid, topic, sub)
} }
} }
@ -619,8 +621,10 @@ func (p *PubSub) doAnnounceRetry(pid peer.ID, topic string, sub bool) {
out := rpcWithSubs(subopt) out := rpcWithSubs(subopt)
select { select {
case peer <- out: case peer <- out:
p.tracer.SendRPC(out, pid)
default: default:
log.Infof("Can't send announce message to peer %s: queue full; scheduling retry", pid) log.Infof("Can't send announce message to peer %s: queue full; scheduling retry", pid)
p.tracer.DropRPC(out, pid)
go p.announceRetry(pid, topic, sub) go p.announceRetry(pid, topic, sub)
} }
} }

1
trace.go
View File

@ -12,6 +12,7 @@ type EventTracer interface {
type pubsubTracer struct { type pubsubTracer struct {
tracer EventTracer tracer EventTracer
pid peer.ID
} }
func (t *pubsubTracer) PublishMessage(msg *Message) { func (t *pubsubTracer) PublishMessage(msg *Message) {