tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swarm/storage: disable open tracing on indices (#19578)

Browse Source
This commit is contained in:
Anton Evangelatov 2019-05-15 15:06:57 +02:00 committed by GitHub
parent 9b0d1b9ab2
commit 4b9c3bd39a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
swarm/storage/localstore/subscription_pull.go
View File

@ -26,9 +26,6 @@ import (
"github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/swarm/chunk" "github.com/ethereum/go-ethereum/swarm/chunk"
"github.com/ethereum/go-ethereum/swarm/shed" "github.com/ethereum/go-ethereum/swarm/shed"
"github.com/ethereum/go-ethereum/swarm/spancontext"
"github.com/opentracing/opentracing-go"
olog "github.com/opentracing/opentracing-go/log"
"github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb"
) )
@ -88,9 +85,6 @@ func (db *DB) SubscribePull(ctx context.Context, bin uint8, since, until uint64)
// - context is done // - context is done
metrics.GetOrRegisterCounter(metricName+".iter", nil).Inc(1) metrics.GetOrRegisterCounter(metricName+".iter", nil).Inc(1)
ctx, sp := spancontext.StartSpan(ctx, metricName+".iter")
sp.LogFields(olog.Int("bin", int(bin)), olog.Uint64("since", since), olog.Uint64("until", until))
iterStart := time.Now() iterStart := time.Now()
var count int var count int
err := db.pullIndex.Iterate(func(item shed.Item) (stop bool, err error) { err := db.pullIndex.Iterate(func(item shed.Item) (stop bool, err error) {
@ -131,15 +125,6 @@ func (db *DB) SubscribePull(ctx context.Context, bin uint8, since, until uint64)
totalTimeMetric(metricName+".iter", iterStart) totalTimeMetric(metricName+".iter", iterStart)
sp.FinishWithOptions(opentracing.FinishOptions{
LogRecords: []opentracing.LogRecord{
{
Timestamp: time.Now(),
Fields: []olog.Field{olog.Int("count", count)},
},
},
})
if err != nil { if err != nil {
if err == errStopSubscription { if err == errStopSubscription {
// stop subscription without any errors // stop subscription without any errors

14
swarm/storage/localstore/subscription_push.go
View File

@ -25,9 +25,6 @@ import (
"github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/metrics"
"github.com/ethereum/go-ethereum/swarm/chunk" "github.com/ethereum/go-ethereum/swarm/chunk"
"github.com/ethereum/go-ethereum/swarm/shed" "github.com/ethereum/go-ethereum/swarm/shed"
"github.com/ethereum/go-ethereum/swarm/spancontext"
"github.com/opentracing/opentracing-go"
olog "github.com/opentracing/opentracing-go/log"
) )
// SubscribePush returns a channel that provides storage chunks with ordering from push syncing index. // SubscribePush returns a channel that provides storage chunks with ordering from push syncing index.
@ -68,8 +65,6 @@ func (db *DB) SubscribePush(ctx context.Context) (c <-chan chunk.Chunk, stop fun
// - context is done // - context is done
metrics.GetOrRegisterCounter(metricName+".iter", nil).Inc(1) metrics.GetOrRegisterCounter(metricName+".iter", nil).Inc(1)
ctx, sp := spancontext.StartSpan(ctx, metricName+".iter")
iterStart := time.Now() iterStart := time.Now()
var count int var count int
err := db.pushIndex.Iterate(func(item shed.Item) (stop bool, err error) { err := db.pushIndex.Iterate(func(item shed.Item) (stop bool, err error) {
@ -106,15 +101,6 @@ func (db *DB) SubscribePush(ctx context.Context) (c <-chan chunk.Chunk, stop fun
totalTimeMetric(metricName+".iter", iterStart) totalTimeMetric(metricName+".iter", iterStart)
sp.FinishWithOptions(opentracing.FinishOptions{
LogRecords: []opentracing.LogRecord{
{
Timestamp: time.Now(),
Fields: []olog.Field{olog.Int("count", count)},
},
},
})
if err != nil { if err != nil {
metrics.GetOrRegisterCounter(metricName+".iter.error", nil).Inc(1) metrics.GetOrRegisterCounter(metricName+".iter.error", nil).Inc(1)
log.Error("localstore push subscription iteration", "err", err) log.Error("localstore push subscription iteration", "err", err)