This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a commit to branch reduce-handle-connect-time
in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
The following commit(s) were added to refs/heads/reduce-handle-connect-time by
this push:
new 15dcf25 update log level
15dcf25 is described below
commit 15dcf25b433fc8b08761e3d19c3be65f1a875f6b
Author: mrproliu <[email protected]>
AuthorDate: Fri Dec 27 15:45:43 2024 +0800
update log level
---
bpf/accesslog/syscalls/connect_conntrack.c | 8 --------
pkg/accesslog/collector/connection.go | 1 -
pkg/accesslog/collector/protocols/queue.go | 4 ++--
3 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/bpf/accesslog/syscalls/connect_conntrack.c
b/bpf/accesslog/syscalls/connect_conntrack.c
index 0f4308c..bdc3579 100644
--- a/bpf/accesslog/syscalls/connect_conntrack.c
+++ b/bpf/accesslog/syscalls/connect_conntrack.c
@@ -84,7 +84,6 @@ static __always_inline int
nf_conntrack_tuple_to_conntrack_tuple(struct connect_
static __always_inline int nf_conn_aware(struct pt_regs* ctx, struct nf_conn
*ct) {
if (ct == NULL) {
- bpf_printk("---test1111");
return 0;
}
__u64 id = bpf_get_current_pid_tgid();
@@ -95,28 +94,23 @@ static __always_inline int nf_conn_aware(struct pt_regs*
ctx, struct nf_conn *ct
// already contains the remote address
if (connect_args->has_remote && &(connect_args->remote) != NULL) {
- bpf_printk("---test2222");
return 0;
}
__u32 status;
if (bpf_probe_read(&status, sizeof(status), &(ct->status)) != 0) {
- bpf_printk("---test3333");
return 0; // Invalid ct pointer
}
if (!(status & IPS_CONFIRMED)) {
- bpf_printk("---test4444");
return 0;
}
if (!(status & IPS_NAT_MASK)) {
- bpf_printk("---test5555");
return 0;
}
struct nf_conntrack_tuple_hash tuplehash[IP_CT_DIR_MAX];
if (bpf_probe_read(&tuplehash, sizeof(tuplehash), &(ct->tuplehash)) != 0) {
- bpf_printk("---test6666");
return 0; // Invalid ct pointer
}
@@ -124,7 +118,6 @@ static __always_inline int nf_conn_aware(struct pt_regs*
ctx, struct nf_conn *ct
conntrack_tuple_t reply_conn = {};
if (!nf_conntrack_tuple_to_conntrack_tuple(connect_args, &reply_conn,
&reply)) {
- bpf_printk("---test7777");
return 0;
}
@@ -135,7 +128,6 @@ static __always_inline int nf_conn_aware(struct pt_regs*
ctx, struct nf_conn *ct
connect_args->remote = remote;
connect_args->has_remote = 1;
bpf_map_update_elem(&conecting_args, &id, connect_args, 0);
- bpf_printk("---test success!!!!!!!!!!!!!!!!!!!!");
return 0;
}
diff --git a/pkg/accesslog/collector/connection.go
b/pkg/accesslog/collector/connection.go
index 9abadc3..c398098 100644
--- a/pkg/accesslog/collector/connection.go
+++ b/pkg/accesslog/collector/connection.go
@@ -305,7 +305,6 @@ func (c *ConnectionPartitionContext)
tryToUpdateSocketFromConntrack(event *event
}
if c.context.ConnectionMgr.ProcessIsDetectBy(event.PID, api.Kubernetes)
{
isPodIP, err := c.k8sOperator.IsPodIP(socket.DestIP)
- log.Infof("ip: %s, isPodIP: %v, err: %v", socket.DestIP,
isPodIP, err)
if err != nil {
connectionLogger.Warnf("cannot found the pod IP,
connection ID: %d, randomID: %d, error: %v",
event.ConID, event.RandomID, err)
diff --git a/pkg/accesslog/collector/protocols/queue.go
b/pkg/accesslog/collector/protocols/queue.go
index a4577f7..977d5bf 100644
--- a/pkg/accesslog/collector/protocols/queue.go
+++ b/pkg/accesslog/collector/protocols/queue.go
@@ -216,7 +216,7 @@ func (p *PartitionContext) Consume(data interface{}) {
switch event := data.(type) {
case events.SocketDetail:
pid, _ := events.ParseConnectionID(event.GetConnectionID())
- log.Debugf("receive the socket detail event, connection ID: %d,
random ID: %d, pid: %d, data id: %d, "+
+ log.Infof("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())
@@ -229,7 +229,7 @@ func (p *PartitionContext) Consume(data interface{}) {
connection.AppendDetail(p.context, event)
case *events.SocketDataUploadEvent:
pid, _ := events.ParseConnectionID(event.ConnectionID)
- log.Debugf("receive the socket data event, connection ID: %d,
random ID: %d, pid: %d, prev data id: %d, "+
+ log.Infof("receive the socket data event, connection ID: %d,
random ID: %d, pid: %d, prev data id: %d, "+
"data id: %d, sequence: %d, protocol: %d",
event.ConnectionID, event.RandomID, pid,
event.PrevDataID0, event.DataID0, event.Sequence0, event.Protocol0)
connection := p.getConnectionContext(event.ConnectionID,
event.RandomID, event.Protocol0, event.DataID0)