archive
/
tailscale
mirror of https://github.com/tailscale/tailscale/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipn/ipnlocal, engine: avoid runtime/pprof with two usages of ts_omit_debug

Browse Source 
Saves 258 KB.

Updates #12614

Change-Id: I37c2f7f916480e3534883f338de4c64d08f7ef2b
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
pull/17378/head
Brad Fitzpatrick 2 months ago committed by Brad Fitzpatrick
parent f7afb9b6ca
commit 5b09913d64
7 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File

4
cmd/tailscaled/depaware-min.txt
Unescape Escape View File

@ -345,7 +345,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
internal/nettrace from net+ internal/nettrace from net+
internal/oserror from io/fs+ internal/oserror from io/fs+
internal/poll from net+ internal/poll from net+
internal/profilerecord from runtime+ internal/profilerecord from runtime
internal/race from internal/runtime/maps+ internal/race from internal/runtime/maps+
internal/reflectlite from context+ internal/reflectlite from context+
internal/runtime/atomic from internal/runtime/exithook+ internal/runtime/atomic from internal/runtime/exithook+
@ -398,7 +398,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
reflect from crypto/x509+ reflect from crypto/x509+
runtime from crypto/internal/fips140+ runtime from crypto/internal/fips140+
runtime/debug from github.com/klauspost/compress/zstd+ runtime/debug from github.com/klauspost/compress/zstd+
runtime/pprof from tailscale.com/ipn/ipnlocal+
slices from crypto/tls+ slices from crypto/tls+
sort from compress/flate+ sort from compress/flate+
strconv from compress/flate+ strconv from compress/flate+
@ -406,7 +405,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
sync from compress/flate+ sync from compress/flate+
sync/atomic from context+ sync/atomic from context+
syscall from crypto/internal/sysrand+ syscall from crypto/internal/sysrand+
text/tabwriter from runtime/pprof
time from compress/gzip+ time from compress/gzip+
unicode from bytes+ unicode from bytes+
unicode/utf16 from crypto/x509+ unicode/utf16 from crypto/x509+

5
cmd/tailscaled/depaware-minbox.txt
Unescape Escape View File

@ -378,7 +378,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
internal/nettrace from net+ internal/nettrace from net+
internal/oserror from io/fs+ internal/oserror from io/fs+
internal/poll from net+ internal/poll from net+
internal/profilerecord from runtime+ internal/profilerecord from runtime
internal/race from internal/runtime/maps+ internal/race from internal/runtime/maps+
internal/reflectlite from context+ internal/reflectlite from context+
internal/runtime/atomic from internal/runtime/exithook+ internal/runtime/atomic from internal/runtime/exithook+
@ -435,7 +435,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
regexp/syntax from regexp regexp/syntax from regexp
runtime from crypto/internal/fips140+ runtime from crypto/internal/fips140+
runtime/debug from github.com/klauspost/compress/zstd+ runtime/debug from github.com/klauspost/compress/zstd+
runtime/pprof from tailscale.com/ipn/ipnlocal+
slices from crypto/tls+ slices from crypto/tls+
sort from compress/flate+ sort from compress/flate+
strconv from compress/flate+ strconv from compress/flate+
@ -443,7 +442,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
sync from compress/flate+ sync from compress/flate+
sync/atomic from context+ sync/atomic from context+
syscall from crypto/internal/sysrand+ syscall from crypto/internal/sysrand+
text/tabwriter from runtime/pprof+ text/tabwriter from github.com/peterbourgon/ff/v3/ffcli+
time from compress/gzip+ time from compress/gzip+
unicode from bytes+ unicode from bytes+
unicode/utf16 from crypto/x509+ unicode/utf16 from crypto/x509+

1
cmd/tailscaled/deps_test.go
Unescape Escape View File

@ -256,6 +256,7 @@ func TestMinTailscaledWithCLI(t *testing.T) {
badSubstrs := []string{ badSubstrs := []string{
"cbor", "cbor",
"hujson", "hujson",
"pprof",
} }
deptest.DepChecker{ deptest.DepChecker{
GOOS: "linux", GOOS: "linux",

2
ipn/ipnlocal/c2n_pprof.go
Unescape Escape View File

@ -1,7 +1,7 @@
// Copyright (c) Tailscale Inc & AUTHORS // Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
//go:build !js && !wasm //go:build !js && !wasm && !ts_omit_debug
package ipnlocal package ipnlocal

2
wgengine/watchdog.go
Unescape Escape View File

@ -1,7 +1,7 @@
// Copyright (c) Tailscale Inc & AUTHORS // Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause // SPDX-License-Identifier: BSD-3-Clause
//go:build !js //go:build !js && !ts_omit_debug
package wgengine package wgengine

17
wgengine/watchdog_js.go
Unescape Escape View File

@ -1,17 +0,0 @@
// Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause
//go:build js
package wgengine
import "tailscale.com/net/dns/resolver"
type watchdogEngine struct {
Engine
wrap Engine
}
func (e *watchdogEngine) GetResolver() (r *resolver.Resolver, ok bool) {
return nil, false
}

8
wgengine/watchdog_omit.go
Unescape Escape View File

@ -0,0 +1,8 @@
// Copyright (c) Tailscale Inc & AUTHORS
// SPDX-License-Identifier: BSD-3-Clause
//go:build js || ts_omit_debug
package wgengine
func NewWatchdog(e Engine) Engine { return e }
Write Preview
Loading…
Cancel
Save