prefer to use debugf, instead of logp.Debug()

packetbeat/protos/cassandra/internal/gocql/frame.go

@@ -15,6 +15,7 @@ import (
 
 var (
 	ErrFrameTooBig = errors.New("frame length is bigger than the maximum allowed")
+	debugf         = logp.MakeDebug("cassandra")
 )
 
 type frameHeader struct {
@@ -145,7 +146,7 @@ func (f *Framer) ReadHeader() (head *frameHeader, err error) {
 	headSize := f.r.BufferConsumed()
 	head.HeadLength = headSize
 
-	logp.Debug("cassandra", "header: %v", head)
+	debugf("header: %v", head)
 
 	f.Header = head
 	return head, nil
@@ -176,24 +177,24 @@ func (f *Framer) ReadFrame() (data map[string]interface{}, err error) {
 	//corresponding to the response opcode.
 	if f.Header.Flags&flagTracing == flagTracing && (f.Header.Op&opQuery == opQuery || f.Header.Op&opExecute == opExecute || f.Header.Op&opPrepare == opPrepare) {
 
-		logp.Debug("cassandra", "tracing enabled")
+		debugf("tracing enabled")
 
 		uid := f.decoder.ReadUUID()
-		logp.Debug("cassandra", uid.String())
+		debugf(uid.String())
 
 		data["trace_id"] = uid.String()
 	}
 
 	if f.Header.Flags&flagWarning == flagWarning {
-		logp.Debug("cassandra", "hit warning flags")
+		debugf("hit warning flags")
 
 		warnings := f.decoder.ReadStringList()
 		// dealing with warnings
 		data["warnings"] = warnings
 	}
 
 	if f.Header.Flags&flagCustomPayload == flagCustomPayload {
-		logp.Debug("cassandra", "hit custom payload flags")
+		debugf("hit custom payload flags")
 
 		f.Header.CustomPayload = f.decoder.ReadBytesMap()
 	}
@@ -206,7 +207,7 @@ func (f *Framer) ReadFrame() (data map[string]interface{}, err error) {
 		//decoder.Data = buf
 		//f.decoder = decoder
 
-		logp.Debug("cassandra", "hit compress flags")
+		debugf("hit compress flags")
 
 		return nil, errors.New("Compressed content not supported yet")
 	}
@@ -237,7 +238,7 @@ func (f *Framer) ReadFrame() (data map[string]interface{}, err error) {
 		//ignore
 	default:
 		//ignore
-		logp.Debug("cassandra", "unknow ops, not processed, %v", f.Header)
+		debugf("unknow ops, not processed, %v", f.Header)
 
 	}
 

packetbeat/protos/cassandra/parser.go

@@ -122,18 +122,18 @@ func (p *parser) parse() (*message, error) {
 	// if p.frame is nil then create a new framer, or continue to process the last message
 	if p.framer == nil {
 		if isDebug {
-			logp.Debug("cassandra", "start new framer")
+			debugf("start new framer")
 		}
 		p.framer = NewFramer(&p.buf, p.config.compressor)
 	}
 
 	// check if the frame header were parsed or not
 	if p.framer.Header == nil {
 		if isDebug {
-			logp.Debug("cassandra", "start to parse header")
+			debugf("start to parse header")
 		}
 		if !p.buf.Avail(9) {
-			logp.Err("not enough head bytes, ignore")
+			debugf("not enough head bytes, ignore")
 			return nil, nil
 		}
 
@@ -153,19 +153,19 @@ func (p *parser) parse() (*message, error) {
 		//let's wait for enough buf
 		if !p.buf.Avail(p.framer.Header.BodyLength) {
 			if isDebug {
-				logp.Debug("cassandra", " buf not enough for body, waiting for more, return")
+				debugf("buf not enough for body, waiting for more, return")
 			}
 			return nil, nil
 		} else {
 			//check if the ops already ignored
 			if p.config.ignoredOps != nil && len(p.config.ignoredOps) > 0 {
 				if isDebug {
-					logp.Debug("cassandra", "ignoreOPS configed, let's check")
+					debugf("ignoreOPS configed, let's check")
 				}
 				v := p.config.ignoredOps[p.framer.Header.Op.String()]
 				if v != nil {
 					if isDebug {
-						logp.Debug("cassandra", fmt.Sprintf("Ops: %s was marked to be ignored, ignoring, request:%v", p.framer.Header.Op.String(), p.framer.Header.Version.IsRequest()))
+						debugf("Ops: %s was marked to be ignored, ignoring, request:%v", p.framer.Header.Op.String(), p.framer.Header.Version.IsRequest())
 					}
 					p.buf.Collect(p.framer.Header.BodyLength)
 
@@ -181,7 +181,7 @@ func (p *parser) parse() (*message, error) {
 			// start to parse body
 			if !p.message.ignored {
 				if isDebug {
-					logp.Debug("cassandra", "start read frame")
+					debugf("start read frame")
 				}
 				data, err := p.framer.ReadFrame()
 				if err != nil {