From 9a65d0a977546c6548b0f35a420714992edd6b6b Mon Sep 17 00:00:00 2001 From: Diego Augusto Molina Date: Wed, 21 Aug 2024 10:31:34 -0300 Subject: [PATCH] Storage: remove sqlstore.WrapDatabaseDriverWithHooks (#92111) remove sqlstore.WrapDatabaseDriverWithHooks from Unified Storage after related incident --- pkg/storage/unified/sql/db/dbimpl/dbEngine.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/storage/unified/sql/db/dbimpl/dbEngine.go b/pkg/storage/unified/sql/db/dbimpl/dbEngine.go index 9a303596ce2..c024c8e195a 100644 --- 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) }