Upgrade to github.com/ipfs/go-log/v2 (filecoin-project#4154)

simlecode · May 21, 2020 · 8f6abba · 8f6abba
1 parent be0b82f
commit 8f6abba
Show file tree

Hide file tree

Showing 48 changed files with 61 additions and 59 deletions.
diff --git a/cmd/go-filecoin/daemon.go b/cmd/go-filecoin/daemon.go
@@ -13,7 +13,6 @@ import (
 	cmdkit "github.com/ipfs/go-ipfs-cmdkit"
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	cmdhttp "github.com/ipfs/go-ipfs-cmds/http"
-	writer "github.com/ipfs/go-log/writer"
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr-net"
 	"github.com/pkg/errors"
@@ -128,7 +127,7 @@ func daemonRun(req *cmds.Request, re cmds.ResponseEmitter) error {
 	}
 
 	if _, ok := req.Options[ELStdout].(bool); ok {
-		writer.WriterGroup.AddWriter(os.Stdout)
+		_ = re.Emit("--" + ELStdout + " option is deprecated\n")
 	}
 
 	// Start the node.

diff --git a/cmd/go-filecoin/init.go b/cmd/go-filecoin/init.go
@@ -15,7 +15,7 @@ import (
 	cmdkit "github.com/ipfs/go-ipfs-cmdkit"
 	cmds "github.com/ipfs/go-ipfs-cmds"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/ipld/go-car"
 	"github.com/libp2p/go-libp2p-core/crypto"
 

diff --git a/cmd/go-filecoin/log.go b/cmd/go-filecoin/log.go
@@ -2,22 +2,20 @@ package commands
 
 import (
 	"fmt"
-	"io"
 	"strings"
 
 	cmdkit "github.com/ipfs/go-ipfs-cmdkit"
 	cmds "github.com/ipfs/go-ipfs-cmds"
-	logging "github.com/ipfs/go-log"
-	writer "github.com/ipfs/go-log/writer"
+	logging "github.com/ipfs/go-log/v2"
 )
 
 var loglogger = logging.Logger("commands/log")
 
 var logCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Interact with the daemon event log output.",
+		Tagline: "Interact with the daemon subsystems log output.",
 		ShortDescription: `
-'go-filecoin log' contains utility commands to affect the event logging
+'go-filecoin log' contains utility commands to affect the subsystems logging
 output of a running daemon.
 `,
 	},
@@ -31,21 +29,19 @@ output of a running daemon.
 
 var logTailCmd = &cmds.Command{
 	Helptext: cmdkit.HelpText{
-		Tagline: "Read the event log.",
+		Tagline: "Read subsystems log output.",
 		ShortDescription: `
-Outputs event log messages (not other log messages) as they are generated.
+Outputs subsystems log output as it is generated.
 `,
 	},
 
 	Run: func(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment) error {
-		r, w := io.Pipe()
+		r := logging.NewPipeReader()
 		go func() {
-			defer w.Close() // nolint: errcheck
+			defer r.Close() // nolint: errcheck
 			<-req.Context.Done()
 		}()
 
-		writer.WriterGroup.AddWriter(w)
-
 		return re.Emit(r)
 	},
 }

diff --git a/functional-tests/network-deployment/logging_test.go b/functional-tests/network-deployment/logging_test.go
@@ -1,7 +1,7 @@
 package networkdeployment_test
 
 import (
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 )
 
 func init() {

diff --git a/go.mod b/go.mod
@@ -55,7 +55,7 @@ require (
 	github.com/ipfs/go-ipfs-routing v0.1.0
 	github.com/ipfs/go-ipld-cbor v0.0.5-0.20200204214505-252690b78669
 	github.com/ipfs/go-ipld-format v0.2.0
-	github.com/ipfs/go-log v1.0.3
+	github.com/ipfs/go-log/v2 v2.0.9-0.20200520025255-8c45666d33d4
 	github.com/ipfs/go-merkledag v0.3.1
 	github.com/ipfs/go-path v0.0.7
 	github.com/ipfs/go-unixfs v0.2.4
@@ -92,7 +92,8 @@ require (
 	github.com/whyrusleeping/go-logging v0.0.1
 	github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1
 	go.opencensus.io v0.22.3
-	go.uber.org/zap v1.14.1
+	go.uber.org/zap v1.15.0
+	golang.org/x/net v0.0.0-20200301022130-244492dfa37a // indirect
 	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
 	golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
 	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543

diff --git a/go.sum b/go.sum
@@ -524,6 +524,8 @@ github.com/ipfs/go-log/v2 v2.0.2 h1:xguurydRdfKMJjKyxNXNU8lYP0VZH1NUwJRwUorjuEw=
 github.com/ipfs/go-log/v2 v2.0.2/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
 github.com/ipfs/go-log/v2 v2.0.3 h1:Q2gXcBoCALyLN/pUQlz1qgu0x3uFV6FzP9oXhpfyJpc=
 github.com/ipfs/go-log/v2 v2.0.3/go.mod h1:O7P1lJt27vWHhOwQmcFEvlmo49ry2VY2+JfBWFaa9+0=
+github.com/ipfs/go-log/v2 v2.0.9-0.20200520025255-8c45666d33d4 h1:jxy4/1nHY8atvUQf/pRhFHGFySBWQPIfLHG1ODS7R4M=
+github.com/ipfs/go-log/v2 v2.0.9-0.20200520025255-8c45666d33d4/go.mod h1:eZs4Xt4ZUJQFM3DlanGhy7TkwwawCZcSByscwkWG+dw=
 github.com/ipfs/go-merkledag v0.0.6/go.mod h1:QYPdnlvkOg7GnQRofu9XZimC5ZW5Wi3bKys/4GQQfto=
 github.com/ipfs/go-merkledag v0.2.3 h1:aMdkK9G1hEeNvn3VXfiEMLY0iJnbiQQUHnM0HFJREsE=
 github.com/ipfs/go-merkledag v0.2.3/go.mod h1:SQiXrtSts3KGNmgOzMICy5c0POOpUNQLvB3ClKnBAlk=
@@ -1297,6 +1299,8 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo=
 go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
+go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM=
+go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
 go4.org v0.0.0-20190218023631-ce4c26f7be8e h1:m9LfARr2VIOW0vsV19kEKp/sWQvZnGobA8JHui/XJoY=
 go4.org v0.0.0-20190218023631-ce4c26f7be8e/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1369,6 +1373,8 @@ golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421 h1:Wo7BWFiOk0QRFMLYMqJGFMd9CgUAcGx7V+qEg/h5IBI=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=

diff --git a/internal/app/go-filecoin/connectors/fsm_events/connector.go b/internal/app/go-filecoin/connectors/fsm_events/connector.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/filecoin-project/specs-actors/actors/abi"
 	fsm "github.com/filecoin-project/storage-fsm"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/chain"
 	"github.com/filecoin-project/go-filecoin/internal/pkg/chainsampler"

diff --git a/internal/app/go-filecoin/connectors/storage_market/common.go b/internal/app/go-filecoin/connectors/storage_market/common.go
@@ -15,7 +15,7 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
 	"github.com/ipfs/go-cid"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"golang.org/x/xerrors"
 
 	"github.com/filecoin-project/go-filecoin/internal/app/go-filecoin/connectors"

diff --git a/internal/app/go-filecoin/internal/submodule/discovery_submodule.go b/internal/app/go-filecoin/internal/submodule/discovery_submodule.go
@@ -10,7 +10,7 @@ import (
 	"github.com/filecoin-project/go-filecoin/internal/pkg/net"
 	"github.com/filecoin-project/go-filecoin/internal/pkg/util/moresync"
 	"github.com/ipfs/go-cid"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/pkg/errors"
 )
 

diff --git a/internal/app/go-filecoin/node/node.go b/internal/app/go-filecoin/node/node.go
@@ -11,7 +11,7 @@ import (
 	fbig "github.com/filecoin-project/specs-actors/actors/abi/big"
 	bserv "github.com/ipfs/go-blockservice"
 	"github.com/ipfs/go-cid"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/pkg/errors"
 

diff --git a/internal/app/go-filecoin/plumbing/api.go b/internal/app/go-filecoin/plumbing/api.go
@@ -10,7 +10,7 @@ import (
 	acrypto "github.com/filecoin-project/specs-actors/actors/crypto"
 	"github.com/ipfs/go-cid"
 	ipld "github.com/ipfs/go-ipld-format"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/metrics"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p/p2p/protocol/ping"

diff --git a/internal/app/go-filecoin/plumbing/cst/chain_state.go b/internal/app/go-filecoin/plumbing/cst/chain_state.go
@@ -16,7 +16,7 @@ import (
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
 	offline "github.com/ipfs/go-ipfs-exchange-offline"
 	format "github.com/ipfs/go-ipld-format"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	merkdag "github.com/ipfs/go-merkledag"
 	"github.com/pkg/errors"
 

diff --git a/internal/app/go-filecoin/plumbing/msg/waiter.go b/internal/app/go-filecoin/plumbing/msg/waiter.go
@@ -10,7 +10,7 @@ import (
 	"github.com/ipfs/go-cid"
 	bstore "github.com/ipfs/go-ipfs-blockstore"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/pkg/errors"
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/chain"

diff --git a/internal/pkg/chain/car.go b/internal/pkg/chain/car.go
@@ -7,7 +7,7 @@ import (
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	format "github.com/ipfs/go-ipld-format"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/ipld/go-car"
 	carutil "github.com/ipld/go-car/util"
 

diff --git a/internal/pkg/chain/status.go b/internal/pkg/chain/status.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/block"
 	"github.com/filecoin-project/specs-actors/actors/abi"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 )
 
 var logChainStatus = logging.Logger("chain/status")

diff --git a/internal/pkg/chain/store.go b/internal/pkg/chain/store.go
@@ -14,7 +14,7 @@ import (
 	"github.com/ipfs/go-cid"
 	"github.com/ipfs/go-datastore"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/pkg/errors"
 	"go.opencensus.io/trace"
 

diff --git a/internal/pkg/chainsampler/height_threshold_scheduler.go b/internal/pkg/chainsampler/height_threshold_scheduler.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/filecoin-project/specs-actors/actors/abi"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/pkg/errors"
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/block"

diff --git a/internal/pkg/chainsync/fetcher/graphsync_fetcher.go b/internal/pkg/chainsync/fetcher/graphsync_fetcher.go
@@ -14,7 +14,7 @@ import (
 	"github.com/ipfs/go-graphsync"
 	bstore "github.com/ipfs/go-ipfs-blockstore"
 	cbor "github.com/ipfs/go-ipld-cbor"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/ipld/go-ipld-prime"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
 	basicnode "github.com/ipld/go-ipld-prime/node/basic"

diff --git a/internal/pkg/chainsync/internal/dispatcher/dispatcher.go b/internal/pkg/chainsync/internal/dispatcher/dispatcher.go
@@ -5,7 +5,7 @@ import (
 	"context"
 	"runtime/debug"
 
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/block"
 	"github.com/filecoin-project/go-filecoin/internal/pkg/util/moresync"

diff --git a/internal/pkg/chainsync/internal/syncer/syncer.go b/internal/pkg/chainsync/internal/syncer/syncer.go
@@ -6,7 +6,7 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/abi"
 	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	"github.com/ipfs/go-cid"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/pkg/errors"
 	"go.opencensus.io/trace"

diff --git a/internal/pkg/chainsync/status/status.go b/internal/pkg/chainsync/status/status.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/block"
 	"github.com/filecoin-project/specs-actors/actors/abi"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 )
 
 // Reporter defines an interface to updating and reporting the status of the blockchain.

diff --git a/internal/pkg/discovery/bootstrap.go b/internal/pkg/discovery/bootstrap.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	host "github.com/libp2p/go-libp2p-core/host"
 	inet "github.com/libp2p/go-libp2p-core/network"
 	peer "github.com/libp2p/go-libp2p-core/peer"

diff --git a/internal/pkg/discovery/hello_protocol.go b/internal/pkg/discovery/hello_protocol.go
@@ -9,7 +9,7 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/abi"
 	fbig "github.com/filecoin-project/specs-actors/actors/abi/big"
 	"github.com/ipfs/go-cid"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/host"
 	net "github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"

diff --git a/internal/pkg/discovery/peer_tracker.go b/internal/pkg/discovery/peer_tracker.go
@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/block"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/pkg/errors"

diff --git a/internal/pkg/drand/drand_grpc.go b/internal/pkg/drand/drand_grpc.go
@@ -11,7 +11,7 @@ import (
 	"github.com/drand/drand/key"
 	"github.com/drand/drand/net"
 	"github.com/drand/kyber"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 )
 
 var log = logging.Logger("drand")

diff --git a/internal/pkg/message/policy.go b/internal/pkg/message/policy.go
@@ -6,7 +6,7 @@ import (
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/go-filecoin/internal/pkg/block"
 	"github.com/filecoin-project/specs-actors/actors/abi"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/chain"
 	"github.com/filecoin-project/go-filecoin/internal/pkg/types"

diff --git a/internal/pkg/metrics/heartbeat.go b/internal/pkg/metrics/heartbeat.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/specs-actors/actors/abi"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/host"
 	net "github.com/libp2p/go-libp2p-core/network"
 	"github.com/libp2p/go-libp2p-core/peer"

diff --git a/internal/pkg/mining/worker.go b/internal/pkg/mining/worker.go
@@ -14,7 +14,7 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
 	cid "github.com/ipfs/go-cid"
 	blockstore "github.com/ipfs/go-ipfs-blockstore"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/pkg/errors"
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/block"

diff --git a/internal/pkg/net/blocksub/validator.go b/internal/pkg/net/blocksub/validator.go
@@ -3,7 +3,7 @@ package blocksub
 import (
 	"context"
 
-	"github.com/ipfs/go-log"
+	"github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-pubsub"
 

diff --git a/internal/pkg/net/msgsub/validator.go b/internal/pkg/net/msgsub/validator.go
@@ -3,7 +3,7 @@ package msgsub
 import (
 	"context"
 
-	"github.com/ipfs/go-log"
+	"github.com/ipfs/go-log/v2"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/libp2p/go-libp2p-pubsub"
 

diff --git a/internal/pkg/poster/poster.go b/internal/pkg/poster/poster.go
@@ -10,7 +10,7 @@ import (
 	"github.com/filecoin-project/go-filecoin/internal/pkg/vm/gas"
 	"github.com/filecoin-project/specs-actors/actors/builtin"
 	"github.com/filecoin-project/specs-actors/actors/builtin/miner"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/filecoin-project/go-address"
 	sectorstorage "github.com/filecoin-project/sector-storage"

diff --git a/internal/pkg/repo/fsrepo.go b/internal/pkg/repo/fsrepo.go
@@ -15,7 +15,7 @@ import (
 	badgerds "github.com/ipfs/go-ds-badger2"
 	lockfile "github.com/ipfs/go-fs-lock"
 	keystore "github.com/ipfs/go-ipfs-keystore"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 

diff --git a/internal/pkg/testhelpers/iptbtester/wrapper.go b/internal/pkg/testhelpers/iptbtester/wrapper.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	testbedi "github.com/ipfs/iptb/testbed/interfaces"
 
 	iptb "github.com/ipfs/iptb/testbed"

diff --git a/internal/pkg/vm/internal/vmcontext/vmcontext.go b/internal/pkg/vm/internal/vmcontext/vmcontext.go
@@ -16,7 +16,7 @@ import (
 	"github.com/filecoin-project/specs-actors/actors/runtime/exitcode"
 	"github.com/filecoin-project/specs-actors/actors/util/adt"
 	"github.com/ipfs/go-cid"
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 	"github.com/pkg/errors"
 
 	"github.com/filecoin-project/go-filecoin/internal/pkg/block"

diff --git a/main.go b/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	logging "github.com/ipfs/go-log"
+	logging "github.com/ipfs/go-log/v2"
 
 	"github.com/filecoin-project/go-filecoin/cmd/go-filecoin"
 )