2 files changed, 10 insertions, 9 deletions
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go
index de9b3b3f1..d72df1d41 100644
--- a/cmd/gotosocial/action/server/server.go
+++ b/cmd/gotosocial/action/server/server.go
@@ -82,11 +82,6 @@ var Start action.GTSAction = func(ctx context.Context) error {
 		return fmt.Errorf("error initializing tracing: %w", err)
 	}
 
-	// Initialize Metrics
-	if err := metrics.Initialize(); err != nil {
-		return fmt.Errorf("error initializing metrics: %w", err)
-	}
-
 	// Open connection to the database
 	dbService, err := bundb.NewBunDBService(ctx, &state)
 	if err != nil {
@@ -218,6 +213,11 @@ var Start action.GTSAction = func(ctx context.Context) error {
 		return fmt.Errorf("error scheduling poll expiries: %w", err)
 	}
 
+	// Initialize metrics.
+	if err := metrics.Initialize(state.DB); err != nil {
+		return fmt.Errorf("error initializing metrics: %w", err)
+	}
+
 	/*
 		HTTP router initialization
 	*/
diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go
index bf2c74f2f..dc5f1c7dc 100644
--- a/cmd/gotosocial/action/testrig/testrig.go
+++ b/cmd/gotosocial/action/testrig/testrig.go
@@ -69,10 +69,6 @@ var Start action.GTSAction = func(ctx context.Context) error {
 		return fmt.Errorf("error initializing tracing: %w", err)
 	}
 
-	if err := metrics.Initialize(); err != nil {
-		return fmt.Errorf("error initializing metrics: %w", err)
-	}
-
 	// Initialize caches and database
 	state.DB = testrig.NewTestDB(&state)
 
@@ -143,6 +139,11 @@ var Start action.GTSAction = func(ctx context.Context) error {
 
 	processor := testrig.NewTestProcessor(&state, federator, emailSender, mediaManager)
 
+	// Initialize metrics.
+	if err := metrics.Initialize(state.DB); err != nil {
+		return fmt.Errorf("error initializing metrics: %w", err)
+	}
+
 	/*
 		HTTP router initialization
 	*/