fix(tracing): remove event tracing
We've deprecated this system and have yet to move to a new system. We might as well remove everything, switch to a new system, then deliberately trace the entire system.
Steven Allen committed
Jan 16, 2020 at 16:18 UTC
906f45edd9899352efba710e2f53978fc4b8c6e4
7 files changed
+4
-52
core/bootstrap/bootstrap.go
-8
@@ -18,7 +18,6 @@ import (
18
"github.com/libp2p/go-libp2p-core/peer"
19
"github.com/libp2p/go-libp2p-core/peerstore"
20
"github.com/libp2p/go-libp2p-core/routing"
21
- "github.com/libp2p/go-libp2p-loggables"
21
)
22
23
var log = logging.Logger("bootstrap")
@@ -86,10 +85,8 @@ func Bootstrap(id peer.ID, host host.Host, rt routing.Routing, cfg BootstrapConf
85
// the periodic bootstrap function -- the connection supervisor
86
periodic := func(worker goprocess.Process) {
87
ctx := goprocessctx.OnClosingContext(worker)
89
- defer log.EventBegin(ctx, "periodicBootstrap", id).Done()
88
89
if err := bootstrapRound(ctx, host, cfg); err != nil {
92
- log.Event(ctx, "bootstrapError", id, loggables.Error(err))
90
log.Debugf("%s bootstrap error: %s", id, err)
91
}
92
@@ -126,7 +123,6 @@ func bootstrapRound(ctx context.Context, host host.Host, cfg BootstrapConfig) er
123
// determine how many bootstrap connections to open
124
connected := host.Network().Peers()
125
if len(connected) >= cfg.MinPeerThreshold {
129
- log.Event(ctx, "bootstrapSkip", id)
126
log.Debugf("%s core bootstrap skipped -- connected to %d (> %d) nodes",
127
id, len(connected), cfg.MinPeerThreshold)
128
return nil
@@ -150,7 +146,6 @@ func bootstrapRound(ctx context.Context, host host.Host, cfg BootstrapConfig) er
146
// connect to a random susbset of bootstrap candidates
147
randSubset := randomSubsetOfPeers(notConnected, numToDial)
148
153
- defer log.EventBegin(ctx, "bootstrapStart", id).Done()
149
log.Debugf("%s bootstrapping to %d nodes: %s", id, numToDial, randSubset)
150
return bootstrapConnect(ctx, host, randSubset)
151
}
@@ -172,17 +167,14 @@ func bootstrapConnect(ctx context.Context, ph host.Host, peers []peer.AddrInfo)
167
wg.Add(1)
168
go func(p peer.AddrInfo) {
169
defer wg.Done()
175
- defer log.EventBegin(ctx, "bootstrapDial", ph.ID(), p.ID).Done()
170
log.Debugf("%s bootstrapping to %s", ph.ID(), p.ID)
171
172
ph.Peerstore().AddAddrs(p.ID, p.Addrs, peerstore.PermanentAddrTTL)
173
if err := ph.Connect(ctx, p); err != nil {
180
- log.Event(ctx, "bootstrapDialFailed", p.ID)
174
log.Debugf("failed to bootstrap with %v: %s", p.ID, err)
175
errs <- err
176
return
177
}
185
- log.Event(ctx, "bootstrapDialSuccess", p.ID)
178
log.Infof("bootstrapped with %v", p.ID)
179
}(p)
180
}
core/corehttp/logs.go
+1
-1
@@ -50,7 +50,7 @@ func LogOption() ServeOption {
50
w.WriteHeader(200)
51
wnf, errs := newWriteErrNotifier(w)
52
lwriter.WriterGroup.AddWriter(wnf)
53
- log.Event(n.Context(), "log API client connected")
53
+ log.Event(n.Context(), "log API client connected") //nolint deprecated
54
<-errs
55
})
56
return mux, nil
core/corerepo/gc.go
-1
@@ -217,7 +217,6 @@ func (gc *GC) maybeGC(ctx context.Context, offset uint64) error {
217
218
// Do GC here
219
log.Info("Watermark exceeded. Starting repo GC...")
220
- defer log.EventBegin(ctx, "repoGC").Done()
220
221
if err := GarbageCollect(gc.Node, ctx); err != nil {
222
return err
fuse/readonly/readonly_unix.go
+2
-14
@@ -20,7 +20,6 @@ import (
20
fs "bazil.org/fuse/fs"
21
ipld "github.com/ipfs/go-ipld-format"
22
logging "github.com/ipfs/go-log"
23
- lgbl "github.com/libp2p/go-libp2p-loggables"
23
)
24
25
var log = logging.Logger("fuse/ipfs")
@@ -238,22 +237,11 @@ func (s *Node) Readlink(ctx context.Context, req *fuse.ReadlinkRequest) (string,
237
}
238
239
func (s *Node) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadResponse) error {
241
- c := s.Nd.Cid()
242
-
243
- // setup our logging event
244
- lm := make(lgbl.DeferredMap)
245
- lm["fs"] = "ipfs"
246
- lm["key"] = func() interface{} { return c.String() }
247
- lm["req_offset"] = req.Offset
248
- lm["req_size"] = req.Size
249
- defer log.EventBegin(ctx, "fuseRead", lm).Done()
250
-
240
r, err := uio.NewDagReader(ctx, s.Nd, s.Ipfs.DAG)
241
if err != nil {
242
return err
243
}
255
- o, err := r.Seek(req.Offset, io.SeekStart)
256
- lm["res_offset"] = o
244
+ _, err = r.Seek(req.Offset, io.SeekStart)
245
if err != nil {
246
return err
247
}
@@ -266,7 +254,7 @@ func (s *Node) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadR
254
default:
255
return err
256
}
269
- lm["res_size"] = n
257
+ resp.Data = resp.Data[:n]
258
return nil // may be non-nil / not succeeded
259
}
260
gc/gc.go
-16
@@ -40,11 +40,7 @@ type Result struct {
40
func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn pin.Pinner, bestEffortRoots []cid.Cid) <-chan Result {
41
ctx, cancel := context.WithCancel(ctx)
42
43
- elock := log.EventBegin(ctx, "GC.lockWait")
43
unlocker := bs.GCLock()
45
- elock.Done()
46
- elock = log.EventBegin(ctx, "GC.locked")
47
- emark := log.EventBegin(ctx, "GC.mark")
44
45
bsrv := bserv.New(bs, offline.Exchange(bs))
46
ds := dag.NewDAGService(bsrv)
@@ -55,7 +51,6 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
51
defer cancel()
52
defer close(output)
53
defer unlocker.Unlock()
58
- defer elock.Done()
54
55
gcs, err := ColoredSet(ctx, pn, ds, bestEffortRoots, output)
56
if err != nil {
@@ -65,12 +60,6 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
60
}
61
return
62
}
68
- emark.Append(logging.LoggableMap{
69
- "blackSetSize": fmt.Sprintf("%d", gcs.Len()),
70
- })
71
- emark.Done()
72
- esweep := log.EventBegin(ctx, "GC.sweep")
73
-
63
keychan, err := bs.AllKeysChan(ctx)
64
if err != nil {
65
select {
@@ -113,10 +102,6 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
102
break loop
103
}
104
}
116
- esweep.Append(logging.LoggableMap{
117
- "whiteSetSize": fmt.Sprintf("%d", removed),
118
- })
119
- esweep.Done()
105
if errors {
106
select {
107
case output <- Result{Error: ErrCannotDeleteSomeBlocks}:
@@ -125,7 +110,6 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, dstor dstore.Datastore, pn
110
}
111
}
112
128
- defer log.EventBegin(ctx, "GC.datastore").Done()
113
gds, ok := dstor.(dstore.GCDatastore)
114
if !ok {
115
return
go.sum
+1
@@ -372,6 +372,7 @@ github.com/libp2p/go-libp2p v0.4.0 h1:nV2q3fdhL80OWtPyBrsoWKcw32qC4TbbR+iGjEOMRa
372
github.com/libp2p/go-libp2p v0.4.0/go.mod h1:9EsEIf9p2UDuwtPd0DwJsAl0qXVxgAnuDGRvHbfATfI=
373
github.com/libp2p/go-libp2p v0.4.2 h1:p0cthB0jDNHO4gH2HzS8/nAMMXbfUlFHs0jwZ4U+F2g=
374
github.com/libp2p/go-libp2p v0.4.2/go.mod h1:MNmgUxUw5pMsdOzMlT0EE7oKjRasl+WyVwM0IBlpKgQ=
375
+github.com/libp2p/go-libp2p v0.5.0/go.mod h1:Os7a5Z3B+ErF4v7zgIJ7nBHNu2LYt8ZMLkTQUB3G/wA=
376
github.com/libp2p/go-libp2p v0.5.1 h1:kZ9jg+2B9IIptRcltBHKBrQdhXNNSrjCoztvrMx7tqI=
377
github.com/libp2p/go-libp2p v0.5.1/go.mod h1:Os7a5Z3B+ErF4v7zgIJ7nBHNu2LYt8ZMLkTQUB3G/wA=
378
github.com/libp2p/go-libp2p-autonat v0.0.2/go.mod h1:fs71q5Xk+pdnKU014o2iq1RhMs9/PMaG5zXRFNnIIT4=
namesys/resolve/resolve.go
-12
@@ -7,15 +7,12 @@ import (
7
"strings"
8
9
"github.com/ipfs/go-ipld-format"
10
- logging "github.com/ipfs/go-log"
10
"github.com/ipfs/go-path"
11
"github.com/ipfs/go-path/resolver"
12
13
"github.com/ipfs/go-ipfs/namesys"
14
)
15
17
-var log = logging.Logger("nsresolv")
18
-
16
// ErrNoNamesys is an explicit error for when an IPFS node doesn't
17
// (yet) have a name system
18
var ErrNoNamesys = errors.New(
@@ -24,13 +21,8 @@ var ErrNoNamesys = errors.New(
21
// ResolveIPNS resolves /ipns paths
22
func ResolveIPNS(ctx context.Context, nsys namesys.NameSystem, p path.Path) (path.Path, error) {
23
if strings.HasPrefix(p.String(), "/ipns/") {
27
- evt := log.EventBegin(ctx, "resolveIpnsPath")
28
- defer evt.Done()
29
- // resolve ipns paths
30
-
24
// TODO(cryptix): we should be able to query the local cache for the path
25
if nsys == nil {
33
- evt.Append(logging.LoggableMap{"error": ErrNoNamesys.Error()})
26
return "", ErrNoNamesys
27
}
28
@@ -38,27 +30,23 @@ func ResolveIPNS(ctx context.Context, nsys namesys.NameSystem, p path.Path) (pat
30
31
if len(seg) < 2 || seg[1] == "" { // just "/<protocol/>" without further segments
32
err := fmt.Errorf("invalid path %q: ipns path missing IPNS ID", p)
41
- evt.Append(logging.LoggableMap{"error": err})
33
return "", err
34
}
35
36
extensions := seg[2:]
37
resolvable, err := path.FromSegments("/", seg[0], seg[1])
38
if err != nil {
48
- evt.Append(logging.LoggableMap{"error": err.Error()})
39
return "", err
40
}
41
42
respath, err := nsys.Resolve(ctx, resolvable.String())
43
if err != nil {
54
- evt.Append(logging.LoggableMap{"error": err.Error()})
44
return "", err
45
}
46
47
segments := append(respath.Segments(), extensions...)
48
p, err = path.FromSegments("/", segments...)
49
if err != nil {
61
- evt.Append(logging.LoggableMap{"error": err.Error()})
50
return "", err
51
}
52
}