Add more new relic transactions for auth. (#147)

integration-tests/comfy_node_test.go

@@ -22,7 +22,7 @@ func TestRegistryComfyNode(t *testing.T) {
 
 	// Initialize server implementation and authorization middleware
 	impl := NewStrictServerImplementationWithMocks(client, &config.Config{})
-	authz := authorization.NewAuthorizationManager(client, impl.RegistryService).AuthorizationMiddleware()
+	authz := authorization.NewAuthorizationManager(client, impl.RegistryService, impl.NewRelicApp).AuthorizationMiddleware()
 
 	// Setup test user context and publisher
 	ctx, _ := setupTestUser(client)

integration-tests/node_ban_test.go

@@ -2,14 +2,15 @@ package integration
 
 import (
 	"context"
-	"google.golang.org/protobuf/proto"
 	"net/http"
 	"registry-backend/config"
 	"registry-backend/drip"
 	"registry-backend/ent/schema"
 	drip_authorization "registry-backend/server/middleware/authorization"
 	"testing"
 
+	"google.golang.org/protobuf/proto"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -21,7 +22,7 @@ func TestNodeBan(t *testing.T) {
 
 	// Setup the mock services and server
 	impl := NewStrictServerImplementationWithMocks(client, &config.Config{})
-	authz := drip_authorization.NewAuthorizationManager(client, impl.RegistryService).AuthorizationMiddleware()
+	authz := drip_authorization.NewAuthorizationManager(client, impl.RegistryService, impl.NewRelicApp).AuthorizationMiddleware()
 
 	t.Run("Node Ban Tests", func(t *testing.T) {
 		userCtx, _ := setupTestUser(client)

integration-tests/node_test.go

@@ -19,7 +19,7 @@ func TestRegistryNode(t *testing.T) {
 
 	// Initialize server implementation and authorization middleware
 	impl := NewStrictServerImplementationWithMocks(client, &config.Config{})
-	authz := authorization.NewAuthorizationManager(client, impl.RegistryService).AuthorizationMiddleware()
+	authz := authorization.NewAuthorizationManager(client, impl.RegistryService, impl.NewRelicApp).AuthorizationMiddleware()
 
 	// Setup user context and publisher
 	ctx, _ := setupTestUser(client)

integration-tests/node_version_test.go

@@ -4,11 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/labstack/echo/v4"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
 	"net/http"
 	"net/http/httptest"
 	"registry-backend/config"
@@ -20,6 +15,12 @@ import (
 	registry "registry-backend/services/registry"
 	"testing"
 	"time"
+
+	"github.com/labstack/echo/v4"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestRegistryNodeVersion(t *testing.T) {
@@ -28,7 +29,7 @@ func TestRegistryNodeVersion(t *testing.T) {
 
 	// Initialize server implementation and authorization middleware
 	impl := NewStrictServerImplementationWithMocks(client, &config.Config{})
-	authz := authorization.NewAuthorizationManager(client, impl.RegistryService).AuthorizationMiddleware()
+	authz := authorization.NewAuthorizationManager(client, impl.RegistryService, impl.NewRelicApp).AuthorizationMiddleware()
 
 	// Setup user context and publisher
 	ctx, _ := setupTestUser(client)

integration-tests/personal_access_token_test.go

@@ -2,13 +2,14 @@ package integration
 
 import (
 	"context"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"registry-backend/config"
 	"registry-backend/drip"
 	authorization "registry-backend/server/middleware/authorization"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestRegistryPersonalAccessToken(t *testing.T) {
@@ -18,7 +19,7 @@ func TestRegistryPersonalAccessToken(t *testing.T) {
 
 	// Initialize server implementation and authorization middleware
 	impl := NewStrictServerImplementationWithMocks(client, &config.Config{})
-	authz := authorization.NewAuthorizationManager(client, impl.RegistryService).AuthorizationMiddleware()
+	authz := authorization.NewAuthorizationManager(client, impl.RegistryService, impl.NewRelicApp).AuthorizationMiddleware()
 
 	// Setup test user and publisher
 	ctx, _ := setupTestUser(client)

integration-tests/publisher_ban_test.go

@@ -20,7 +20,7 @@ func TestPublisherBan(t *testing.T) {
 
 	// Setup the mock services and server
 	impl := NewStrictServerImplementationWithMocks(client, &config.Config{})
-	authz := authorization.NewAuthorizationManager(client, impl.RegistryService).AuthorizationMiddleware()
+	authz := authorization.NewAuthorizationManager(client, impl.RegistryService, impl.NewRelicApp).AuthorizationMiddleware()
 
 	t.Run("Publisher Ban Tests", func(t *testing.T) {
 		userCtx, _ := setupTestUser(client)

integration-tests/publisher_test.go

@@ -2,12 +2,13 @@ package integration
 
 import (
 	"context"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"registry-backend/config"
 	"registry-backend/drip"
 	authorization "registry-backend/server/middleware/authorization"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestRegistryPublisher(t *testing.T) {
@@ -16,7 +17,7 @@ func TestRegistryPublisher(t *testing.T) {
 	defer cleanup()
 
 	impl := NewStrictServerImplementationWithMocks(client, &config.Config{})
-	authz := authorization.NewAuthorizationManager(client, impl.RegistryService).AuthorizationMiddleware()
+	authz := authorization.NewAuthorizationManager(client, impl.RegistryService, impl.NewRelicApp).AuthorizationMiddleware()
 
 	// Create a test user and a random publisher for testing
 	ctx, testUser := setupTestUser(client)

server/middleware/authorization/authorization_manager.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
+	"github.com/newrelic/go-agent/v3/newrelic"
 	strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo"
 	"github.com/rs/zerolog/log"
 )
@@ -34,16 +35,18 @@ type Assertor interface {
 
 // AuthorizationManager manages authorization-related tasks
 type AuthorizationManager struct {
-	EntClient *ent.Client
-	Assertor  Assertor
+	EntClient   *ent.Client
+	Assertor    Assertor
+	NewRelicApp *newrelic.Application
 }
 
 // NewAuthorizationManager creates a new instance of AuthorizationManager
 func NewAuthorizationManager(
-	entClient *ent.Client, assertor Assertor) *AuthorizationManager {
+	entClient *ent.Client, assertor Assertor, newRelicApp *newrelic.Application) *AuthorizationManager {
 	return &AuthorizationManager{
-		EntClient: entClient,
-		Assertor:  assertor,
+		EntClient:   entClient,
+		Assertor:    assertor,
+		NewRelicApp: newRelicApp,
 	}
 }
 
@@ -52,6 +55,8 @@ func (m *AuthorizationManager) assertUserBanned() drip.StrictMiddlewareFunc {
 	return func(f strictecho.StrictEchoHandlerFunc, operationID string) strictecho.StrictEchoHandlerFunc {
 		return func(c echo.Context, request interface{}) (response interface{}, err error) {
 			ctx := c.Request().Context()
+			txn := m.NewRelicApp.StartTransaction("AuthorizationManager.assertUserBanned")
+			defer txn.End()
 			v := ctx.Value(drip_authentication.UserContextKey)
 			userDetails, ok := v.(*drip_authentication.UserDetails)
 			if !ok {
@@ -78,6 +83,8 @@ func (m *AuthorizationManager) assertPublisherPermission(
 	return func(f strictecho.StrictEchoHandlerFunc, operationID string) strictecho.StrictEchoHandlerFunc {
 		return func(c echo.Context, request interface{}) (response interface{}, err error) {
 			ctx := c.Request().Context()
+			txn := m.NewRelicApp.StartTransaction("AuthorizationManager.assertPublisherPermission")
+			defer txn.End()
 			v := ctx.Value(drip_authentication.UserContextKey)
 			userDetails, ok := v.(*drip_authentication.UserDetails)
 			if !ok {
@@ -114,6 +121,8 @@ func (m *AuthorizationManager) assertNodeBanned(extractor func(req interface{})
 	return func(f strictecho.StrictEchoHandlerFunc, operationID string) strictecho.StrictEchoHandlerFunc {
 		return func(c echo.Context, request interface{}) (response interface{}, err error) {
 			ctx := c.Request().Context()
+			txn := m.NewRelicApp.StartTransaction("AuthorizationManager.assertNodeBanned")
+			defer txn.End()
 			nodeID := extractor(request)
 			err = m.Assertor.AssertNodeBanned(ctx, m.EntClient, nodeID)
 			switch {
@@ -136,6 +145,8 @@ func (m *AuthorizationManager) assertPublisherBanned(extractor func(req interfac
 	return func(f strictecho.StrictEchoHandlerFunc, operationID string) strictecho.StrictEchoHandlerFunc {
 		return func(c echo.Context, request interface{}) (response interface{}, err error) {
 			ctx := c.Request().Context()
+			txn := m.NewRelicApp.StartTransaction("AuthorizationManager.assertPublisherBanned")
+			defer txn.End()
 			publisherID := extractor(request)
 
 			switch err = m.Assertor.AssertPublisherBanned(ctx, m.EntClient, publisherID); {
@@ -161,6 +172,8 @@ func (m *AuthorizationManager) assertPersonalAccessTokenValid(
 	return func(f strictecho.StrictEchoHandlerFunc, operationID string) strictecho.StrictEchoHandlerFunc {
 		return func(c echo.Context, request interface{}) (response interface{}, err error) {
 			ctx := c.Request().Context()
+			txn := m.NewRelicApp.StartTransaction("AuthorizationManager.assertPersonalAccessTokenValid")
+			defer txn.End()
 			pubID := extractorPublsherID(request)
 			pat := extractorPAT(request)
 			tokenValid, err := m.Assertor.IsPersonalAccessTokenValidForPublisher(
@@ -187,6 +200,8 @@ func (m *AuthorizationManager) assertNodeBelongsToPublisher(
 	return func(f strictecho.StrictEchoHandlerFunc, operationID string) strictecho.StrictEchoHandlerFunc {
 		return func(c echo.Context, request interface{}) (response interface{}, err error) {
 			ctx := c.Request().Context()
+			txn := m.NewRelicApp.StartTransaction("AuthorizationManager.assertNodeBelongsToPublisher")
+			defer txn.End()
 			pubID := extractorPublsherID(request)
 			nodeID := extractorNodeID(request)
 

server/middleware/authorization/authorization_middleware_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
+	"github.com/newrelic/go-agent/v3/newrelic"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -51,7 +52,7 @@ func (m mockAlwayErrorAssertor) IsPersonalAccessTokenValidForPublisher(ctx conte
 }
 
 func TestNoAuthz(t *testing.T) {
-	mw := NewAuthorizationManager(&ent.Client{}, mockAlwayErrorAssertor{}).AuthorizationMiddleware()
+	mw := NewAuthorizationManager(&ent.Client{}, mockAlwayErrorAssertor{}, &newrelic.Application{}).AuthorizationMiddleware()
 	req, res := httptest.NewRequest(http.MethodGet, "/", nil), httptest.NewRecorder()
 	ctx := echo.New().NewContext(req, res)
 

server/server.go

@@ -138,7 +138,7 @@ func (s *Server) Start() error {
 		s.Dependencies.DiscordService, s.Dependencies.AlgoliaService, s.NewRelicApp)
 
 	// Define middleware for authorization
-	authorizationManager := drip_authorization.NewAuthorizationManager(s.Client, impl.RegistryService)
+	authorizationManager := drip_authorization.NewAuthorizationManager(s.Client, impl.RegistryService, s.NewRelicApp)
 	middlewares := []generated.StrictMiddlewareFunc{
 		authorizationManager.AuthorizationMiddleware(),
 	}