@ -31,6 +31,7 @@ import (
tslogger "tailscale.com/types/logger"
tslogger "tailscale.com/types/logger"
"tailscale.com/types/logid"
"tailscale.com/types/logid"
"tailscale.com/util/set"
"tailscale.com/util/set"
"tailscale.com/util/zstdframe"
) )
// DefaultHost is the default host name to upload logs to when
// DefaultHost is the default host name to upload logs to when
@ -62,7 +63,10 @@ type Config struct {
Stderr io . Writer // if set, logs are sent here instead of os.Stderr
Stderr io . Writer // if set, logs are sent here instead of os.Stderr
StderrLevel int // max verbosity level to write to stderr; 0 means the non-verbose messages only
StderrLevel int // max verbosity level to write to stderr; 0 means the non-verbose messages only
Buffer Buffer // temp storage, if nil a MemoryBuffer
Buffer Buffer // temp storage, if nil a MemoryBuffer
NewZstdEncoder func ( ) Encoder // if set, used to compress logs for transmission
CompressLogs bool // whether to compress the log uploads
// Deprecated: Use CompressUploads instead.
NewZstdEncoder func ( ) Encoder // if set, used to compress logs for transmission
// MetricsDelta, if non-nil, is a func that returns an encoding
// MetricsDelta, if non-nil, is a func that returns an encoding
// delta in clientmetrics to upload alongside existing logs.
// delta in clientmetrics to upload alongside existing logs.
@ -156,6 +160,7 @@ func NewLogger(cfg Config, logf tslogger.Logf) *Logger {
shutdownDone : make ( chan struct { } ) ,
shutdownDone : make ( chan struct { } ) ,
}
}
l . SetSockstatsLabel ( sockstats . LabelLogtailLogger )
l . SetSockstatsLabel ( sockstats . LabelLogtailLogger )
l . compressLogs = cfg . CompressLogs
if cfg . NewZstdEncoder != nil {
if cfg . NewZstdEncoder != nil {
l . zstdEncoder = cfg . NewZstdEncoder ( )
l . zstdEncoder = cfg . NewZstdEncoder ( )
}
}
@ -184,6 +189,7 @@ type Logger struct {
flushPending atomic . Bool
flushPending atomic . Bool
sentinel chan int32
sentinel chan int32
clock tstime . Clock
clock tstime . Clock
compressLogs bool
zstdEncoder Encoder
zstdEncoder Encoder
uploadCancel func ( )
uploadCancel func ( )
explainedRaw bool
explainedRaw bool
@ -364,8 +370,18 @@ func (l *Logger) uploading(ctx context.Context) {
body := l . drainPending ( scratch )
body := l . drainPending ( scratch )
origlen := - 1 // sentinel value: uncompressed
origlen := - 1 // sentinel value: uncompressed
// Don't attempt to compress tiny bodies; not worth the CPU cycles.
// Don't attempt to compress tiny bodies; not worth the CPU cycles.
if l . zstdEncoder != nil && len ( body ) > 256 {
if ( l . compressLogs || l . zstdEncoder != nil ) && len ( body ) > 256 {
zbody := l . zstdEncoder . EncodeAll ( body , nil )
var zbody [ ] byte
switch {
case l . zstdEncoder != nil :
zbody = l . zstdEncoder . EncodeAll ( body , nil )
case l . lowMem :
zbody = zstdframe . AppendEncode ( nil , body ,
zstdframe . FastestCompression , zstdframe . LowMemory ( true ) )
default :
zbody = zstdframe . AppendEncode ( nil , body )
}
// Only send it compressed if the bandwidth savings are sufficient.
// Only send it compressed if the bandwidth savings are sufficient.
// Just the extra headers associated with enabling compression
// Just the extra headers associated with enabling compression
// are 50 bytes by themselves.
// are 50 bytes by themselves.
Joe Tsai
8 months ago
committed by