opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 19:24:14 +08:00
Code Issues Projects Releases Wiki Activity

Introduce sent blocks histogram

Browse Source 
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
This commit is contained in:
Jakub Sztandera
2017-01-20 18:40:47 +01:00
parent ccd1f8e3d7
commit acfaf9ac89
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
exchange/bitswap/bitswap.go
View File

@ -79,9 +79,9 @@ func New(parent context.Context, p peer.ID, network bsnet.BitSwapNetwork,
// exclusively. We should probably find another way to share logging data // exclusively. We should probably find another way to share logging data
ctx, cancelFunc := context.WithCancel(parent) ctx, cancelFunc := context.WithCancel(parent)
ctx = metrics.CtxSubScope(ctx, "bitswap") ctx = metrics.CtxSubScope(ctx, "bitswap")
dupHist := metrics.NewCtx(ctx, "dup_blocks_bytes", "Summary of duplicate"+ dupHist := metrics.NewCtx(ctx, "recv_dup_blocks_bytes", "Summary of duplicate"+
" data blocks recived").Histogram(metricsBuckets) " data blocks recived").Histogram(metricsBuckets)
allHist := metrics.NewCtx(ctx, "all_blocks_bytes", "Summary of all"+ allHist := metrics.NewCtx(ctx, "recv_all_blocks_bytes", "Summary of all"+
" data blocks recived").Histogram(metricsBuckets) " data blocks recived").Histogram(metricsBuckets)
notif := notifications.New() notif := notifications.New()

32
exchange/bitswap/wantmanager.go
View File

@ -30,24 +30,28 @@ type WantManager struct {
ctx context.Context ctx context.Context
cancel func() cancel func()
metricWantlist metrics.Gauge wantlistGauge metrics.Gauge
sentHistogram metrics.Histogram
} }
func NewWantManager(ctx context.Context, network bsnet.BitSwapNetwork) *WantManager { func NewWantManager(ctx context.Context, network bsnet.BitSwapNetwork) *WantManager {
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
wantlistGauge := metrics.NewCtx(ctx, "wanlist_total", wantlistGauge := metrics.NewCtx(ctx, "wanlist_total",
"Number of items in wantlist.").Gauge() "Number of items in wantlist.").Gauge()
sentHistogram := metrics.NewCtx(ctx, "sent_all_blocks_bytes", "Histogram of blocks sent by"+
" this bitswap").Histogram(metricsBuckets)
return &WantManager{ return &WantManager{
incoming: make(chan []*bsmsg.Entry, 10), incoming: make(chan []*bsmsg.Entry, 10),
connect: make(chan peer.ID, 10), connect: make(chan peer.ID, 10),
disconnect: make(chan peer.ID, 10), disconnect: make(chan peer.ID, 10),
peerReqs: make(chan chan []peer.ID), peerReqs: make(chan chan []peer.ID),
peers: make(map[peer.ID]*msgQueue), peers: make(map[peer.ID]*msgQueue),
wl: wantlist.NewThreadSafe(), wl: wantlist.NewThreadSafe(),
network: network, network: network,
ctx: ctx, ctx: ctx,
cancel: cancel, cancel: cancel,
metricWantlist: wantlistGauge, wantlistGauge: wantlistGauge,
sentHistogram: sentHistogram,
} }
} }
@ -116,6 +120,8 @@ func (pm *WantManager) SendBlock(ctx context.Context, env *engine.Envelope) {
// throughout the network stack // throughout the network stack
defer env.Sent() defer env.Sent()
pm.sentHistogram.Observe(float64(len(env.Block.RawData())))
msg := bsmsg.New(false) msg := bsmsg.New(false)
msg.AddBlock(env.Block) msg.AddBlock(env.Block)
log.Infof("Sending block %s to %s", env.Block, env.Peer) log.Infof("Sending block %s to %s", env.Block, env.Peer)
@ -289,12 +295,12 @@ func (pm *WantManager) Run() {
for _, e := range entries { for _, e := range entries {
if e.Cancel { if e.Cancel {
if pm.wl.Remove(e.Cid) { if pm.wl.Remove(e.Cid) {
pm.metricWantlist.Dec() pm.wantlistGauge.Dec()
filtered = append(filtered, e) filtered = append(filtered, e)
} }
} else { } else {
if pm.wl.AddEntry(e.Entry) { if pm.wl.AddEntry(e.Entry) {
pm.metricWantlist.Inc() pm.wantlistGauge.Inc()
filtered = append(filtered, e) filtered = append(filtered, e)
} }
} }