Move "logger" package to under types, now that we have it.

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>

control/controlclient/auto.go

@@ -18,10 +18,10 @@ import (
 	"time"
 
 	"golang.org/x/oauth2"
-	"tailscale.com/logger"
 	"tailscale.com/logtail/backoff"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/empty"
+	"tailscale.com/types/logger"
 )
 
 // TODO(apenwarr): eliminate the 'state' variable, as it's now obsolete.

control/controlclient/direct.go

@@ -25,8 +25,8 @@ import (
 	"github.com/tailscale/wireguard-go/wgcfg"
 	"golang.org/x/crypto/nacl/box"
 	"golang.org/x/oauth2"
-	"tailscale.com/logger"
 	"tailscale.com/tailcfg"
+	"tailscale.com/types/logger"
 	"tailscale.com/version"
 	"tailscale.com/wgengine/filter"
 )

derp/derp_client.go

@@ -15,7 +15,7 @@ import (
 
 	"golang.org/x/crypto/curve25519"
 	"golang.org/x/crypto/nacl/box"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 type Client struct {

derp/derp_server.go

@@ -23,7 +23,7 @@ import (
 
 	"golang.org/x/crypto/curve25519"
 	"golang.org/x/crypto/nacl/box"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 const magic = 0x44c55250 // "DERP" with a non-ASCII high-bit

derp/derphttp/derphttp_client.go

@@ -23,7 +23,7 @@ import (
 	"sync"
 
 	"tailscale.com/derp"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 // Client is a DERP-over-HTTP client.

ipn/handle.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/tailscale/wireguard-go/wgcfg"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 type Handle struct {

ipn/ipnserver/server.go

@@ -22,9 +22,9 @@ import (
 	"github.com/klauspost/compress/zstd"
 	"tailscale.com/control/controlclient"
 	"tailscale.com/ipn"
-	"tailscale.com/logger"
 	"tailscale.com/logtail/backoff"
 	"tailscale.com/safesocket"
+	"tailscale.com/types/logger"
 	"tailscale.com/wgengine"
 )
 

ipn/local.go

@@ -14,10 +14,10 @@ import (
 
 	"github.com/tailscale/wireguard-go/wgcfg"
 	"tailscale.com/control/controlclient"
-	"tailscale.com/logger"
 	"tailscale.com/portlist"
 	"tailscale.com/tailcfg"
 	"tailscale.com/types/empty"
+	"tailscale.com/types/logger"
 	"tailscale.com/version"
 	"tailscale.com/wgengine"
 	"tailscale.com/wgengine/filter"

ipn/message.go

@@ -13,7 +13,7 @@ import (
 	"log"
 	"time"
 
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 	"tailscale.com/version"
 )
 

wgengine/monitor/monitor.go

@@ -9,7 +9,7 @@ package monitor
 import (
 	"time"
 
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 // Message represents a message returned from a connection.

wgengine/router_bsd.go

@@ -15,7 +15,7 @@ import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
 	"github.com/tailscale/wireguard-go/wgcfg"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 // For now this router only supports the userspace WireGuard implementations.

wgengine/router_darwin.go

@@ -7,7 +7,7 @@ package wgengine
 import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 type darwinRouter struct {

wgengine/router_default.go

@@ -9,7 +9,7 @@ package wgengine
 import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 func NewUserspaceRouter(logf logger.Logf, tunname string, dev *device.Device, tuntap tun.Device, netChanged func()) Router {

wgengine/router_fake.go

@@ -7,7 +7,7 @@ package wgengine
 import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 type fakeRouter struct {

wgengine/router_linux.go

@@ -19,7 +19,7 @@ import (
 	"github.com/tailscale/wireguard-go/tun"
 	"github.com/tailscale/wireguard-go/wgcfg"
 	"tailscale.com/atomicfile"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 	"tailscale.com/wgengine/monitor"
 )
 

wgengine/router_windows.go

@@ -10,7 +10,7 @@ import (
 	winipcfg "github.com/tailscale/winipcfg-go"
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 type winRouter struct {

wgengine/rusage.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"tailscale.com/logger"
+	"tailscale.com/types/logger"
 )
 
 // RusagePrefixLog returns a Logf func wrapping the provided logf func that adds

wgengine/userspace.go

@@ -16,8 +16,8 @@ import (
 	"github.com/tailscale/wireguard-go/device"
 	"github.com/tailscale/wireguard-go/tun"
 	"github.com/tailscale/wireguard-go/wgcfg"
-	"tailscale.com/logger"
 	"tailscale.com/tailcfg"
+	"tailscale.com/types/logger"
 	"tailscale.com/wgengine/filter"
 	"tailscale.com/wgengine/magicsock"
 	"tailscale.com/wgengine/packet"