fix: address latest pr11446 review feedback

Author: kylewanginchina

agent/src/ebpf/kernel/socket_trace.bpf.c

@@ -1913,16 +1913,6 @@ static __inline int process_data(struct pt_regs *ctx, __u64 id,
 
 	if (act == INFER_TERMINATE)
 		return -1;
-
-	if (act == INFER_FINISH &&
-	    conn_info->protocol != PROTO_UNKNOWN &&
-	    is_socket_info_valid(conn_info->socket_info_ptr) &&
-	    !conn_info->socket_info_ptr->allow_reassembly &&
-	    is_proto_reasm_enabled(conn_info->protocol)) {
-		conn_info->socket_info_ptr->allow_reassembly = true;
-		conn_info->socket_info_ptr->reasm_bytes = 0;
-		check_and_set_data_reassembly(conn_info);
-	}
 #if !defined(LINUX_VER_KFUNC) && !defined(LINUX_VER_5_2_PLUS)
 	if (disable_kprobe && extra->source == DATA_SOURCE_SYSCALL)
 		return -1;

agent/src/ebpf/mod.rs

@@ -177,6 +177,18 @@ cfg_if::cfg_if! {
     }
 }
 
+#[cfg(test)]
+mod source_regression_tests {
+    #[test]
+    fn socket_trace_should_not_recheck_reassembly_after_infer_finish() {
+        let src = include_str!("kernel/socket_trace.bpf.c");
+        assert!(
+            !src.contains("check_and_set_data_reassembly(conn_info);"),
+            "post-INFER_FINISH reassembly recheck should not remain in socket_trace.bpf.c",
+        );
+    }
+}
+
 // Message types
 // Currently, except for source=EBPF_TYPE_GO_HTTP2_UPROBE,
 // the correctness of this direction cannot be guaranteed.

server/controller/db/metadb/migrator/schema/rawsql/mysql/issu/7.1.0.39.sql

@@ -1,4 +1,5 @@
 DROP PROCEDURE IF EXISTS AddColumnIfNotExists;
+DROP PROCEDURE IF EXISTS InsertDataSourceIfNotExists;
 
 CREATE PROCEDURE AddColumnIfNotExists(
     IN tableName VARCHAR(255),
@@ -24,10 +25,47 @@ BEGIN
     END IF;
 END;
 
+CREATE PROCEDURE InsertDataSourceIfNotExists(
+    IN p_display_name VARCHAR(64),
+    IN p_data_table_collection VARCHAR(64),
+    IN p_interval_time INTEGER,
+    IN p_retention_time INTEGER
+)
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1
+        FROM data_source
+        WHERE data_table_collection = p_data_table_collection
+    ) THEN
+        INSERT INTO data_source (
+            display_name,
+            data_table_collection,
+            base_data_source_id,
+            interval_time,
+            retention_time,
+            lcuuid
+        )
+        VALUES (
+            p_display_name,
+            p_data_table_collection,
+            0,
+            p_interval_time,
+            p_retention_time,
+            UUID()
+        );
+    END IF;
+END;
+
 CALL AddColumnIfNotExists('process', 'biz_type', 'INTEGER DEFAULT 0', 'process_name');
 CALL AddColumnIfNotExists('genesis_process', 'biz_type', 'INTEGER DEFAULT 0', 'process_name');
 CALL AddColumnIfNotExists('ch_gprocess', 'biz_type', 'INTEGER DEFAULT 0', 'l3_epc_id');
 
+CALL InsertDataSourceIfNotExists('事件-文件读写聚合事件', 'event.file_agg_event', 0, 7*24);
+CALL InsertDataSourceIfNotExists('事件-文件管理事件', 'event.file_mgmt_event', 0, 7*24);
+CALL InsertDataSourceIfNotExists('事件-进程权限事件', 'event.proc_perm_event', 0, 7*24);
+CALL InsertDataSourceIfNotExists('事件-进程操作事件', 'event.proc_ops_event', 0, 7*24);
+
 DROP PROCEDURE AddColumnIfNotExists;
+DROP PROCEDURE InsertDataSourceIfNotExists;
 
 UPDATE db_version SET version='7.1.0.39';

server/controller/db/metadb/migrator/schema/schema_regression_test.go

@@ -0,0 +1,55 @@
+package schema
+
+import (
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"testing"
+)
+
+func TestDBVersionExpectedMatchesHighestMySQLIssue(t *testing.T) {
+	issuDir := filepath.Join("rawsql", "mysql", "issu")
+	entries, err := os.ReadDir(issuDir)
+	if err != nil {
+		t.Fatalf("read issu dir failed: %v", err)
+	}
+
+	maxVersion := ""
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+		name := strings.TrimSuffix(entry.Name(), filepath.Ext(entry.Name()))
+		if maxVersion == "" || versionGreater(name, maxVersion) {
+			maxVersion = name
+		}
+	}
+
+	if maxVersion == "" {
+		t.Fatal("no mysql issue versions found")
+	}
+	if DB_VERSION_EXPECTED != maxVersion {
+		t.Fatalf("DB_VERSION_EXPECTED=%s, want highest issue version %s", DB_VERSION_EXPECTED, maxVersion)
+	}
+}
+
+func versionGreater(left, right string) bool {
+	leftParts := strings.Split(left, ".")
+	rightParts := strings.Split(right, ".")
+	for i := 0; i < len(leftParts) && i < len(rightParts); i++ {
+		leftNum, err := strconv.Atoi(leftParts[i])
+		if err != nil {
+			panic(err)
+		}
+		rightNum, err := strconv.Atoi(rightParts[i])
+		if err != nil {
+			panic(err)
+		}
+		if leftNum == rightNum {
+			continue
+		}
+		return leftNum > rightNum
+	}
+	return len(leftParts) > len(rightParts)
+}