From e358aa4c8f39183b35e89f33f8bd0b6011f125df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Mert=20Y=C4=B1ld=C4=B1ran?= Date: Sun, 26 Dec 2021 15:10:02 +0300 Subject: [PATCH] Remove TCP related logging to reduce the amount of logs on `DEBUG` level (#553) --- tap/tcp_assembler.go | 7 +++---- tap/tcp_stream.go | 11 +---------- tap/tcp_stream_factory.go | 6 ------ 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/tap/tcp_assembler.go b/tap/tcp_assembler.go index 150834967..8bba8f81d 100644 --- a/tap/tcp_assembler.go +++ b/tap/tcp_assembler.go @@ -65,11 +65,11 @@ func (a *tcpAssembler) processPackets(dumpPacket bool, packets <-chan source.Tcp for packetInfo := range packets { packetsCount := diagnose.AppStats.IncPacketsCount() - - if packetsCount % PACKETS_SEEN_LOG_THRESHOLD == 0 { + + if packetsCount%PACKETS_SEEN_LOG_THRESHOLD == 0 { logger.Log.Debugf("Packets seen: #%d", packetsCount) } - + packet := packetInfo.Packet data := packet.Data() diagnose.AppStats.UpdateProcessedBytes(uint64(len(data))) @@ -91,7 +91,6 @@ func (a *tcpAssembler) processPackets(dumpPacket bool, packets <-chan source.Tcp CaptureInfo: packet.Metadata().CaptureInfo, } diagnose.InternalStats.Totalsz += len(tcp.Payload) - logger.Log.Debugf("%s:%v -> %s:%v", packet.NetworkLayer().NetworkFlow().Src(), tcp.SrcPort, packet.NetworkLayer().NetworkFlow().Dst(), tcp.DstPort) a.assemblerMutex.Lock() a.AssembleWithContext(packet.NetworkLayer().NetworkFlow(), tcp, &c) a.assemblerMutex.Unlock() diff --git a/tap/tcp_stream.go b/tap/tcp_stream.go index 7a9b53e30..c979c2991 100644 --- a/tap/tcp_stream.go +++ b/tap/tcp_stream.go @@ -2,7 +2,6 @@ package tap import ( "encoding/binary" - "fmt" "sync" "github.com/google/gopacket" @@ -75,7 +74,7 @@ func (t *tcpStream) Accept(tcp *layers.TCP, ci gopacket.CaptureInfo, dir reassem } func (t *tcpStream) ReassembledSG(sg reassembly.ScatterGather, ac reassembly.AssemblerContext) { - dir, start, end, skip := sg.Info() + dir, _, _, skip := sg.Info() length, saved := sg.Lengths() // update stats sgStats := sg.Stats() @@ -103,13 +102,6 @@ func (t *tcpStream) ReassembledSG(sg reassembly.ScatterGather, ac reassembly.Ass diagnose.InternalStats.OverlapBytes += sgStats.OverlapBytes diagnose.InternalStats.OverlapPackets += sgStats.OverlapPackets - var ident string - if dir == reassembly.TCPDirClientToServer { - ident = fmt.Sprintf("%v %v(%s): ", t.net, t.transport, dir) - } else { - ident = fmt.Sprintf("%v %v(%s): ", t.net.Reverse(), t.transport.Reverse(), dir) - } - diagnose.TapErrors.Debug("%s: SG reassembled packet with %d bytes (start:%v,end:%v,skip:%d,saved:%d,nb:%d,%d,overlap:%d,%d)", ident, length, start, end, skip, saved, sgStats.Packets, sgStats.Chunks, sgStats.OverlapBytes, sgStats.OverlapPackets) if skip == -1 && *allowmissinginit { // this is allowed } else if skip != 0 { @@ -174,7 +166,6 @@ func (t *tcpStream) ReassembledSG(sg reassembly.ScatterGather, ac reassembly.Ass } func (t *tcpStream) ReassemblyComplete(ac reassembly.AssemblerContext) bool { - diagnose.TapErrors.Debug("%s: Connection closed", t.ident) if t.isTapTarget && !t.isClosed { t.Close() } diff --git a/tap/tcp_stream_factory.go b/tap/tcp_stream_factory.go index 847ca10d1..c063f7bfe 100644 --- a/tap/tcp_stream_factory.go +++ b/tap/tcp_stream_factory.go @@ -54,7 +54,6 @@ func NewTcpStreamFactory(emitter api.Emitter, streamsMap *tcpStreamMap, opts *Ta } func (factory *tcpStreamFactory) New(net, transport gopacket.Flow, tcp *layers.TCP, ac reassembly.AssemblerContext) reassembly.Stream { - logger.Log.Debugf("* NEW: %s %s", net, transport) fsmOptions := reassembly.TCPSimpleFSMOptions{ SupportMissingEstablishment: *allowmissinginit, } @@ -153,21 +152,16 @@ func inArrayPod(pods []v1.Pod, address string) bool { func (factory *tcpStreamFactory) getStreamProps(srcIP string, srcPort string, dstIP string, dstPort string) *streamProps { if factory.opts.HostMode { if inArrayPod(factory.opts.FilterAuthorities, fmt.Sprintf("%s:%s", dstIP, dstPort)) { - logger.Log.Debugf("getStreamProps %s", fmt.Sprintf("+ host1 %s:%s", dstIP, dstPort)) return &streamProps{isTapTarget: true, isOutgoing: false} } else if inArrayPod(factory.opts.FilterAuthorities, dstIP) { - logger.Log.Debugf("getStreamProps %s", fmt.Sprintf("+ host2 %s", dstIP)) return &streamProps{isTapTarget: true, isOutgoing: false} } else if inArrayPod(factory.opts.FilterAuthorities, fmt.Sprintf("%s:%s", srcIP, srcPort)) { - logger.Log.Debugf("getStreamProps %s", fmt.Sprintf("+ host3 %s:%s", srcIP, srcPort)) return &streamProps{isTapTarget: true, isOutgoing: true} } else if inArrayPod(factory.opts.FilterAuthorities, srcIP) { - logger.Log.Debugf("getStreamProps %s", fmt.Sprintf("+ host4 %s", srcIP)) return &streamProps{isTapTarget: true, isOutgoing: true} } return &streamProps{isTapTarget: false, isOutgoing: false} } else { - logger.Log.Debugf("getStreamProps %s", fmt.Sprintf("+ notHost3 %s:%s -> %s:%s", srcIP, srcPort, dstIP, dstPort)) return &streamProps{isTapTarget: true} } }