make metering package

api/token.go

@@ -7,9 +7,9 @@ import (
 
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/netlify/gotrue/conf"
+	"github.com/netlify/gotrue/metering"
 	"github.com/netlify/gotrue/models"
 	"github.com/netlify/gotrue/storage"
-	"github.com/sirupsen/logrus"
 )
 
 type GoTrueClaims struct {
@@ -98,15 +98,7 @@ func (a *API) ResourceOwnerPasswordGrant(ctx context.Context, w http.ResponseWri
 	if err != nil {
 		return err
 	}
-
-	// This is a load bearing log - it is used in metering.
-	log := getLogEntry(r)
-	log.WithFields(logrus.Fields{
-		"metering": true,
-		"action":   "login",
-		"user_id":  user.ID.String(),
-	}).Info("Login Completed")
-
+	metering.RecordLogin(r, user.ID, instanceID)
 	return sendJSON(w, http.StatusOK, token)
 }
 

metering/record.go

@@ -0,0 +1,19 @@
+package metering
+
+import (
+	"net/http"
+
+	uuid "github.com/satori/go.uuid"
+	"github.com/sirupsen/logrus"
+)
+
+var logger = logrus.StandardLogger().WithField("metering", true)
+
+func RecordLogin(r *http.Request, userID, instanceID uuid.UUID) {
+	logger.WithFields(logrus.Fields{
+		"action":      "login",
+		"domain":      r.Host,
+		"instance_id": instanceID.String(),
+		"user_id":     userID.String(),
+	}).Info("Login")
+}