public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Bump golangci-lint to 2.0.2 (#103572)

Browse Source
This commit is contained in:
Mariell Hoversholm
2025-04-10 14:42:23 +02:00
committed by GitHub
parent b58b6e828e
commit 757be6365a
291 changed files with 1948 additions and 1835 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/session.go
+3 -3
View File
@@ -47,7 +47,7 @@ func startSessionOrUseExisting(ctx context.Context, engine *xorm.Engine, beginTr
if ok {
ctxLogger := sessionLogger.FromContext(ctx)
ctxLogger.Debug("reusing existing session", "transaction", sess.transactionOpen)
sess.Session = sess.Session.Context(ctx)
sess.Session = sess.Context(ctx)
// This is a noop span to simplify later operations. purposefully not using existing context
_, span := noop.NewTracerProvider().Tracer("integrationtests").Start(ctx, "sqlstore.startSessionOrUseExisting")
@@ -67,7 +67,7 @@ func startSessionOrUseExisting(ctx context.Context, engine *xorm.Engine, beginTr
return nil, false, span, err
}
}
newSess.Session = newSess.Session.Context(tctx)
newSess.Session = newSess.Context(tctx)
return newSess, true, span, nil
}
@@ -127,7 +127,7 @@ func (sess *DBSession) InsertId(bean any, dialect migrator.Dialect) error {
if err := dialect.PreInsertId(table, sess.Session); err != nil {
return err
}
_, err := sess.Session.InsertOne(bean)
_, err := sess.InsertOne(bean)
if err != nil {
return err
}