go.mod: bump oss, plumb new health.Tracker

Updates tailscale/tailscale#11874

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/353/head
Brad Fitzpatrick 3 weeks ago
parent a6bc2244b6
commit 5fedf684b9

@ -7,7 +7,7 @@ require (
golang.org/x/mobile v0.0.0-20240319015410-c58ccf4b0c87
golang.org/x/sys v0.18.0
inet.af/netaddr v0.0.0-20220617031823-097006376321
tailscale.com v1.65.0-pre.0.20240424052348-1d3e77f3735f
tailscale.com v1.65.0-pre.0.20240426190311-745931415c58
)
require (

@ -258,5 +258,5 @@ nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q=
nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c=
software.sslmate.com/src/go-pkcs12 v0.4.0 h1:H2g08FrTvSFKUj+D309j1DPfk5APnIdAQAB8aEykJ5k=
software.sslmate.com/src/go-pkcs12 v0.4.0/go.mod h1:Qiz0EyvDRJjjxGyUQa2cCNZn/wMyzrRJ/qcDXOQazLI=
tailscale.com v1.65.0-pre.0.20240424052348-1d3e77f3735f h1:RfDWo37U2NWcKGgJVoeEIWAL9gkRGahrGCL4HXHt6Dc=
tailscale.com v1.65.0-pre.0.20240424052348-1d3e77f3735f/go.mod h1:UPEw7cAt2akD8W6uPaiIBx2EFxCKmrJJ7qMnqCsyE/4=
tailscale.com v1.65.0-pre.0.20240426190311-745931415c58 h1:jaNg4PNudNUA/QeYBS8S5eInSSTjxHy+ReCxSCE7SzI=
tailscale.com v1.65.0-pre.0.20240426190311-745931415c58/go.mod h1:UPEw7cAt2akD8W6uPaiIBx2EFxCKmrJJ7qMnqCsyE/4=

@ -132,7 +132,7 @@ func (a *App) runBackend(ctx context.Context) error {
a.backend = b.backend
defer b.CloseTUNs()
h := localapi.NewHandler(b.backend, log.Printf, b.sys.NetMon.Get(), *a.logIDPublicAtomic.Load())
h := localapi.NewHandler(b.backend, log.Printf, *a.logIDPublicAtomic.Load())
h.PermitRead = true
h.PermitWrite = true
a.localAPIHandler = h
@ -265,7 +265,7 @@ func newBackend(dataDir, directFileRoot string, appCtx AppContext, store *stateS
log.Printf("netmon.New: %w", err)
}
b.netMon = netMon
b.setupLogs(dataDir, logID, logf)
b.setupLogs(dataDir, logID, logf, sys.HealthTracker())
dialer := new(tsdial.Dialer)
vf := &VPNFacade{
SetBoth: b.setCfg,
@ -279,6 +279,7 @@ func newBackend(dataDir, directFileRoot string, appCtx AppContext, store *stateS
Dialer: dialer,
SetSubsystem: sys.Set,
NetMon: b.netMon,
HealthTracker: sys.HealthTracker(),
DriveForLocal: driveimpl.NewFileSystemForLocal(logf),
})
if err != nil {

@ -11,6 +11,7 @@ import (
"runtime/debug"
"time"
"tailscale.com/health"
"tailscale.com/logpolicy"
"tailscale.com/logtail"
"tailscale.com/logtail/filch"
@ -91,11 +92,11 @@ func (a *App) isChromeOS() bool {
}
// SetupLogs sets up remote logging.
func (b *backend) setupLogs(logDir string, logID logid.PrivateID, logf logger.Logf) {
func (b *backend) setupLogs(logDir string, logID logid.PrivateID, logf logger.Logf, health *health.Tracker) {
if b.netMon == nil {
panic("netMon must be created prior to SetupLogs")
}
transport := logpolicy.NewLogtailTransport(logtail.DefaultHost, b.netMon, log.Printf)
transport := logpolicy.NewLogtailTransport(logtail.DefaultHost, b.netMon, health, log.Printf)
logcfg := logtail.Config{
Collection: logtail.CollectionNode,

Loading…
Cancel
Save