melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: remove metrics from server and database

Browse Source
This commit is contained in:
mkelvers
2026-06-23 15:09:01 +02:00
committed by Milas Holsting
parent a014ad40a9
commit 18861593f8
8 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/database/database.go
View File

@@ -33,8 +33,8 @@ func ProvideSQLDB(cfg config.Config) (*sql.DB, error) {
return dbConn, nil
}
func ProvideQueries(sqlDB *sql.DB, metrics *observability.Metrics) *db.Queries {
return db.New(observability.InstrumentDB(sqlDB, metrics))
func ProvideQueries(sqlDB *sql.DB) *db.Queries {
return db.New(sqlDB)
}
func RunMigrations(sqlDB *sql.DB) error {

3
internal/database/database_test.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"database/sql"
"mal/internal/db"
"mal/internal/observability"
"testing"
_ "github.com/mattn/go-sqlite3"
@@ -64,7 +63,7 @@ func TestCleanupExpiredJikanCache(t *testing.T) {
}
}
cleanupExpiredJikanCache(ctx, db.New(sqlDB), observability.NewMetrics())
cleanupExpiredJikanCache(ctx, db.New(sqlDB))
keys := jikanCacheKeys(ctx, t, sqlDB)
if len(keys) != 1 || keys[0] != "fresh" {

3
internal/database/fixes/20260608_backfill_anime_duration_seconds.go
View File

@@ -7,7 +7,6 @@ import (
"mal/integrations/jikan"
"mal/internal/config"
"mal/internal/db"
"mal/internal/observability"
errlog "mal/pkg"
)
@@ -31,7 +30,7 @@ func applyAnimeDurationSecondsBackfill(ctx context.Context, sqlDB *sql.DB) error
return fmt.Errorf("list anime missing duration_seconds: %w", err)
}
client := jikan.NewClient(config.Config{}, db.New(sqlDB), observability.NewMetrics())
client := jikan.NewClient(config.Config{}, db.New(sqlDB))
for _, row := range toUpdate {
anime, err := client.GetAnimeByID(ctx, int(row.id))
if err != nil {

11
internal/database/jikan_cache_cleanup.go
View File

@@ -15,7 +15,7 @@ const (
jikanCacheCleanupWorker = "jikan_cache_cleanup"
)
func RegisterJikanCacheCleanupWorker(lc fx.Lifecycle, queries *db.Queries, metrics *observability.Metrics) {
func RegisterJikanCacheCleanupWorker(lc fx.Lifecycle, queries *db.Queries) {
ctx, cancel := context.WithCancel(context.Background())
lc.Append(fx.Hook{
@@ -24,7 +24,7 @@ func RegisterJikanCacheCleanupWorker(lc fx.Lifecycle, queries *db.Queries, metri
<-startCtx.Done()
cancel()
}()
go runJikanCacheCleanupWorker(ctx, queries, metrics)
go runJikanCacheCleanupWorker(ctx, queries)
return nil
},
OnStop: func(context.Context) error {
@@ -34,14 +34,14 @@ func RegisterJikanCacheCleanupWorker(lc fx.Lifecycle, queries *db.Queries, metri
})
}
func runJikanCacheCleanupWorker(ctx context.Context, queries *db.Queries, metrics *observability.Metrics) {
func runJikanCacheCleanupWorker(ctx context.Context, queries *db.Queries) {
observability.Info("jikan_cache_cleanup_worker_start", "database", "", nil)
ticker := time.NewTicker(jikanCacheCleanupInterval)
defer ticker.Stop()
for {
cleanupExpiredJikanCache(ctx, queries, metrics)
cleanupExpiredJikanCache(ctx, queries)
select {
case <-ticker.C:
@@ -52,12 +52,11 @@ func runJikanCacheCleanupWorker(ctx context.Context, queries *db.Queries, metric
}
}
func cleanupExpiredJikanCache(ctx context.Context, queries *db.Queries, metrics *observability.Metrics) {
func cleanupExpiredJikanCache(ctx context.Context, queries *db.Queries) {
cleanupCtx, cancel := context.WithTimeout(ctx, jikanCacheCleanupTimeout)
defer cancel()
err := queries.DeleteExpiredJikanCache(cleanupCtx)
metrics.ObserveWorkerTick(jikanCacheCleanupWorker, err)
if err != nil {
observability.Warn(
"jikan_cache_cleanup_failed",