multi: start updating various loggers to use the new v2 type

autopilot/log.go

@@ -1,7 +1,7 @@
 package autopilot
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

chainntnfs/log.go

@@ -1,7 +1,7 @@
 package chainntnfs
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

chainreg/log.go

@@ -1,7 +1,7 @@
 package chainreg
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

chanacceptor/log.go

@@ -1,7 +1,7 @@
 package chanacceptor
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

chanbackup/log.go

@@ -1,7 +1,7 @@
 package chanbackup
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

chanfitness/log.go

@@ -1,7 +1,7 @@
 package chanfitness
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

channeldb/log.go

@@ -1,7 +1,7 @@
 package channeldb
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 	mig "github.com/lightningnetwork/lnd/channeldb/migration"
 	"github.com/lightningnetwork/lnd/channeldb/migration12"

channeldb/migration/log.go

@@ -1,6 +1,6 @@
 package migration
 
-import "github.com/btcsuite/btclog"
+import "github.com/btcsuite/btclog/v2"
 
 // log is a logger that is initialized as disabled.  This means the package will
 // not perform any logging by default until a logger is set.

channeldb/migration12/log.go

@@ -1,7 +1,7 @@
 package migration12
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration13/log.go

@@ -1,7 +1,7 @@
 package migration13
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration16/log.go

@@ -1,7 +1,7 @@
 package migration16
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration20/log.go

@@ -1,7 +1,7 @@
 package migration20
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled. This means the package

channeldb/migration24/log.go

@@ -1,7 +1,7 @@
 package migration24
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration25/log.go

@@ -1,7 +1,7 @@
 package migration25
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration26/log.go

@@ -1,7 +1,7 @@
 package migration26
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration27/log.go

@@ -1,7 +1,7 @@
 package migration27
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration29/log.go

@@ -1,6 +1,6 @@
 package migration29
 
-import "github.com/btcsuite/btclog"
+import "github.com/btcsuite/btclog/v2"
 
 // log is a logger that is initialized as disabled. This means the package will
 // not perform any logging by default until a logger is set.

channeldb/migration30/log.go

@@ -1,7 +1,7 @@
 package migration30
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration31/log.go

@@ -1,7 +1,7 @@
 package migration31
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration32/log.go

@@ -1,7 +1,7 @@
 package migration32
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration33/log.go

@@ -1,7 +1,7 @@
 package migration33
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channeldb/migration_01_to_11/log.go

@@ -1,7 +1,7 @@
 package migration_01_to_11
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

channelnotifier/log.go

@@ -1,7 +1,7 @@
 package channelnotifier
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

cluster/log.go

@@ -1,7 +1,7 @@
 package cluster
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

contractcourt/log.go

@@ -1,7 +1,7 @@
 package contractcourt
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

discovery/log.go

@@ -1,7 +1,7 @@
 package discovery
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

funding/log.go

@@ -1,7 +1,7 @@
 package funding
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

graph/log.go

@@ -1,7 +1,7 @@
 package graph
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

htlcswitch/hop/log.go

@@ -1,7 +1,7 @@
 package hop
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized with no output filters.  This

htlcswitch/log.go

@@ -1,7 +1,7 @@
 package htlcswitch
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/htlcswitch/hop"
 )

invoices/log.go

@@ -1,7 +1,7 @@
 package invoices
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lncfg/log.go

@@ -1,7 +1,7 @@
 package lncfg
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/autopilotrpc/log.go

@@ -1,7 +1,7 @@
 package autopilotrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/chainrpc/log.go

@@ -1,7 +1,7 @@
 package chainrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/devrpc/log.go

@@ -1,7 +1,7 @@
 package devrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/invoicesrpc/log.go

@@ -1,7 +1,7 @@
 package invoicesrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/neutrinorpc/log.go

@@ -1,7 +1,7 @@
 package neutrinorpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/peersrpc/log.go

@@ -1,7 +1,7 @@
 package peersrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/routerrpc/log.go

@@ -1,7 +1,7 @@
 package routerrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/signrpc/log.go

@@ -1,7 +1,7 @@
 package signrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/verrpc/log.go

@@ -1,7 +1,7 @@
 package verrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnrpc/walletrpc/log.go

@@ -1,7 +1,7 @@
 package walletrpc
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnwallet/btcwallet/log.go

@@ -1,7 +1,7 @@
 package btcwallet
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnwallet/chancloser/log.go

@@ -1,7 +1,7 @@
 package chancloser
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnwallet/chanfunding/log.go

@@ -1,7 +1,7 @@
 package chanfunding
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

lnwallet/log.go

@@ -1,7 +1,7 @@
 package lnwallet
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/btcsuite/btcwallet/chain"
 	btcwallet "github.com/btcsuite/btcwallet/wallet"
 	"github.com/btcsuite/btcwallet/wtxmgr"

lnwallet/rpcwallet/log.go

@@ -1,7 +1,7 @@
 package rpcwallet
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

log.go

@@ -126,7 +126,7 @@ func SetupLoggers(root *build.SubLoggerManager, interceptor signal.Interceptor)
 	// placeholder lnd package loggers.
 	for _, l := range lndPkgLoggers {
 		l.Logger = build.NewSubLogger(l.subsystem, genLogger)
-		SetV1SubLogger(root, l.subsystem, l.Logger)
+		SetSubLogger(root, l.subsystem, l.Logger)
 	}
 
 	// Initialize loggers from packages outside of `lnd` first. The
@@ -144,56 +144,82 @@ func SetupLoggers(root *build.SubLoggerManager, interceptor signal.Interceptor)
 	signal.UseLogger(ltndLog)
 	autopilot.UseLogger(atplLog)
 
-	AddV1SubLogger(root, "LNWL", interceptor, lnwallet.UseLogger)
+	AddSubLogger(root, "LNWL", interceptor, lnwallet.UseLogger)
-	AddV1SubLogger(root, "DISC", interceptor, discovery.UseLogger)
+	AddSubLogger(root, "DISC", interceptor, discovery.UseLogger)
-	AddV1SubLogger(root, "NTFN", interceptor, chainntnfs.UseLogger)
+	AddSubLogger(root, "NTFN", interceptor, chainntnfs.UseLogger)
-	AddV1SubLogger(root, "CHDB", interceptor, channeldb.UseLogger)
+	AddSubLogger(root, "CHDB", interceptor, channeldb.UseLogger)
-	AddV1SubLogger(root, "HSWC", interceptor, htlcswitch.UseLogger)
+	AddSubLogger(root, "HSWC", interceptor, htlcswitch.UseLogger)
-	AddV1SubLogger(root, "CNCT", interceptor, contractcourt.UseLogger)
+	AddSubLogger(root, "CNCT", interceptor, contractcourt.UseLogger)
-	AddV1SubLogger(root, "UTXN", interceptor, contractcourt.UseNurseryLogger)
+	AddSubLogger(root, "UTXN", interceptor, contractcourt.UseNurseryLogger)
-	AddV1SubLogger(root, "BRAR", interceptor, contractcourt.UseBreachLogger)
+	AddSubLogger(root, "BRAR", interceptor, contractcourt.UseBreachLogger)
 	AddV1SubLogger(root, "SPHX", interceptor, sphinx.UseLogger)
-	AddV1SubLogger(root, "SWPR", interceptor, sweep.UseLogger)
+	AddSubLogger(root, "SWPR", interceptor, sweep.UseLogger)
-	AddV1SubLogger(root, "SGNR", interceptor, signrpc.UseLogger)
+	AddSubLogger(root, "SGNR", interceptor, signrpc.UseLogger)
-	AddV1SubLogger(root, "WLKT", interceptor, walletrpc.UseLogger)
+	AddSubLogger(root, "WLKT", interceptor, walletrpc.UseLogger)
-	AddV1SubLogger(root, "ARPC", interceptor, autopilotrpc.UseLogger)
+	AddSubLogger(root, "ARPC", interceptor, autopilotrpc.UseLogger)
-	AddV1SubLogger(root, "NRPC", interceptor, neutrinorpc.UseLogger)
+	AddSubLogger(root, "NRPC", interceptor, neutrinorpc.UseLogger)
-	AddV1SubLogger(root, "DRPC", interceptor, devrpc.UseLogger)
+	AddSubLogger(root, "DRPC", interceptor, devrpc.UseLogger)
-	AddV1SubLogger(root, "INVC", interceptor, invoices.UseLogger)
+	AddSubLogger(root, "INVC", interceptor, invoices.UseLogger)
-	AddV1SubLogger(root, "NANN", interceptor, netann.UseLogger)
+	AddSubLogger(root, "NANN", interceptor, netann.UseLogger)
-	AddV1SubLogger(root, "WTWR", interceptor, watchtower.UseLogger)
+	AddSubLogger(root, "WTWR", interceptor, watchtower.UseLogger)
-	AddV1SubLogger(root, "NTFR", interceptor, chainrpc.UseLogger)
+	AddSubLogger(root, "NTFR", interceptor, chainrpc.UseLogger)
-	AddV1SubLogger(root, "IRPC", interceptor, invoicesrpc.UseLogger)
+	AddSubLogger(root, "IRPC", interceptor, invoicesrpc.UseLogger)
-	AddV1SubLogger(root, "CHNF", interceptor, channelnotifier.UseLogger)
+	AddSubLogger(root, "CHNF", interceptor, channelnotifier.UseLogger)
-	AddV1SubLogger(root, "CHBU", interceptor, chanbackup.UseLogger)
+	AddSubLogger(root, "CHBU", interceptor, chanbackup.UseLogger)
-	AddV1SubLogger(root, "PROM", interceptor, monitoring.UseLogger)
+	AddSubLogger(root, "PROM", interceptor, monitoring.UseLogger)
-	AddV1SubLogger(root, "WTCL", interceptor, wtclient.UseLogger)
+	AddSubLogger(root, "WTCL", interceptor, wtclient.UseLogger)
-	AddV1SubLogger(root, "PRNF", interceptor, peernotifier.UseLogger)
+	AddSubLogger(root, "PRNF", interceptor, peernotifier.UseLogger)
-	AddV1SubLogger(root, "CHFD", interceptor, chanfunding.UseLogger)
+	AddSubLogger(root, "CHFD", interceptor, chanfunding.UseLogger)
-	AddV1SubLogger(root, "PEER", interceptor, peer.UseLogger)
+	AddSubLogger(root, "PEER", interceptor, peer.UseLogger)
-	AddV1SubLogger(root, "CHCL", interceptor, chancloser.UseLogger)
+	AddSubLogger(root, "CHCL", interceptor, chancloser.UseLogger)
 
-	AddV1SubLogger(root, routing.Subsystem, interceptor, routing.UseLogger)
+	AddSubLogger(root, routing.Subsystem, interceptor, routing.UseLogger)
-	AddV1SubLogger(root, routerrpc.Subsystem, interceptor, routerrpc.UseLogger)
+	AddSubLogger(root, routerrpc.Subsystem, interceptor, routerrpc.UseLogger)
-	AddV1SubLogger(root, chanfitness.Subsystem, interceptor, chanfitness.UseLogger)
+	AddSubLogger(root, chanfitness.Subsystem, interceptor, chanfitness.UseLogger)
-	AddV1SubLogger(root, verrpc.Subsystem, interceptor, verrpc.UseLogger)
+	AddSubLogger(root, verrpc.Subsystem, interceptor, verrpc.UseLogger)
 	AddV1SubLogger(root, healthcheck.Subsystem, interceptor, healthcheck.UseLogger)
-	AddV1SubLogger(root, chainreg.Subsystem, interceptor, chainreg.UseLogger)
+	AddSubLogger(root, chainreg.Subsystem, interceptor, chainreg.UseLogger)
-	AddV1SubLogger(root, chanacceptor.Subsystem, interceptor, chanacceptor.UseLogger)
+	AddSubLogger(root, chanacceptor.Subsystem, interceptor, chanacceptor.UseLogger)
-	AddV1SubLogger(root, funding.Subsystem, interceptor, funding.UseLogger)
+	AddSubLogger(root, funding.Subsystem, interceptor, funding.UseLogger)
-	AddV1SubLogger(root, cluster.Subsystem, interceptor, cluster.UseLogger)
+	AddSubLogger(root, cluster.Subsystem, interceptor, cluster.UseLogger)
-	AddV1SubLogger(root, rpcperms.Subsystem, interceptor, rpcperms.UseLogger)
+	AddSubLogger(root, rpcperms.Subsystem, interceptor, rpcperms.UseLogger)
 	AddV1SubLogger(root, tor.Subsystem, interceptor, tor.UseLogger)
-	AddV1SubLogger(root, btcwallet.Subsystem, interceptor, btcwallet.UseLogger)
+	AddSubLogger(root, btcwallet.Subsystem, interceptor, btcwallet.UseLogger)
-	AddV1SubLogger(root, rpcwallet.Subsystem, interceptor, rpcwallet.UseLogger)
+	AddSubLogger(root, rpcwallet.Subsystem, interceptor, rpcwallet.UseLogger)
-	AddV1SubLogger(root, peersrpc.Subsystem, interceptor, peersrpc.UseLogger)
+	AddSubLogger(root, peersrpc.Subsystem, interceptor, peersrpc.UseLogger)
-	AddV1SubLogger(root, graph.Subsystem, interceptor, graph.UseLogger)
+	AddSubLogger(root, graph.Subsystem, interceptor, graph.UseLogger)
-	AddV1SubLogger(root, lncfg.Subsystem, interceptor, lncfg.UseLogger)
+	AddSubLogger(root, lncfg.Subsystem, interceptor, lncfg.UseLogger)
-	AddV1SubLogger(
+	AddSubLogger(
 		root, blindedpath.Subsystem, interceptor, blindedpath.UseLogger,
 	)
 }
 
+// AddSubLogger is a helper method to conveniently create and register the
+// logger of one or more sub systems.
+func AddSubLogger(root *build.SubLoggerManager, subsystem string,
+	interceptor signal.Interceptor, useLoggers ...func(btclog.Logger)) {
+
+	// genSubLogger will return a callback for creating a logger instance,
+	// which we will give to the root logger.
+	genLogger := genSubLogger(root, interceptor)
+
+	// Create and register just a single logger to prevent them from
+	// overwriting each other internally.
+	logger := build.NewSubLogger(subsystem, genLogger)
+	SetSubLogger(root, subsystem, logger, useLoggers...)
+}
+
+// SetSubLogger is a helper method to conveniently register the logger of a
+// sub system.
+func SetSubLogger(root *build.SubLoggerManager, subsystem string,
+	logger btclog.Logger, useLoggers ...func(btclog.Logger)) {
+
+	root.RegisterSubLogger(subsystem, logger)
+	for _, useLogger := range useLoggers {
+		useLogger(logger)
+	}
+}
+
 // AddV1SubLogger is a helper method to conveniently create and register the
 // logger of one or more sub systems.
 func AddV1SubLogger(root *build.SubLoggerManager, subsystem string,

monitoring/log.go

@@ -1,7 +1,7 @@
 package monitoring
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

netann/log.go

@@ -1,7 +1,7 @@
 package netann
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

peer/log.go

@@ -1,7 +1,7 @@
 package peer
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

peernotifier/log.go

@@ -1,7 +1,7 @@
 package peernotifier
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

routing/blindedpath/log.go

@@ -1,7 +1,7 @@
 package blindedpath
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

routing/chainview/log.go

@@ -1,7 +1,7 @@
 package chainview
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

routing/log.go

@@ -1,7 +1,7 @@
 package routing
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/routing/chainview"
 )

rpcperms/interceptor.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	"github.com/lightningnetwork/lnd/lnrpc"
 	"github.com/lightningnetwork/lnd/macaroons"

rpcperms/log.go

@@ -1,7 +1,7 @@
 package rpcperms
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

signal/log.go

@@ -1,6 +1,6 @@
 package signal
 
-import "github.com/btcsuite/btclog"
+import "github.com/btcsuite/btclog/v2"
 
 // log is a logger that is initialized with no output filters.  This
 // means the package will not perform any logging by default until the caller

sweep/log.go

@@ -1,7 +1,7 @@
 package sweep
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

watchtower/log.go

@@ -1,7 +1,7 @@
 package watchtower
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/watchtower/lookout"
 	"github.com/lightningnetwork/lnd/watchtower/wtclient"

watchtower/lookout/log.go

@@ -1,7 +1,7 @@
 package lookout
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

watchtower/wtclient/log.go

@@ -1,7 +1,7 @@
 package wtclient
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )
 

watchtower/wtdb/log.go

@@ -1,7 +1,7 @@
 package wtdb
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 	"github.com/lightningnetwork/lnd/watchtower/wtdb/migration1"
 	"github.com/lightningnetwork/lnd/watchtower/wtdb/migration2"

watchtower/wtdb/migration1/log.go

@@ -1,7 +1,7 @@
 package migration1
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

watchtower/wtdb/migration2/log.go

@@ -1,7 +1,7 @@
 package migration2
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

watchtower/wtdb/migration3/log.go

@@ -1,7 +1,7 @@
 package migration3
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

watchtower/wtdb/migration4/log.go

@@ -1,7 +1,7 @@
 package migration4
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

watchtower/wtdb/migration5/log.go

@@ -1,7 +1,7 @@
 package migration5
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

watchtower/wtdb/migration6/log.go

@@ -1,7 +1,7 @@
 package migration6
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

watchtower/wtdb/migration7/log.go

@@ -1,7 +1,7 @@
 package migration7
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

watchtower/wtdb/migration8/log.go

@@ -1,7 +1,7 @@
 package migration8
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 )
 
 // log is a logger that is initialized as disabled.  This means the package will

watchtower/wtserver/log.go

@@ -1,7 +1,7 @@
 package wtserver
 
 import (
-	"github.com/btcsuite/btclog"
+	"github.com/btcsuite/btclog/v2"
 	"github.com/lightningnetwork/lnd/build"
 )