Storage: remove sqlstore.WrapDatabaseDriverWithHooks (grafana#92111)

diegommm · web-flow · commit 9a65d0a97754 · 2024-08-21T10:31:34.000-03:00
remove sqlstore.WrapDatabaseDriverWithHooks from Unified Storage after related incident
diff --git a/pkg/storage/unified/sql/db/dbimpl/dbEngine.go b/pkg/storage/unified/sql/db/dbimpl/dbEngine.go
@@ -8,7 +8,6 @@ import (
 
 	"github.com/go-sql-driver/mysql"
 	"github.com/grafana/grafana/pkg/infra/tracing"
-	"github.com/grafana/grafana/pkg/services/sqlstore"
 	"github.com/grafana/grafana/pkg/storage/unified/sql/db"
 	"xorm.io/xorm"
 )
@@ -107,8 +106,7 @@ func getEnginePostgres(getter *sectionGetter, tracer tracing.Tracer) (*xorm.Engi
 	}
 
 	// FIXME: get rid of xorm
-	driverName := sqlstore.WrapDatabaseDriverWithHooks(db.DriverPostgres, tracer)
-	engine, err := xorm.NewEngine(driverName, dsn)
+	engine, err := xorm.NewEngine(db.DriverPostgres, dsn)
 	if err != nil {
 		return nil, fmt.Errorf("open database: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ import (`
`8`	`8`
`9`	`9`	`"github.com/go-sql-driver/mysql"`
`10`	`10`	`"github.com/grafana/grafana/pkg/infra/tracing"`
`11`		`- "github.com/grafana/grafana/pkg/services/sqlstore"`
`12`	`11`	`"github.com/grafana/grafana/pkg/storage/unified/sql/db"`
`13`	`12`	`"xorm.io/xorm"`
`14`	`13`	`)`
`@@ -107,8 +106,7 @@ func getEnginePostgres(getter sectionGetter, tracer tracing.Tracer) (xorm.Engi`
`107`	`106`	`}`
`108`	`107`
`109`	`108`	`// FIXME: get rid of xorm`
`110`		`- driverName := sqlstore.WrapDatabaseDriverWithHooks(db.DriverPostgres, tracer)`
`111`		`- engine, err := xorm.NewEngine(driverName, dsn)`
	`109`	`+ engine, err := xorm.NewEngine(db.DriverPostgres, dsn)`
`112`	`110`	`if err != nil {`
`113`	`111`	`return nil, fmt.Errorf("open database: %w", err)`
`114`	`112`	`}`