audit: per object send pool number, set number and servers per operation (#11233)

cmd/logger/audit.go

@@ -18,14 +18,13 @@ package logger
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 	"strconv"
 	"time"
 
-	"github.com/gorilla/mux"
 	"github.com/minio/minio/cmd/logger/message/audit"
 )
 
@@ -125,7 +124,7 @@ func (lrw *ResponseWriter) Size() int {
 }
 
 // AuditLog - logs audit logs to all audit targets.
-func AuditLog(w http.ResponseWriter, r *http.Request, api string, reqClaims map[string]interface{}, filterKeys ...string) {
+func AuditLog(ctx context.Context, w http.ResponseWriter, r *http.Request, reqClaims map[string]interface{}, filterKeys ...string) {
 	// Fast exit if there is not audit target configured
 	if len(AuditTargets) == 0 {
 		return
@@ -144,11 +143,9 @@ func AuditLog(w http.ResponseWriter, r *http.Request, api string, reqClaims map[
 		timeToFirstByte = st.TimeToFirstByte
 	}
 
-	vars := mux.Vars(r)
-	bucket := vars["bucket"]
-	object, err := url.PathUnescape(vars["object"])
-	if err != nil {
-		object = vars["object"]
+	reqInfo := GetReqInfo(ctx)
+	if reqInfo == nil {
+		return
 	}
 
 	entry := audit.ToEntry(w, r, reqClaims, globalDeploymentID)
@@ -158,12 +155,13 @@ func AuditLog(w http.ResponseWriter, r *http.Request, api string, reqClaims map[
 		delete(entry.ReqHeader, filterKey)
 		delete(entry.RespHeader, filterKey)
 	}
-	entry.API.Name = api
-	entry.API.Bucket = bucket
-	entry.API.Object = object
+	entry.API.Name = reqInfo.API
+	entry.API.Bucket = reqInfo.BucketName
+	entry.API.Object = reqInfo.ObjectName
 	entry.API.Status = http.StatusText(statusCode)
 	entry.API.StatusCode = statusCode
 	entry.API.TimeToResponse = strconv.FormatInt(timeToResponse.Nanoseconds(), 10) + "ns"
+	entry.Tags = reqInfo.GetTagsMap()
 	// ttfb will be recorded only for GET requests, Ignore such cases where ttfb will be empty.
 	if timeToFirstByte != 0 {
 		entry.API.TimeToFirstByte = strconv.FormatInt(timeToFirstByte.Nanoseconds(), 10) + "ns"

cmd/logger/logger.go

@@ -335,7 +335,7 @@ func logIf(ctx context.Context, err error, errKind ...interface{}) {
 	}
 
 	kv := req.GetTags()
-	tags := make(map[string]string, len(kv))
+	tags := make(map[string]interface{}, len(kv))
 	for _, entry := range kv {
 		tags[entry.Key] = entry.Val
 	}
@@ -376,7 +376,7 @@ func logIf(ctx context.Context, err error, errKind ...interface{}) {
 		entry.API.Args.Object = hashString(entry.API.Args.Object)
 		entry.RemoteHost = hashString(entry.RemoteHost)
 		entry.Trace.Message = reflect.TypeOf(err).String()
-		entry.Trace.Variables = make(map[string]string)
+		entry.Trace.Variables = make(map[string]interface{})
 	}
 
 	// Iterate over all logger targets to send the log entry

cmd/logger/message/audit/entry.go

@@ -49,6 +49,7 @@ type Entry struct {
 	ReqQuery   map[string]string      `json:"requestQuery,omitempty"`
 	ReqHeader  map[string]string      `json:"requestHeader,omitempty"`
 	RespHeader map[string]string      `json:"responseHeader,omitempty"`
+	Tags       map[string]interface{} `json:"tags,omitempty"`
 }
 
 // ToEntry - constructs an audit entry object.

cmd/logger/message/log/entry.go

@@ -27,9 +27,9 @@ type Args struct {
 
 // Trace - defines the trace.
 type Trace struct {
-	Message   string            `json:"message,omitempty"`
-	Source    []string          `json:"source,omitempty"`
-	Variables map[string]string `json:"variables,omitempty"`
+	Message   string                 `json:"message,omitempty"`
+	Source    []string               `json:"source,omitempty"`
+	Variables map[string]interface{} `json:"variables,omitempty"`
 }
 
 // API - defines the api type and its args.

cmd/logger/reqinfo.go

@@ -30,7 +30,7 @@ const contextLogKey = contextKeyType("miniolog")
 // KeyVal - appended to ReqInfo.Tags
 type KeyVal struct {
 	Key string
-	Val string
+	Val interface{}
 }
 
 // ReqInfo stores the request info.
@@ -62,7 +62,7 @@ func NewReqInfo(remoteHost, userAgent, deploymentID, requestID, api, bucket, obj
 }
 
 // AppendTags - appends key/val to ReqInfo.tags
-func (r *ReqInfo) AppendTags(key string, val string) *ReqInfo {
+func (r *ReqInfo) AppendTags(key string, val interface{}) *ReqInfo {
 	if r == nil {
 		return nil
 	}
@@ -73,7 +73,7 @@ func (r *ReqInfo) AppendTags(key string, val string) *ReqInfo {
 }
 
 // SetTags - sets key/val to ReqInfo.tags
-func (r *ReqInfo) SetTags(key string, val string) *ReqInfo {
+func (r *ReqInfo) SetTags(key string, val interface{}) *ReqInfo {
 	if r == nil {
 		return nil
 	}
@@ -105,6 +105,20 @@ func (r *ReqInfo) GetTags() []KeyVal {
 	return append([]KeyVal(nil), r.tags...)
 }
 
+// GetTagsMap - returns the user defined tags in a map structure
+func (r *ReqInfo) GetTagsMap() map[string]interface{} {
+	if r == nil {
+		return nil
+	}
+	r.RLock()
+	defer r.RUnlock()
+	m := make(map[string]interface{}, len(r.tags))
+	for _, t := range r.tags {
+		m[t.Key] = t.Val
+	}
+	return m
+}
+
 // SetReqInfo sets ReqInfo in the context.
 func SetReqInfo(ctx context.Context, req *ReqInfo) context.Context {
 	if ctx == nil {

cmd/logger/target/console/console.go

@@ -76,7 +76,7 @@ func (c *Target) Send(e interface{}, logKind string) error {
 			if tagString != "" {
 				tagString += ", "
 			}
-			tagString += key + "=" + value
+			tagString += fmt.Sprintf("%s=%v", key, value)
 		}
 	}