From 49ca1066cd82575039609ed34a2c030a2ee3beec Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Wed, 15 Nov 2023 12:57:03 +0530 Subject: [PATCH] Reduce logging (#2243) * Reduce logging 1. Do not print rtp stats if nil. Means that some subscribed tracks may not have any logs (very short subscriptions which end before any packet is sent). 2. Log ICE candidates only at the end, not when ICE connects. That logs the selected ICE candidate pair. 3. Log ICE candidates only if not empty. * Update some deps --- go.mod | 4 ++-- go.sum | 7 ++++--- pkg/rtc/transport.go | 20 +++++++++++--------- pkg/sfu/downtrack.go | 5 ++++- 4 files changed, 21 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 79543f407..2654fba97 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/maxbrunsfeld/counterfeiter/v6 v6.7.0 github.com/mitchellh/go-homedir v1.1.0 github.com/olekukonko/tablewriter v0.0.5 - github.com/pion/dtls/v2 v2.2.7 + github.com/pion/dtls/v2 v2.2.8 github.com/pion/ice/v2 v2.3.11 github.com/pion/interceptor v0.1.25 github.com/pion/rtcp v1.2.12 @@ -71,7 +71,7 @@ require ( github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/josharian/native v1.1.0 // indirect github.com/klauspost/compress v1.17.2 // indirect - github.com/klauspost/cpuid/v2 v2.2.5 // indirect + github.com/klauspost/cpuid/v2 v2.2.6 // indirect github.com/lithammer/shortuuid/v4 v4.0.0 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect diff --git a/go.sum b/go.sum index 3715a2edf..2eb764325 100644 --- a/go.sum +++ b/go.sum @@ -109,8 +109,8 @@ github.com/jxskiss/base62 v1.1.0 h1:A5zbF8v8WXx2xixnAKD2w+abC+sIzYJX+nxmhA6HWFw= github.com/jxskiss/base62 v1.1.0/go.mod h1:HhWAlUXvxKThfOlZbcuFzsqwtF5TcqS9ru3y5GfjWAc= github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= -github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/cpuid/v2 v2.2.6 h1:ndNyv040zDGIDh8thGkXYjnFtiN02M1PVVF+JE/48xc= +github.com/klauspost/cpuid/v2 v2.2.6/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= @@ -180,8 +180,9 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI= github.com/pion/datachannel v1.5.5 h1:10ef4kwdjije+M9d7Xm9im2Y3O6A6ccQb0zcqZcJew8= github.com/pion/datachannel v1.5.5/go.mod h1:iMz+lECmfdCMqFRhXhcA/219B0SQlbpoR2V118yimL0= -github.com/pion/dtls/v2 v2.2.7 h1:cSUBsETxepsCSFSxC3mc/aDo14qQLMSL+O6IjG28yV8= github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= +github.com/pion/dtls/v2 v2.2.8 h1:BUroldfiIbV9jSnC6cKOMnyiORRWrWWpV11JUyEu5OA= +github.com/pion/dtls/v2 v2.2.8/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s= github.com/pion/ice/v2 v2.3.11 h1:rZjVmUwyT55cmN8ySMpL7rsS8KYsJERsrxJLLxpKhdw= github.com/pion/ice/v2 v2.3.11/go.mod h1:hPcLC3kxMa+JGRzMHqQzjoSj3xtE9F+eoncmXLlCL4E= github.com/pion/interceptor v0.1.25 h1:pwY9r7P6ToQ3+IF0bajN0xmk/fNw/suTgaTdlwTDmhc= diff --git a/pkg/rtc/transport.go b/pkg/rtc/transport.go index ca22ffeec..16e454e78 100644 --- a/pkg/rtc/transport.go +++ b/pkg/rtc/transport.go @@ -657,12 +657,10 @@ func (t *PCTransport) onPeerConnectionStateChange(state webrtc.PeerConnectionSta } t.maybeNotifyFullyEstablished() - t.logICECandidates() } case webrtc.PeerConnectionStateFailed: t.params.Logger.Infow("peer connection failed") t.clearConnTimer() - t.logICECandidates() t.handleConnectionFailed(false) } } @@ -1606,13 +1604,17 @@ func (t *PCTransport) handleRemoteICECandidate(e *event) error { } func (t *PCTransport) handleLogICECandidates(e *event) error { - t.params.Logger.Infow( - "ice candidates", - "lc", t.allowedLocalCandidates.Get(), - "rc", t.allowedRemoteCandidates.Get(), - "lc (filtered)", t.filteredLocalCandidates.Get(), - "rc (filtered)", t.filteredRemoteCandidates.Get(), - ) + lc := t.allowedLocalCandidates.Get() + rc := t.allowedRemoteCandidates.Get() + if len(lc) != 0 || len(rc) != 0 { + t.params.Logger.Infow( + "ice candidates", + "lc", lc, + "rc", rc, + "lc (filtered)", t.filteredLocalCandidates.Get(), + "rc (filtered)", t.filteredRemoteCandidates.Get(), + ) + } return nil } diff --git a/pkg/sfu/downtrack.go b/pkg/sfu/downtrack.go index 07d7f45fa..c15e68dde 100644 --- a/pkg/sfu/downtrack.go +++ b/pkg/sfu/downtrack.go @@ -984,7 +984,10 @@ func (d *DownTrack) CloseWithFlush(flush bool) { d.bindLock.Unlock() d.connectionStats.Close() d.rtpStats.Stop() - d.params.Logger.Infow("rtp stats", "direction", "downstream", "mime", d.mime, "ssrc", d.ssrc, "stats", d.rtpStats.ToString()) + rtpStats := d.rtpStats.ToString() + if rtpStats != "" { + d.params.Logger.Infow("rtp stats", "direction", "downstream", "mime", d.mime, "ssrc", d.ssrc, "stats", rtpStats) + } d.maxLayerNotifierChMu.Lock() d.maxLayerNotifierChClosed = true