lxd: Update MetricsCallback usage

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

lxd/events.go

@@ -40,7 +40,7 @@ func (r *eventsServe) Render(w http.ResponseWriter, req *http.Request) error {
 
 	if err == nil {
 		// If there was an error on Render, the callback function will be called during the error handling.
-		request.MetricsCallback(req, metrics.Success)
+		metrics.UseMetricsCallback(req, metrics.Success)
 	}
 
 	return err

lxd/instance_sftp.go

@@ -175,7 +175,7 @@ func (r *sftpServeResponse) Render(w http.ResponseWriter, req *http.Request) err
 
 	wg.Wait() // Wait for copy go routine to finish.
 
-	request.MetricsCallback(req, metrics.Success)
+	metrics.UseMetricsCallback(req, metrics.Success)
 
 	return nil
 }

lxd/operations/response.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/canonical/lxd/lxd/metrics"
-	"github.com/canonical/lxd/lxd/request"
 	"github.com/canonical/lxd/lxd/response"
 	"github.com/canonical/lxd/lxd/util"
 	"github.com/canonical/lxd/shared/api"
@@ -31,9 +30,9 @@ func (r *operationResponse) Render(w http.ResponseWriter, req *http.Request) err
 	r.op.SetOnDone(func(op *Operation) {
 		sc := op.Status()
 		if sc == api.Success || sc == api.Cancelled {
-			request.MetricsCallback(req, metrics.Success)
+			metrics.UseMetricsCallback(req, metrics.Success)
 		} else {
-			request.MetricsCallback(req, metrics.ErrorServer)
+			metrics.UseMetricsCallback(req, metrics.ErrorServer)
 		}
 	})
 
@@ -123,7 +122,7 @@ func (r *forwardedOperationResponse) Render(w http.ResponseWriter, req *http.Req
 
 	if err == nil {
 		// If there was an error on Render, the callback function will be called during the error handling.
-		request.MetricsCallback(req, metrics.Success)
+		metrics.UseMetricsCallback(req, metrics.Success)
 	}
 
 	return err

lxd/operations/websocket.go

@@ -7,7 +7,6 @@ import (
 	"github.com/gorilla/websocket"
 
 	"github.com/canonical/lxd/lxd/metrics"
-	"github.com/canonical/lxd/lxd/request"
 	"github.com/canonical/lxd/lxd/response"
 	"github.com/canonical/lxd/shared/ws"
 )
@@ -32,7 +31,7 @@ func (r *operationWebSocket) Render(w http.ResponseWriter, req *http.Request) er
 
 	if err == nil {
 		// If there was an error on Render, the callback function will be called during the error handling.
-		request.MetricsCallback(req, metrics.Success)
+		metrics.UseMetricsCallback(req, metrics.Success)
 	}
 
 	return err
@@ -73,7 +72,7 @@ func (r *forwardedOperationWebSocket) Render(w http.ResponseWriter, req *http.Re
 	_ = target.Close()
 
 	// If there was an error on Render, the callback function will be called during the error handling.
-	request.MetricsCallback(req, metrics.Success)
+	metrics.UseMetricsCallback(req, metrics.Success)
 
 	return nil
 }

lxd/response/response.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/canonical/lxd/client"
 	"github.com/canonical/lxd/lxd/metrics"
-	"github.com/canonical/lxd/lxd/request"
 	"github.com/canonical/lxd/lxd/ucred"
 	"github.com/canonical/lxd/lxd/util"
 	"github.com/canonical/lxd/shared/api"
@@ -210,9 +209,9 @@ func (r *syncResponse) Render(w http.ResponseWriter, req *http.Request) (err err
 		// If there was an error on Render, the callback function will be called during the error handling.
 		if err == nil {
 			if r.success {
-				request.MetricsCallback(req, metrics.Success)
+				metrics.UseMetricsCallback(req, metrics.Success)
 			} else {
-				request.MetricsCallback(req, metrics.ErrorServer)
+				metrics.UseMetricsCallback(req, metrics.ErrorServer)
 			}
 		}
 	}()
@@ -368,10 +367,10 @@ func (r *errorResponse) Render(w http.ResponseWriter, req *http.Request) error {
 		// Use the callback function to count the request for the API metrics.
 		if r.code >= 400 && r.code < 500 {
 			// 4* codes are considered client errors on HTTP.
-			request.MetricsCallback(req, metrics.ErrorClient)
+			metrics.UseMetricsCallback(req, metrics.ErrorClient)
 		} else {
 			// Any other status code here shoud be higher than or equal to 500 and is considered a server error.
-			request.MetricsCallback(req, metrics.ErrorServer)
+			metrics.UseMetricsCallback(req, metrics.ErrorServer)
 		}
 	}()
 
@@ -437,7 +436,7 @@ func (r *fileResponse) Render(w http.ResponseWriter, req *http.Request) (err err
 	defer func() {
 		if err == nil {
 			// If there was an error on Render, the callback function will be called during the error handling.
-			request.MetricsCallback(req, metrics.Success)
+			metrics.UseMetricsCallback(req, metrics.Success)
 		}
 	}()
 
@@ -617,7 +616,7 @@ func (r *manualResponse) Render(w http.ResponseWriter, req *http.Request) error
 
 	if err == nil {
 		// If there was an error on Render, the callback function will be called during the error handling.
-		request.MetricsCallback(req, metrics.Success)
+		metrics.UseMetricsCallback(req, metrics.Success)
 	}
 
 	return err