This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a commit to branch missing-details
in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
The following commit(s) were added to refs/heads/missing-details by this push:
new d9bc50a disable logs
d9bc50a is described below
commit d9bc50ae58f454ce0569c4a4c1e4bf97417d63e7
Author: mrproliu <[email protected]>
AuthorDate: Fri Dec 13 20:31:04 2024 +0800
disable logs
---
pkg/accesslog/collector/protocols/http1.go | 22 ++++++------
pkg/accesslog/collector/protocols/queue.go | 2 +-
pkg/tools/buffer/buffer.go | 56 +++++++++++++++---------------
3 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/pkg/accesslog/collector/protocols/http1.go
b/pkg/accesslog/collector/protocols/http1.go
index f11090f..ab52269 100644
--- a/pkg/accesslog/collector/protocols/http1.go
+++ b/pkg/accesslog/collector/protocols/http1.go
@@ -89,12 +89,10 @@ func (p *HTTP1Protocol) Analyze(connection
*PartitionConnection, _ *AnalyzeHelpe
return nil
}
- headerTmp := make([]byte, 16)
- buf.Peek(headerTmp)
messageType, err := p.reader.IdentityMessageType(buf)
- log.Infof("ready to reading message type, messageType: %v, buf:
%p, data id: %d, "+
- "connection ID: %d, random ID: %d, error: %v, header:
%s", messageType, buf, buf.Position().DataID(),
- metrics.ConnectionID, metrics.RandomID, err,
string(headerTmp))
+ log.Debugf("ready to reading message type, messageType: %v,
buf: %p, data id: %d, "+
+ "connection ID: %d, random ID: %d, error: %v",
messageType, buf, buf.Position().DataID(),
+ metrics.ConnectionID, metrics.RandomID, err)
if err != nil {
http1Log.Debugf("failed to identity message type, %v",
err)
if buf.SkipCurrentElement() {
@@ -123,8 +121,8 @@ func (p *HTTP1Protocol) Analyze(connection
*PartitionConnection, _ *AnalyzeHelpe
finishReading = buf.RemoveReadElements(false)
case enums.ParseResultSkipPackage:
finishReading = buf.SkipCurrentElement()
- log.Infof("skip current element, data id: %d, buf: %p,
connection ID: %d, random ID: %d",
- buf.Position().DataID(), buf,
metrics.ConnectionID, metrics.RandomID)
+ //log.Infof("skip current element, data id: %d, buf:
%p, connection ID: %d, random ID: %d",
+ // buf.Position().DataID(), buf,
metrics.ConnectionID, metrics.RandomID)
}
if finishReading {
@@ -153,8 +151,8 @@ func (p *HTTP1Protocol) handleRequest(metrics
*HTTP1Metrics, buf *buffer.Buffer)
func (p *HTTP1Protocol) handleResponse(metrics *HTTP1Metrics, b
*buffer.Buffer) (enums.ParseResult, error) {
firstRequest := metrics.halfRequests.Front()
if firstRequest == nil {
- log.Infof("cannot found request for response, skip response,
connection ID: %d, random ID: %d",
- metrics.ConnectionID, metrics.RandomID)
+ //log.Infof("cannot found request for response, skip response,
connection ID: %d, random ID: %d",
+ // metrics.ConnectionID, metrics.RandomID)
return enums.ParseResultSkipPackage, nil
}
request := metrics.halfRequests.Remove(firstRequest).(*reader.Request)
@@ -222,9 +220,9 @@ func (p *HTTP1Protocol) HandleHTTPData(metrics
*HTTP1Metrics, request *reader.Re
request.MinDataID(),
response.BodyBuffer().LastSocketBuffer().DataID(), len(details))
}
- http1Log.Infof("found fully HTTP1 request and response, contains %d
detail events , connection ID: %d, random ID: %d, "+
- "data range: %d-%d(%t)",
- len(details), metrics.ConnectionID, metrics.RandomID,
idRange.From, idRange.To, idRange.IsToBufferReadFinished)
+ //http1Log.Infof("found fully HTTP1 request and response, contains %d
detail events , connection ID: %d, random ID: %d, "+
+ // "data range: %d-%d(%t)",
+ // len(details), metrics.ConnectionID, metrics.RandomID,
idRange.From, idRange.To, idRange.IsToBufferReadFinished)
originalRequest := request.Original()
originalResponse := response.Original()
// delete details(each request or response is fine because it's will
delete the original buffer)
diff --git a/pkg/accesslog/collector/protocols/queue.go
b/pkg/accesslog/collector/protocols/queue.go
index 885a3ba..833d323 100644
--- a/pkg/accesslog/collector/protocols/queue.go
+++ b/pkg/accesslog/collector/protocols/queue.go
@@ -214,7 +214,7 @@ func (p *PartitionContext) Consume(data interface{}) {
switch event := data.(type) {
case events.SocketDetail:
pid, _ := events.ParseConnectionID(event.GetConnectionID())
- log.Infof("receive the socket detail event, connection ID: %d,
random ID: %d, pid: %d, data id: %d, "+
+ log.Debugf("receive the socket detail event, connection ID: %d,
random ID: %d, pid: %d, data id: %d, "+
"function name: %s, package count: %d, package size:
%d, ssl: %d, protocol: %d",
event.GetConnectionID(), event.GetRandomID(), pid,
event.DataID(), event.GetFunctionName(),
event.GetL4PackageCount(),
event.GetL4TotalPackageSize(), event.GetSSL(), event.GetProtocol())
diff --git a/pkg/tools/buffer/buffer.go b/pkg/tools/buffer/buffer.go
index dc931c7..f19bbd8 100644
--- a/pkg/tools/buffer/buffer.go
+++ b/pkg/tools/buffer/buffer.go
@@ -160,8 +160,8 @@ func (i *DataIDRange) DeleteDetails(buf *Buffer) {
break
}
buf.detailEvents.Remove(e)
- log.Infof("delete detail event2, data id: %d, ref: %p,
range: %d-%d(%t)", dataId, buf,
- i.From, i.To, i.IsToBufferReadFinished)
+ //log.Infof("delete detail event2, data id: %d, ref:
%p, range: %d-%d(%t)", dataId, buf,
+ // i.From, i.To, i.IsToBufferReadFinished)
}
e = next
}
@@ -320,16 +320,16 @@ func (r *Buffer) BuildDetails() *list.List {
events.PushBack(e.Value)
}
}
- if events.Len() == 0 {
- dataIdList := make([]uint64, 0)
- for e := r.originalBuffer.detailEvents.Front(); e !=
nil; e = e.Next() {
- if e.Value != nil {
- dataIdList = append(dataIdList,
e.Value.(SocketDataDetail).DataID())
- }
- }
- log.Infof("cannot found details from original buffer,
from data id: %d, end data id: %d, ref: %p, existing details data id list: %v",
- fromDataId, endDataId, r.originalBuffer,
dataIdList)
- }
+ //if events.Len() == 0 {
+ // dataIdList := make([]uint64, 0)
+ // for e := r.originalBuffer.detailEvents.Front(); e !=
nil; e = e.Next() {
+ // if e.Value != nil {
+ // dataIdList = append(dataIdList,
e.Value.(SocketDataDetail).DataID())
+ // }
+ // }
+ //log.Infof("cannot found details from original buffer, from
data id: %d, end data id: %d, ref: %p, existing details data id list: %v",
+ // fromDataId, endDataId, r.originalBuffer, dataIdList)
+ //}
return events
}
@@ -648,7 +648,7 @@ func (r *Buffer) RemoveReadElements(includeDetails bool)
bool {
if startDelete {
tmp := e.Next()
r.detailEvents.Remove(e)
- log.Infof("delete detail event1, data id: %d,
ref: %p", event.DataID(), r)
+ //log.Infof("delete detail event1, data id: %d,
ref: %p", event.DataID(), r)
e = tmp
} else {
e = e.Next()
@@ -701,29 +701,29 @@ func (r *Buffer) removeElement0(element *list.Element)
*list.Element {
func (r *Buffer) AppendDetailEvent(event SocketDataDetail) {
r.eventLocker.Lock()
defer r.eventLocker.Unlock()
- defer func() {
- dataIdList := make([]uint64, 0)
- for e := r.detailEvents.Front(); e != nil; e = e.Next() {
- if e.Value != nil {
- dataIdList = append(dataIdList,
e.Value.(SocketDataDetail).DataID())
- }
- }
- log.Infof("after detail append, total detail events list: %v,
ref: %p", dataIdList, r)
- }()
+ //defer func() {
+ // dataIdList := make([]uint64, 0)
+ // for e := r.detailEvents.Front(); e != nil; e = e.Next() {
+ // if e.Value != nil {
+ // dataIdList = append(dataIdList,
e.Value.(SocketDataDetail).DataID())
+ // }
+ // }
+ // log.Infof("after detail append, total detail events list: %v,
ref: %p", dataIdList, r)
+ //}()
if r.detailEvents.Len() == 0 {
r.detailEvents.PushFront(event)
- log.Infof("append details into front1, data id: %d, ref: %p",
event.DataID(), r)
+ //log.Infof("append details into front1, data id: %d, ref: %p",
event.DataID(), r)
return
}
if r.detailEvents.Back().Value == nil {
r.detailEvents.PushFront(event)
- log.Infof("append details into front2, data id: %d, ref: %p",
event.DataID(), r)
+ //log.Infof("append details into front2, data id: %d, ref: %p",
event.DataID(), r)
return
}
if r.detailEvents.Back().Value.(SocketDataDetail).DataID() <
event.DataID() {
r.detailEvents.PushBack(event)
- log.Infof("append details into back1, data id: %d, ref: %p",
event.DataID(), r)
+ //log.Infof("append details into back1, data id: %d, ref: %p",
event.DataID(), r)
return
}
beenAdded := false
@@ -735,12 +735,12 @@ func (r *Buffer) AppendDetailEvent(event
SocketDataDetail) {
}
if beenAdded {
r.detailEvents.InsertBefore(event, element)
- log.Infof("append details by insert, data id: %d,
before data id: %d, ref: %p", event.DataID(), existEvent.DataID(), r)
+ //log.Infof("append details by insert, data id: %d,
before data id: %d, ref: %p", event.DataID(), existEvent.DataID(), r)
break
}
}
if !beenAdded {
- log.Infof("append details into back2, data id: %d, ref: %p",
event.DataID(), r)
+ //log.Infof("append details into back2, data id: %d, ref: %p",
event.DataID(), r)
r.detailEvents.PushBack(event)
}
}
@@ -800,7 +800,7 @@ func (r *Buffer) DeleteExpireEvents(expireDuration
time.Duration) int {
isDelete := r.latestExpiredDataID > 0 && detail.DataID() <=
r.latestExpiredDataID ||
(detail.Time() > 0 &&
expireTime.After(host.Time(detail.Time())))
if isDelete {
- log.Infof("delete expired detail event, data id: %d,
buf: %p", detail.DataID(), r)
+ log.Debugf("delete expired detail event, data id: %d,
buf: %p", detail.DataID(), r)
}
return isDelete
})
