stop using the deprecated go-libp2p-loggables package
Marten Seemann committed
Nov 21, 2022 at 09:45 UTC
931a9df8a699f22bc1a2f06a159b4aa9d3d72965
3 files changed
+22
-13
cmd/ipfs/main.go
+21
-10
@@ -12,26 +12,27 @@ import (
12
"runtime/pprof"
13
"time"
14
15
- util "github.com/ipfs/kubo/cmd/ipfs/util"
15
+ "github.com/ipfs/kubo/cmd/ipfs/util"
16
oldcmds "github.com/ipfs/kubo/commands"
17
- core "github.com/ipfs/kubo/core"
17
+ "github.com/ipfs/kubo/core"
18
corecmds "github.com/ipfs/kubo/core/commands"
19
- corehttp "github.com/ipfs/kubo/core/corehttp"
20
- loader "github.com/ipfs/kubo/plugin/loader"
21
- repo "github.com/ipfs/kubo/repo"
22
- fsrepo "github.com/ipfs/kubo/repo/fsrepo"
19
+ "github.com/ipfs/kubo/core/corehttp"
20
+ "github.com/ipfs/kubo/plugin/loader"
21
+ "github.com/ipfs/kubo/repo"
22
+ "github.com/ipfs/kubo/repo/fsrepo"
23
"github.com/ipfs/kubo/tracing"
24
- "go.opentelemetry.io/otel"
24
25
cmds "github.com/ipfs/go-ipfs-cmds"
26
"github.com/ipfs/go-ipfs-cmds/cli"
27
cmdhttp "github.com/ipfs/go-ipfs-cmds/http"
28
u "github.com/ipfs/go-ipfs-util"
29
logging "github.com/ipfs/go-log"
31
- loggables "github.com/libp2p/go-libp2p-loggables"
30
ma "github.com/multiformats/go-multiaddr"
31
madns "github.com/multiformats/go-multiaddr-dns"
32
manet "github.com/multiformats/go-multiaddr/net"
33
+
34
+ "github.com/google/uuid"
35
+ "go.opentelemetry.io/otel"
36
)
37
38
// log is the command logger
@@ -77,9 +78,19 @@ func printErr(err error) int {
78
return 1
79
}
80
81
+func newUUID(key string) logging.Metadata {
82
+ ids := "#UUID-ERROR#"
83
+ if id, err := uuid.NewRandom(); err == nil {
84
+ ids = id.String()
85
+ }
86
+ return logging.Metadata{
87
+ key: ids,
88
+ }
89
+}
90
+
91
func mainRet() (exitCode int) {
92
rand.Seed(time.Now().UnixNano())
82
- ctx := logging.ContextWithLoggable(context.Background(), loggables.Uuid("session"))
93
+ ctx := logging.ContextWithLoggable(context.Background(), newUUID("session"))
94
var err error
95
96
tp, err := tracing.NewTracerProvider(ctx)
@@ -109,7 +120,7 @@ func mainRet() (exitCode int) {
120
os.Args[1] = "version"
121
}
122
112
- //Handle `ipfs help` and `ipfs help <sub-command>`
123
+ // Handle `ipfs help` and `ipfs help <sub-command>`
124
if os.Args[1] == "help" {
125
if len(os.Args) > 2 {
126
os.Args = append(os.Args[:1], os.Args[2:]...)
go.mod
+1
-2
@@ -15,6 +15,7 @@ require (
15
github.com/facebookgo/atomicfile v0.0.0-20151019160806-2de1f203e7d5
16
github.com/fsnotify/fsnotify v1.6.0
17
github.com/gabriel-vasile/mimetype v1.4.1
18
+ github.com/google/uuid v1.3.0
19
github.com/hashicorp/go-multierror v1.1.1
20
github.com/ipfs/go-bitswap v0.10.2
21
github.com/ipfs/go-block-format v0.0.3
@@ -75,7 +76,6 @@ require (
76
github.com/libp2p/go-libp2p-http v0.2.1
77
github.com/libp2p/go-libp2p-kad-dht v0.18.0
78
github.com/libp2p/go-libp2p-kbucket v0.4.7
78
- github.com/libp2p/go-libp2p-loggables v0.1.0
79
github.com/libp2p/go-libp2p-pubsub v0.8.1
80
github.com/libp2p/go-libp2p-pubsub-router v0.5.0
81
github.com/libp2p/go-libp2p-record v0.2.0
@@ -149,7 +149,6 @@ require (
149
github.com/golang/protobuf v1.5.2 // indirect
150
github.com/golang/snappy v0.0.4 // indirect
151
github.com/google/gopacket v1.1.19 // indirect
152
- github.com/google/uuid v1.3.0 // indirect
152
github.com/gorilla/mux v1.8.0 // indirect
153
github.com/gorilla/websocket v1.5.0 // indirect
154
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
go.sum
-1
@@ -869,7 +869,6 @@ github.com/libp2p/go-libp2p-kbucket v0.3.1/go.mod h1:oyjT5O7tS9CQurok++ERgc46YLw
869
github.com/libp2p/go-libp2p-kbucket v0.4.7 h1:spZAcgxifvFZHBD8tErvppbnNiKA5uokDu3CV7axu70=
870
github.com/libp2p/go-libp2p-kbucket v0.4.7/go.mod h1:XyVo99AfQH0foSf176k4jY1xUJ2+jUJIZCSDm7r2YKk=
871
github.com/libp2p/go-libp2p-loggables v0.0.1/go.mod h1:lDipDlBNYbpyqyPX/KcoO+eq0sJYEVR2JgOexcivchg=
872
-github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
872
github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
873
github.com/libp2p/go-libp2p-metrics v0.0.1/go.mod h1:jQJ95SXXA/K1VZi13h52WZMa9ja78zjyy5rspMsC/08=
874
github.com/libp2p/go-libp2p-mplex v0.1.1/go.mod h1:KUQWpGkCzfV7UIpi8SKsAVxyBgz1c9R5EvxgnwLsb/I=