dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-08-29 07:39:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up redundant String calls in logs (#3064)

Browse Source
This commit is contained in:
Paul Wells
2024-10-03 08:08:46 -07:00
committed by GitHub
parent af15f211d0
commit 99f7be7c1c
4 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/sfu/forwarder.go
+4 -4
View File
@@ -1740,9 +1740,9 @@ func (f *Forwarder) processSourceSwitch(extPkt *buffer.ExtPacket, layer int32) e
extRefTS = extExpectedTS
f.logger.Infow(
"calculating dummyStartTSOffset",
"preStartTime", f.preStartTime.String(),
"preStartTime", f.preStartTime,
"extFirstTS", f.extFirstTS,
"timeSinceFirst", timeSinceFirst.String(),
"timeSinceFirst", timeSinceFirst,
"rtpDiff", rtpDiff,
"extRefTS", extRefTS,
"incomingTS", extPkt.Packet.Timestamp,
@@ -1831,7 +1831,7 @@ func (f *Forwarder) processSourceSwitch(extPkt *buffer.ExtPacket, layer int32) e
if bigJump { // TODO-REMOVE-AFTER-DATA-COLLECTION
f.logger.Infow(
"next timestamp on switch",
"switchingAt", switchingAt.String(),
"switchingAt", switchingAt,
"layer", layer,
"extLastTS", extLastTS,
"lastMarker", rtpMungerState.LastMarker,
@@ -1849,7 +1849,7 @@ func (f *Forwarder) processSourceSwitch(extPkt *buffer.ExtPacket, layer int32) e
} else {
f.logger.Debugw(
"next timestamp on switch",
"switchingAt", switchingAt.String(),
"switchingAt", switchingAt,
"layer", layer,
"extLastTS", extLastTS,
"lastMarker", rtpMungerState.LastMarker,
pkg/sfu/rtpstats/rtpstats_base.go
+8 -8
View File
@@ -529,17 +529,17 @@ func (r *rtpStatsBase) maybeAdjustFirstPacketTime(srData *livekit.RTCPSenderRepo
getFields := func() []interface{} {
return []interface{}{
"startTime", r.startTime.String(),
"nowTime", time.Unix(0, now).String(),
"before", time.Unix(0, r.firstTime).String(),
"after", time.Unix(0, firstTime).String(),
"adjustment", time.Duration(r.firstTime - firstTime).String(),
"startTime", r.startTime,
"nowTime", time.Unix(0, now),
"before", time.Unix(0, r.firstTime),
"after", time.Unix(0, firstTime),
"adjustment", time.Duration(r.firstTime - firstTime),
"extNowTS", extNowTS,
"extStartTS", extStartTS,
"srData", WrappedRTCPSenderReportStateLogger{srData},
"tsOffset", tsOffset,
"timeSinceReceive", timeSinceReceive.String(),
"timeSinceFirst", timeSinceFirst.String(),
"timeSinceReceive", timeSinceReceive,
"timeSinceFirst", timeSinceFirst,
"samplesDiff", samplesDiff,
"samplesDuration", samplesDuration,
}
@@ -593,7 +593,7 @@ func (r *rtpStatsBase) deltaInfo(snapshotID uint32, extStartSN uint64, extHighes
"packetsExpected", packetsExpected,
"startTime", startTime,
"endTime", endTime,
"duration", endTime.Sub(startTime).String(),
"duration", endTime.Sub(startTime),
}
err = errors.New("too many packets expected in delta")
return
pkg/sfu/rtpstats/rtpstats_receiver.go
+1 -1
View File
@@ -160,7 +160,7 @@ func (r *RTPStatsReceiver) Update(
"snRolloverCount", snRolloverCount,
"expectedTSJump", expectedTSJump,
"tsRolloverCount", tsRolloverCount,
"packetTime", time.Unix(0, packetTime).String(),
"packetTime", time.Unix(0, packetTime),
"sequenceNumber", sequenceNumber,
"timestamp", timestamp,
"marker", marker,
pkg/sfu/rtpstats/rtpstats_sender.go
+28 -29
View File
@@ -83,23 +83,22 @@ func (is *intervalStats) aggregate(other *intervalStats) {
is.packetsNotFound += other.packetsNotFound
}
func (is *intervalStats) ToString() string {
func (is *intervalStats) MarshalLogObject(e zapcore.ObjectEncoder) error {
if is == nil {
return "-"
return nil
}
e.AddUint64("packets", is.packets)
e.AddUint64("bytes", is.bytes)
e.AddUint64("headerBytes", is.headerBytes)
e.AddUint64("packetsPadding", is.packetsPadding)
e.AddUint64("bytesPadding", is.bytesPadding)
e.AddUint64("headerBytesPadding", is.headerBytesPadding)
e.AddUint64("packetsLost", is.packetsLost)
e.AddUint64("packetsOutOfOrder", is.packetsOutOfOrder)
e.AddUint32("frames", is.frames)
e.AddUint64("packetsNotFound", is.packetsNotFound)
return fmt.Sprintf("p: %d, b: %d, hb: %d, pp: %d, bp: %d, hbp: %d, pl: %d, pooo: %d, f: %d, pnf: %d",
is.packets,
is.bytes,
is.headerBytes,
is.packetsPadding,
is.bytesPadding,
is.headerBytesPadding,
is.packetsLost,
is.packetsOutOfOrder,
is.frames,
is.packetsNotFound,
)
return nil
}
// -------------------------------------------------------------------
@@ -467,7 +466,7 @@ func (r *RTPStatsSender) UpdateFromReceiverReport(rr rtcp.ReceptionReport) (rtt
if !r.lastRRTime.IsZero() && r.extHighestSNFromRR > extHighestSNFromRR {
r.logger.Debugw(
fmt.Sprintf("receiver report potentially out of order, highestSN: existing: %d, received: %d", r.extHighestSNFromRR, extHighestSNFromRR),
"sinceLastRR", time.Since(r.lastRRTime).String(),
"sinceLastRR", time.Since(r.lastRRTime),
"receivedRR", rr,
"rtpStats", lockedRTPStatsSenderLogEncoder{r},
)
@@ -531,7 +530,7 @@ func (r *RTPStatsSender) UpdateFromReceiverReport(rr rtcp.ReceptionReport) (rtt
}
r.logger.Infow(
"rr interval too big, skipping",
"timeSinceLastRR", timeSinceLastRR.String(),
"timeSinceLastRR", timeSinceLastRR,
"receivedRR", rr,
"extReceivedRRSN", extReceivedRRSN,
"packetsInInterval", extReceivedRRSN-s.extLastRRSN,
@@ -553,12 +552,12 @@ func (r *RTPStatsSender) UpdateFromReceiverReport(rr rtcp.ReceptionReport) (rtt
if (r.metadataCacheOverflowCount-1)%10 == 0 {
r.logger.Infow(
"metadata cache overflow",
"timeSinceLastRR", timeSinceLastRR.String(),
"timeSinceLastRR", timeSinceLastRR,
"receivedRR", rr,
"extReceivedRRSN", extReceivedRRSN,
"packetsInInterval", extReceivedRRSN-s.extLastRRSN,
"intervalStats", is.ToString(),
"aggregateIntervalStats", eis.ToString(),
"intervalStats", &is,
"aggregateIntervalStats", eis,
"count", r.metadataCacheOverflowCount,
"rtpStats", lockedRTPStatsSenderLogEncoder{r},
)
@@ -645,12 +644,12 @@ func (r *RTPStatsSender) GetRtcpSenderReport(ssrc uint32, publisherSRData *livek
"curr", WrappedRTCPSenderReportStateLogger{srData},
"feed", WrappedRTCPSenderReportStateLogger{publisherSRData},
"tsOffset", tsOffset,
"timeNow", time.Now().String(),
"now", time.Unix(0, now).String(),
"timeSinceHighest", time.Unix(0, now).Sub(time.Unix(0, r.highestTime)).String(),
"timeSinceFirst", time.Unix(0, now).Sub(time.Unix(0, r.firstTime)).String(),
"timeSincePublisherSRAdjusted", timeSincePublisherSRAdjusted.String(),
"timeSincePublisherSR", time.Since(time.Unix(0, publisherSRData.At)).String(),
"timeNow", time.Now(),
"now", time.Unix(0, now),
"timeSinceHighest", time.Duration(now-r.highestTime),
"timeSinceFirst", time.Duration(now-r.firstTime),
"timeSincePublisherSRAdjusted", timeSincePublisherSRAdjusted,
"timeSincePublisherSR", time.Since(time.Unix(0, publisherSRData.At)),
"nowRTPExt", nowRTPExt,
"rtpStats", lockedRTPStatsSenderLogEncoder{r},
)
@@ -664,7 +663,7 @@ func (r *RTPStatsSender) GetRtcpSenderReport(ssrc uint32, publisherSRData *livek
if (r.clockSkewCount-1)%100 == 0 {
logger.Infow(
"sending sender report, clock skew",
"timeSinceLastReport", timeSinceLastReport.String(),
"timeSinceLastReport", timeSinceLastReport,
"rtpDiffSinceLastReport", rtpDiffSinceLastReport,
"windowClockRate", windowClockRate,
"count", r.clockSkewCount,
@@ -732,9 +731,9 @@ func (r *RTPStatsSender) DeltaInfoSender(senderSnapshotID uint32) *RTPDeltaInfo
"startSN", then.extStartSN,
"endSN", now.extStartSN,
"packetsExpected", packetsExpected,
"startTime", startTime.String(),
"endTime", endTime.String(),
"duration", endTime.Sub(startTime).String(),
"startTime", startTime,
"endTime", endTime,
"duration", endTime.Sub(startTime),
"rtpStats", lockedRTPStatsSenderLogEncoder{r},
)
return nil