enhance: support print nq and params for search and query (#41802)

relate: #41801

Signed-off-by: aoiasd <[email protected]>

Author: aoiasd

configs/milvus.yaml

@@ -315,10 +315,10 @@ proxy:
       base:
         format: "[$time_now] [ACCESS] <$user_name: $user_addr> $method_name [status: $method_status] [code: $error_code] [sdk: $sdk_version] [msg: $error_msg] [traceID: $trace_id] [timeCost: $time_cost]"
       query:
-        format: "[$time_now] [ACCESS] <$user_name: $user_addr> $method_name [status: $method_status] [code: $error_code] [sdk: $sdk_version] [msg: $error_msg] [traceID: $trace_id] [timeCost: $time_cost] [database: $database_name] [collection: $collection_name] [partitions: $partition_name] [expr: $method_expr]"
+        format: "[$time_now] [ACCESS] <$user_name: $user_addr> $method_name [status: $method_status] [code: $error_code] [sdk: $sdk_version] [msg: $error_msg] [traceID: $trace_id] [timeCost: $time_cost] [database: $database_name] [collection: $collection_name] [partitions: $partition_name] [expr: $method_expr] [params: $query_params]"
         methods: "Query, Delete"
       search:
-        format: "[$time_now] [ACCESS] <$user_name: $user_addr> $method_name [status: $method_status] [code: $error_code] [sdk: $sdk_version] [msg: $error_msg] [traceID: $trace_id] [timeCost: $time_cost] [database: $database_name] [collection: $collection_name] [partitions: $partition_name] [anns_field: $anns_field] [expr: $method_expr]"
+        format: "[$time_now] [ACCESS] <$user_name: $user_addr> $method_name [status: $method_status] [code: $error_code] [sdk: $sdk_version] [msg: $error_msg] [traceID: $trace_id] [timeCost: $time_cost] [database: $database_name] [collection: $collection_name] [partitions: $partition_name] [expr: $method_expr] [nq: $nq] [params: $search_params]"
         methods: "HybridSearch, Search"
     cacheSize: 0 # Size of log of write cache, in byte. (Close write cache if size was 0)
     cacheFlushInterval: 3 # time interval of auto flush write cache, in seconds. (Close auto flush if interval was 0)

internal/proxy/accesslog/info/grpc_info.go

@@ -316,3 +316,32 @@ func (i *GrpcAccessInfo) AnnsField() string {
 	}
 	return Unknown
 }
+
+func (i *GrpcAccessInfo) NQ() string {
+	if req, ok := i.req.(*milvuspb.SearchRequest); ok {
+		return fmt.Sprint(req.GetNq())
+	}
+
+	if req, ok := i.req.(*milvuspb.HybridSearchRequest); ok {
+		return listToString(lo.Map(req.GetRequests(), func(req *milvuspb.SearchRequest, _ int) string { return fmt.Sprint(req.GetNq()) }))
+	}
+	return Unknown
+}
+
+func (i *GrpcAccessInfo) SearchParams() string {
+	if req, ok := i.req.(*milvuspb.SearchRequest); ok {
+		return kvsToString(req.GetSearchParams())
+	}
+
+	if req, ok := i.req.(*milvuspb.HybridSearchRequest); ok {
+		return listToString(lo.Map(req.GetRequests(), func(req *milvuspb.SearchRequest, _ int) string { return kvsToString(req.GetSearchParams()) }))
+	}
+	return Unknown
+}
+
+func (i *GrpcAccessInfo) QueryParams() string {
+	if req, ok := i.req.(*milvuspb.QueryRequest); ok {
+		return kvsToString(req.GetQueryParams())
+	}
+	return Unknown
+}

internal/proxy/accesslog/info/info.go

@@ -48,6 +48,9 @@ var MetricFuncMap = map[string]getMetricFunc{
 	"$cluster_prefix":    getClusterPrefix,
 	"$consistency_level": getConsistencyLevel,
 	"$anns_field":        getAnnsField,
+	"$nq":                getNq,
+	"$search_params":     getSearchParams,
+	"$query_params":      getQueryParams,
 }
 
 type AccessInfo interface {
@@ -72,6 +75,9 @@ type AccessInfo interface {
 	OutputFields() string
 	SdkVersion() string
 	ConsistencyLevel() string
+	NQ() string
+	SearchParams() string
+	QueryParams() string
 }
 
 func Get(i AccessInfo, keys ...string) []any {
@@ -174,3 +180,15 @@ func getAnnsField(i AccessInfo) string {
 func getClusterPrefix(i AccessInfo) string {
 	return ClusterPrefix.Load()
 }
+
+func getNq(i AccessInfo) string {
+	return i.NQ()
+}
+
+func getSearchParams(i AccessInfo) string {
+	return i.SearchParams()
+}
+
+func getQueryParams(i AccessInfo) string {
+	return i.QueryParams()
+}

internal/proxy/accesslog/info/restful_info.go

@@ -226,3 +226,32 @@ func (i *RestfulInfo) AnnsField() string {
 	}
 	return Unknown
 }
+
+func (i *RestfulInfo) NQ() string {
+	if req, ok := i.req.(*milvuspb.SearchRequest); ok {
+		return fmt.Sprint(req.GetNq())
+	}
+
+	if req, ok := i.req.(*milvuspb.HybridSearchRequest); ok {
+		return listToString(lo.Map(req.GetRequests(), func(req *milvuspb.SearchRequest, _ int) string { return fmt.Sprint(req.GetNq()) }))
+	}
+	return Unknown
+}
+
+func (i *RestfulInfo) SearchParams() string {
+	if req, ok := i.req.(*milvuspb.SearchRequest); ok {
+		return kvsToString(req.GetSearchParams())
+	}
+
+	if req, ok := i.req.(*milvuspb.HybridSearchRequest); ok {
+		return listToString(lo.Map(req.GetRequests(), func(req *milvuspb.SearchRequest, _ int) string { return kvsToString(req.GetSearchParams()) }))
+	}
+	return Unknown
+}
+
+func (i *RestfulInfo) QueryParams() string {
+	if req, ok := i.req.(*milvuspb.QueryRequest); ok {
+		return kvsToString(req.GetQueryParams())
+	}
+	return Unknown
+}

internal/proxy/accesslog/info/util.go

@@ -111,3 +111,11 @@ func listToString(strs []string) string {
 	}
 	return result + "]"
 }
+
+func kvsToString(kvs []*commonpb.KeyValuePair) string {
+	str := "{"
+	for _, kv := range kvs {
+		str += fmt.Sprintf("%s:%s,", kv.GetKey(), kv.GetValue())
+	}
+	return str + "}"
+}