mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
zeekay
b9f9cdf918
Re-sync the entire SigNoz-derived Go tree to a clean fork of latest SigNoz main (upstream 3e6339019), eliminating the version-skew that broke `go build ./...` (mixed-era packages, ~14 imported-but-absent packages, partial signoz->o11y / clickhouse->datastore rebrands, self-import cycle, duplicate package decls). - pkg/ + cmd/ wholesale replaced with latest SigNoz; imports rewritten github.com/SigNoz/signoz/ -> github.com/hanzoai/o11y/. - Adopt SigNoz's CURRENT structure (resourcefilter->telemetryresourcefilter, integrationtypes->cloudintegrationtypes, roletypes/grammar/times folded in upstream); old paths dropped. - Fork deps repathed to hanzoai + bumped: signoz-otel-collector v0.144.6, clickhouse-go-mock v0.14.1, govaluate v0.1.0; expr-lang/expr => hanzoai/expr v1.17.8 (replace). go.mod reconciled from latest SigNoz; go.sum re-tidied. - ee/ + cmd/enterprise stripped — o11y stays MIT-only; community edition imports no ee packages. - Preserved o11y additions: module path github.com/hanzoai/o11y, mount.go (cloud.Register/zip mount adapter, HIP-0106), NOTICE + LICENSE (SigNoz §4c attribution retained; upstream pkg files are headerless per SigNoz convention). - Reverted o11y cosmetic renames (o11y*/datastore*) and experimental originals (authz/iamauthz, billing, zapreceiver, zapmetricreceiver) to SigNoz canonical to kill the skew; snapshots retained in git history for re-layering. go build ./... = exit 0. go vet clean except benign "unreachable code" in generated ANTLR parser files (inherited from upstream).
74 lines
1.6 KiB
Go
74 lines
1.6 KiB
Go
package sqlstore
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
"github.com/uptrace/bun"
|
|
"github.com/uptrace/bun/schema"
|
|
|
|
"github.com/hanzoai/o11y/pkg/errors"
|
|
"github.com/hanzoai/o11y/pkg/factory"
|
|
)
|
|
|
|
type transactorKey struct{}
|
|
|
|
type BunDB struct {
|
|
*bun.DB
|
|
settings factory.ScopedProviderSettings
|
|
}
|
|
|
|
func NewBunDB(settings factory.ScopedProviderSettings, sqldb *sql.DB, dialect schema.Dialect, hooks []SQLStoreHook, opts ...bun.DBOption) *BunDB {
|
|
db := bun.NewDB(sqldb, dialect, opts...)
|
|
|
|
for _, hook := range hooks {
|
|
db.AddQueryHook(hook)
|
|
}
|
|
|
|
return &BunDB{db, settings}
|
|
}
|
|
|
|
func (db *BunDB) RunInTxCtx(ctx context.Context, opts *sql.TxOptions, cb func(ctx context.Context) error) error {
|
|
tx, ok := txFromContext(ctx)
|
|
if ok {
|
|
return cb(ctx)
|
|
}
|
|
|
|
// begin transaction
|
|
tx, err := db.BeginTx(ctx, opts)
|
|
if err != nil {
|
|
return errors.Wrapf(err, errors.TypeInternal, errors.CodeInternal, "cannot begin transaction")
|
|
}
|
|
|
|
defer func() {
|
|
if err := tx.Rollback(); err != nil {
|
|
if err != sql.ErrTxDone {
|
|
db.settings.Logger().ErrorContext(ctx, "cannot rollback transaction", errors.Attr(err))
|
|
}
|
|
}
|
|
}()
|
|
|
|
if err := cb(newContextWithTx(ctx, tx)); err != nil {
|
|
return err
|
|
}
|
|
|
|
return tx.Commit()
|
|
}
|
|
|
|
func (db *BunDB) BunDBCtx(ctx context.Context) bun.IDB {
|
|
tx, ok := txFromContext(ctx)
|
|
if !ok {
|
|
return db.DB
|
|
}
|
|
return tx
|
|
}
|
|
|
|
func newContextWithTx(ctx context.Context, tx bun.Tx) context.Context {
|
|
return context.WithValue(ctx, transactorKey{}, tx)
|
|
}
|
|
|
|
func txFromContext(ctx context.Context) (bun.Tx, bool) {
|
|
tx, ok := ctx.Value(transactorKey{}).(bun.Tx)
|
|
return tx, ok
|
|
}
|