Send deployment id and minio version in http header (#14378)

internal/logger/audit.go

@@ -28,6 +28,7 @@ import (
 	"time"
 
 	"github.com/klauspost/compress/gzhttp"
+	xhttp "github.com/minio/minio/internal/http"
 	"github.com/minio/minio/internal/logger/message/audit"
 )
 
@@ -146,7 +147,7 @@ func GetAuditEntry(ctx context.Context) *audit.Entry {
 		}
 		r = &audit.Entry{
 			Version:      audit.Version,
-			DeploymentID: globalDeploymentID,
+			DeploymentID: xhttp.GlobalDeploymentID,
 			Time:         time.Now().UTC(),
 		}
 		SetAuditEntry(ctx, r)
@@ -170,7 +171,7 @@ func AuditLog(ctx context.Context, w http.ResponseWriter, r *http.Request, reqCl
 			return
 		}
 
-		entry = audit.ToEntry(w, r, reqClaims, globalDeploymentID)
+		entry = audit.ToEntry(w, r, reqClaims, xhttp.GlobalDeploymentID)
 		// indicates all requests for this API call are inbound
 		entry.Trigger = "incoming"
 

internal/logger/logger.go

@@ -32,6 +32,7 @@ import (
 
 	"github.com/minio/highwayhash"
 	"github.com/minio/minio-go/v7/pkg/set"
+	xhttp "github.com/minio/minio/internal/http"
 	"github.com/minio/minio/internal/logger/message/log"
 )
 
@@ -53,8 +54,6 @@ const (
 
 var trimStrings []string
 
-var globalDeploymentID string
-
 // TimeFormat - logging time format.
 const TimeFormat string = "15:04:05 MST 01/02/2006"
 
@@ -130,11 +129,6 @@ func uniqueEntries(paths []string) []string {
 	return m.ToSlice()
 }
 
-// SetDeploymentID -- Deployment Id from the main package is set here
-func SetDeploymentID(deploymentID string) {
-	globalDeploymentID = deploymentID
-}
-
 // Init sets the trimStrings to possible GOPATHs
 // and GOROOT directories. Also append github.com/minio/minio
 // This is done to clean up the filename, when stack trace is
@@ -319,7 +313,7 @@ func logIf(ctx context.Context, err error, errKind ...interface{}) {
 	// Get the cause for the Error
 	message := fmt.Sprintf("%v (%T)", err, err)
 	if req.DeploymentID == "" {
-		req.DeploymentID = globalDeploymentID
+		req.DeploymentID = xhttp.GlobalDeploymentID
 	}
 
 	objects := make([]log.ObjectVersion, 0, len(req.Objects))

internal/logger/target/http/http.go

@@ -144,6 +144,8 @@ func (h *Target) logEntry(entry interface{}) {
 		return
 	}
 	req.Header.Set(xhttp.ContentType, "application/json")
+	req.Header.Set(xhttp.MinIOVersion, xhttp.GlobalMinIOVersion)
+	req.Header.Set(xhttp.MinioDeploymentID, xhttp.GlobalDeploymentID)
 
 	// Set user-agent to indicate MinIO release
 	// version to the configured log endpoint