remove pacsift workaround

fix double convert to bytes
fix channel read
2025-05-09 21:46:12 +02:00 · 2025-03-22 23:49:07 +01:00 · 2025-03-22 23:37:52 +01:00 · 2025-03-22 23:13:15 +01:00 · 2025-03-22 21:58:38 +01:00 · 2025-03-22 21:46:51 +01:00
14 changed files with 473 additions and 177 deletions
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -14,7 +14,7 @@ linters-settings:
    disabled-checks:
      - whyNoLint
      - filepathJoin
-  gomnd:
+  mnd:
    checks:
      - argument
      - case
@@ -91,3 +91,4 @@ linters:
    - errname
    - goerr113
    - depguard
+    - noctx
--- a/buildmanager.go
+++ b/buildmanager.go
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/c2h5oh/datasize"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/sethvargo/go-retry"
 	log "github.com/sirupsen/logrus"
 	"os"
@@ -26,6 +27,9 @@ type BuildManager struct {
 	building     []*ProtoPackage
 	buildingLock *sync.RWMutex
 	queueSignal  chan struct{}
+	metrics      struct {
+		queueSize *prometheus.GaugeVec
+	}
 }

 func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) error {
@@ -74,12 +78,13 @@ func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) er
 					}

 					// check if package can be built with current memory limit
-					if datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit {
+					if datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit { //nolint:gosec
 						log.Warningf("[Q] %s->%s exeeds memory limit: %s->%s", pkg.FullRepo, pkg.Pkgbase,
-							datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, conf.Build.MemoryLimit)
+							datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, conf.Build.MemoryLimit) //nolint:gosec
 						doneQLock.Lock()
 						doneQ = append(doneQ, pkg)
 						doneQLock.Unlock()
+						b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "queued").Dec()
 						continue
 					}

@@ -88,9 +93,9 @@ func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) er
 					b.buildingLock.RUnlock()

 					// check if package can be build right now
-					if currentMemLoad+(datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB) > conf.Build.MemoryLimit {
+					if currentMemLoad+(datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB) > conf.Build.MemoryLimit { //nolint:gosec
 						log.Debugf("[Q] skipped package with max_rss %s while load %s: %s->%s",
-							datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, currentMemLoad, pkg.Pkgbase, pkg.March)
+							datasize.ByteSize(*pkg.DBPackage.MaxRss)*datasize.KB, currentMemLoad, pkg.Pkgbase, pkg.March) //nolint:gosec
 						continue
 					}
 				} else {
@@ -106,14 +111,18 @@ func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) er
 				b.building = append(b.building, pkg)
 				b.buildingLock.Unlock()
 				queueNoMatch = false
+				b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "queued").Dec()
+				b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "building").Inc()

 				go func(pkg *ProtoPackage) {
 					dur, err := pkg.build(ctx)
+					b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "building").Dec()
 					if err != nil && !errors.Is(err, ErrorNotEligible) {
 						log.Warningf("[Q] error building package %s->%s in %s: %s", pkg.FullRepo, pkg.Pkgbase, dur, err)
 						b.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg}
 					} else if err == nil {
 						log.Infof("[Q] build successful: %s->%s (%s)", pkg.FullRepo, pkg.Pkgbase, dur)
+						b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "built").Inc()
 					}
 					doneQLock.Lock()
 					b.buildingLock.Lock()
@@ -147,7 +156,7 @@ func (b *BuildManager) buildQueue(ctx context.Context, queue []*ProtoPackage) er
 	return nil
 }

-func (b *BuildManager) repoWorker(repo string) {
+func (b *BuildManager) repoWorker(ctx context.Context, repo string) {
 	for {
 		select {
 		case pkgL := <-b.repoAdd[repo]:
@@ -159,7 +168,7 @@ func (b *BuildManager) repoWorker(repo string) {

 			args := []string{"-s", "-v", "-p", "-n", filepath.Join(conf.Basedir.Repo, repo, "os", conf.Arch, repo) + ".db.tar.xz"}
 			args = append(args, toAdd...)
-			cmd := exec.Command("repo-add", args...)
+			cmd := exec.CommandContext(ctx, "repo-add", args...)
 			res, err := cmd.CombinedOutput()
 			log.Debug(string(res))
 			if err != nil && cmd.ProcessState.ExitCode() != 1 {
@@ -167,7 +176,7 @@ func (b *BuildManager) repoWorker(repo string) {
 			}

 			for _, pkg := range pkgL {
-				err = pkg.toDBPackage(true)
+				err = pkg.toDBPackage(ctx, true)
 				if err != nil {
 					log.Warningf("error getting db entry for %s: %v", pkg.Pkgbase, err)
 					continue
@@ -185,10 +194,12 @@ func (b *BuildManager) repoWorker(repo string) {
 				} else {
 					pkgUpd = pkgUpd.SetDebugSymbols(dbpackage.DebugSymbolsNotAvailable)
 				}
-				pkg.DBPackage = pkgUpd.SaveX(context.Background())
+				if pkg.DBPackage, err = pkgUpd.Save(ctx); err != nil {
+					log.Error(err)
+				}
 			}

-			cmd = exec.Command("paccache", "-rc", filepath.Join(conf.Basedir.Repo, repo, "os", conf.Arch), "-k", "1") //nolint:gosec
+			cmd = exec.CommandContext(ctx, "paccache", "-rc", filepath.Join(conf.Basedir.Repo, repo, "os", conf.Arch), "-k", "1") //nolint:gosec
 			res, err = cmd.CombinedOutput()
 			log.Debug(string(res))
 			if err != nil {
@@ -211,7 +222,10 @@ func (b *BuildManager) repoWorker(repo string) {
 						continue
 					} else if len(pkg.PkgFiles) == 0 {
 						if pkg.DBPackage != nil {
-							_ = pkg.DBPackage.Update().ClearRepoVersion().ClearTagRev().Exec(context.Background())
+							err = pkg.DBPackage.Update().ClearRepoVersion().ClearTagRev().Exec(ctx)
+							if err != nil {
+								log.Error(err)
+							}
 						}
 						continue
 					}
@@ -231,7 +245,7 @@ func (b *BuildManager) repoWorker(repo string) {
 				b.repoWG.Add(1)
 				args := []string{"-s", "-v", filepath.Join(conf.Basedir.Repo, pkg.FullRepo, "os", conf.Arch, pkg.FullRepo) + ".db.tar.xz"}
 				args = append(args, realPkgs...)
-				cmd := exec.Command("repo-remove", args...)
+				cmd := exec.CommandContext(ctx, "repo-remove", args...)
 				res, err := cmd.CombinedOutput()
 				log.Debug(string(res))
 				if err != nil && cmd.ProcessState.ExitCode() == 1 {
@@ -239,7 +253,10 @@ func (b *BuildManager) repoWorker(repo string) {
 				}

 				if pkg.DBPackage != nil {
-					_ = pkg.DBPackage.Update().ClearRepoVersion().ClearTagRev().Exec(context.Background())
+					err = pkg.DBPackage.Update().ClearRepoVersion().ClearTagRev().Exec(ctx)
+					if err != nil {
+						log.Error(err)
+					}
 				}

 				for _, file := range pkg.PkgFiles {
@@ -265,14 +282,14 @@ func (b *BuildManager) syncWorker(ctx context.Context) error {
 	gitPath := filepath.Join(conf.Basedir.Work, stateDir)
 	for {
 		if _, err := os.Stat(gitPath); os.IsNotExist(err) {
-			cmd := exec.Command("git", "clone", "--depth=1", conf.StateRepo, gitPath) //nolint:gosec
+			cmd := exec.CommandContext(ctx, "git", "clone", "--depth=1", conf.StateRepo, gitPath) //nolint:gosec
 			res, err := cmd.CombinedOutput()
 			log.Debug(string(res))
 			if err != nil {
 				log.Fatalf("error cloning state repo: %v", err)
 			}
 		} else if err == nil {
-			cmd := exec.Command("git", "reset", "--hard")
+			cmd := exec.CommandContext(ctx, "git", "reset", "--hard")
 			cmd.Dir = gitPath
 			res, err := cmd.CombinedOutput()
 			log.Debug(string(res))
@@ -280,7 +297,7 @@ func (b *BuildManager) syncWorker(ctx context.Context) error {
 				log.Fatalf("error reseting state repo: %v", err)
 			}

-			cmd = exec.Command("git", "pull")
+			cmd = exec.CommandContext(ctx, "git", "pull")
 			cmd.Dir = gitPath
 			res, err = cmd.CombinedOutput()
 			log.Debug(string(res))
@@ -294,8 +311,8 @@ func (b *BuildManager) syncWorker(ctx context.Context) error {
 		for _, repo := range repos {
 			wg.Add(1)
 			splitRepo := strings.Split(repo, "-")
-			go func() { //nolint:contextcheck
-				err := housekeeping(splitRepo[0], strings.Join(splitRepo[1:], "-"), wg)
+			go func() {
+				err := housekeeping(ctx, splitRepo[0], strings.Join(splitRepo[1:], "-"), wg)
 				if err != nil {
 					log.Warningf("[%s] housekeeping failed: %v", repo, err)
 				}
@@ -303,7 +320,7 @@ func (b *BuildManager) syncWorker(ctx context.Context) error {
 		}
 		wg.Wait()

-		err := logHK() //nolint:contextcheck
+		err := logHK(ctx)
 		if err != nil {
 			log.Warningf("log-housekeeping failed: %v", err)
 		}
@@ -317,7 +334,7 @@ func (b *BuildManager) syncWorker(ctx context.Context) error {
 		}

 		if err := retry.Fibonacci(ctx, 1*time.Second, func(_ context.Context) error {
-			if err := setupChroot(); err != nil {
+			if err := setupChroot(ctx); err != nil {
 				log.Warningf("unable to upgrade chroot, trying again later")
 				return retry.RetryableError(err)
 			}
@@ -333,20 +350,21 @@ func (b *BuildManager) syncWorker(ctx context.Context) error {
 		}
 		b.alpmMutex.Unlock()

-		queue, err := b.genQueue() //nolint:contextcheck
+		queue, err := b.genQueue(ctx)
 		if err != nil {
 			log.Errorf("error building queue: %v", err)
-		} else {
+			return err
+		}
+
 		log.Debugf("build-queue with %d items", len(queue))
 		err = b.buildQueue(ctx, queue)
 		if err != nil {
 			return err
 		}
-		}

 		if ctx.Err() == nil {
 			for _, repo := range repos {
-				err = movePackagesLive(repo) //nolint:contextcheck
+				err = movePackagesLive(ctx, repo)
 				if err != nil {
 					log.Errorf("[%s] error moving packages live: %v", repo, err)
 				}
@@ -355,12 +373,13 @@ func (b *BuildManager) syncWorker(ctx context.Context) error {
 			return ctx.Err()
 		}

+		b.metrics.queueSize.Reset()
 		log.Debugf("build-cycle finished")
 		time.Sleep(time.Duration(*checkInterval) * time.Minute)
 	}
 }

-func (b *BuildManager) genQueue() ([]*ProtoPackage, error) {
+func (b *BuildManager) genQueue(ctx context.Context) ([]*ProtoPackage, error) {
 	stateFiles, err := Glob(filepath.Join(conf.Basedir.Work, stateDir, "**/*"))
 	if err != nil {
 		return nil, fmt.Errorf("error scanning for state-files: %w", err)
@@ -406,13 +425,13 @@ func (b *BuildManager) genQueue() ([]*ProtoPackage, error) {
 				Arch:     arch,
 			}

-			err = pkg.toDBPackage(false)
+			err = pkg.toDBPackage(ctx, false)
 			if err != nil {
 				log.Warningf("[QG] error getting/creating dbpackage %s: %v", state.Pkgbase, err)
 				continue
 			}

-			if !pkg.isAvailable(alpmHandle) {
+			if !pkg.isAvailable(ctx, alpmHandle) {
 				log.Debugf("[QG] %s->%s not available on mirror, skipping build", pkg.FullRepo, pkg.Pkgbase)
 				continue
 			}
@@ -427,7 +446,7 @@ func (b *BuildManager) genQueue() ([]*ProtoPackage, error) {
 			}

 			if pkg.DBPackage == nil {
-				err = pkg.toDBPackage(true)
+				err = pkg.toDBPackage(ctx, true)
 				if err != nil {
 					log.Warningf("[QG] error getting/creating dbpackage %s: %v", state.Pkgbase, err)
 					continue
@@ -438,18 +457,22 @@ func (b *BuildManager) genQueue() ([]*ProtoPackage, error) {
 				continue
 			}

-			// try download srcinfo from repo
+			// try download .SRCINFO from repo
 			srcInfo, err := downloadSRCINFO(pkg.DBPackage.Pkgbase, state.TagRev)
 			if err == nil {
 				pkg.Srcinfo = srcInfo
 			}

-			if !pkg.isEligible(context.Background()) {
+			if !pkg.isEligible(ctx) {
 				continue
 			}

-			pkg.DBPackage = pkg.DBPackage.Update().SetStatus(dbpackage.StatusQueued).SaveX(context.Background())
+			pkg.DBPackage, err = pkg.DBPackage.Update().SetStatus(dbpackage.StatusQueued).Save(ctx)
+			if err != nil {
+				log.Warningf("[QG] error updating dbpackage %s: %v", state.Pkgbase, err)
+			}
 			pkgbuilds = append(pkgbuilds, pkg)
+			b.metrics.queueSize.WithLabelValues(pkg.FullRepo, "queued").Inc()
 		}
 	}

--- a/config_dist.yaml
+++ b/config_dist.yaml
@@ -45,3 +45,6 @@ build:

 logging:
  level: INFO
+
+metrics:
+  port: 9568
--- a/ent/runtime/runtime.go
+++ b/ent/runtime/runtime.go
@@ -5,6 +5,6 @@ package runtime
 // The schema-stitching logic is generated in somegit.dev/ALHP/ALHP.GO/ent/runtime.go

 const (
-	Version = "v0.14.1"                                         // Version of ent codegen.
-	Sum     = "h1:fUERL506Pqr92EPHJqr8EYxbPioflJo6PudkrEA8a/s=" // Sum of ent codegen.
+	Version = "v0.14.2"                                         // Version of ent codegen.
+	Sum     = "h1:ywld/j2Rx4EmnIKs8eZ29cbFA1zpB+DA9TLL5l3rlq0=" // Sum of ent codegen.
 )
--- a/flags.yaml
+++ b/flags.yaml
@@ -20,13 +20,19 @@ common:
  packager: "ALHP $march$ <alhp@harting.dev>"
  makeflags: "-j$buildproc$"
  # https://somegit.dev/ALHP/ALHP.GO/issues/110
-  rustflags: "-Copt-level=3 -Ctarget-cpu=$march$ -Clink-arg=-z -Clink-arg=pack-relative-relocs"
+  rustflags:
+    - "-Copt-level=3"
+    - "-Ctarget-cpu=$march$"
+    - "-Clink-arg=-z"
+    - "-Clink-arg=pack-relative-relocs"
  ltoflags:
    - "-falign-functions=32" # https://github.com/InBetweenNames/gentooLTO/issues/164
  kcflags: " -march=$march$ -O3"
  kcppflags: " -march=$march$ -O3"
-  fcflags: "$CFLAGS"
-  fflags: "$CFLAGS"
+  fcflags: "$FFLAGS"
+  fflags:
+    - "-O2": "-O3"
+    - "-march=$march$"

 lto:
  rustflags:
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.23.0
 toolchain go1.23.1

 require (
-	entgo.io/ent v0.14.1
+	entgo.io/ent v0.14.3
 	github.com/Jguer/go-alpm/v2 v2.2.2
 	github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5
 	github.com/Morganamilo/go-srcinfo v1.0.0
@@ -13,7 +13,8 @@ require (
 	github.com/gobwas/glob v0.2.3
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v4 v4.18.3
-	github.com/otiai10/copy v1.14.0
+	github.com/otiai10/copy v1.14.1
+	github.com/prometheus/client_golang v1.21.1
 	github.com/sethvargo/go-retry v0.3.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117
@@ -21,13 +22,15 @@ require (
 )

 require (
-	ariga.io/atlas v0.28.1 // indirect
+	ariga.io/atlas v0.32.0 // indirect
 	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bmatcuk/doublestar v1.3.4 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
-	github.com/go-openapi/inflect v0.21.0 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/go-openapi/inflect v0.21.1 // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/hashicorp/hcl/v2 v2.23.0 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
 	github.com/jackc/pgconn v1.14.3 // indirect
@@ -36,14 +39,20 @@ require (
 	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/pgtype v1.14.4 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/zclconf/go-cty v1.15.0 // indirect
-	golang.org/x/crypto v0.29.0 // indirect
-	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
-	golang.org/x/tools v0.27.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/otiai10/mint v1.6.3 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.63.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/zclconf/go-cty v1.16.2 // indirect
+	github.com/zclconf/go-cty-yaml v1.1.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
+	golang.org/x/tools v0.31.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,11 @@
-ariga.io/atlas v0.28.1 h1:cNE0FYmoYs1u4KF+FGnp2on1srhM6FDpjaCgL7Rd8/c=
-ariga.io/atlas v0.28.1/go.mod h1:LOOp18LCL9r+VifvVlJqgYJwYl271rrXD9/wIyzJ8sw=
-entgo.io/ent v0.14.1 h1:fUERL506Pqr92EPHJqr8EYxbPioflJo6PudkrEA8a/s=
-entgo.io/ent v0.14.1/go.mod h1:MH6XLG0KXpkcDQhKiHfANZSzR55TJyPL5IGNpI8wpco=
+ariga.io/atlas v0.31.1-0.20250212144724-069be8033e83 h1:nX4HXncwIdvQ8/8sIUIf1nyCkK8qdBaHQ7EtzPpuiGE=
+ariga.io/atlas v0.31.1-0.20250212144724-069be8033e83/go.mod h1:Oe1xWPuu5q9LzyrWfbZmEZxFYeu4BHTyzfjeW2aZp/w=
+ariga.io/atlas v0.32.0 h1:y+77nueMrExLiKlz1CcPKh/nU7VSlWfBbwCShsJyvCw=
+ariga.io/atlas v0.32.0/go.mod h1:Oe1xWPuu5q9LzyrWfbZmEZxFYeu4BHTyzfjeW2aZp/w=
+entgo.io/ent v0.14.2 h1:ywld/j2Rx4EmnIKs8eZ29cbFA1zpB+DA9TLL5l3rlq0=
+entgo.io/ent v0.14.2/go.mod h1:aDPE/OziPEu8+OWbzy4UlvWmD2/kbRuWfK2A40hcxJM=
+entgo.io/ent v0.14.3 h1:wokAV/kIlH9TeklJWGGS7AYJdVckr0DloWjIcO9iIIQ=
+entgo.io/ent v0.14.3/go.mod h1:aDPE/OziPEu8+OWbzy4UlvWmD2/kbRuWfK2A40hcxJM=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
 github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
@@ -17,10 +21,14 @@ github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7l
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
 github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
 github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
 github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 h1:6lhrsTEnloDPXyeZBvSYvQf8u86jbKehZPVDDlkgDl4=
 github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -28,7 +36,6 @@ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -36,6 +43,8 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-openapi/inflect v0.21.0 h1:FoBjBTQEcbg2cJUWX6uwL9OyIW8eqc9k4KhN4lfbeYk=
 github.com/go-openapi/inflect v0.21.0/go.mod h1:INezMuUu7SJQc2AyR3WO0DqqYUJSj8Kb4hBd7WtjlAw=
+github.com/go-openapi/inflect v0.21.1 h1:swwdJV4YPbuQaz68rHiBeQj+MWeBjDDNyEAi78Fhu4g=
+github.com/go-openapi/inflect v0.21.1/go.mod h1:INezMuUu7SJQc2AyR3WO0DqqYUJSj8Kb4hBd7WtjlAw=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
@@ -43,13 +52,14 @@ github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos=
 github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA=
+github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -70,6 +80,7 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W
 github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
 github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
@@ -101,17 +112,25 @@ github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -126,17 +145,31 @@ github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwp
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
 github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
-github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
-github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
-github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
-github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/otiai10/copy v1.14.1 h1:5/7E6qsUMBaH5AnQ0sSLzzTg1oTECmcCmT6lvF45Na8=
+github.com/otiai10/copy v1.14.1/go.mod h1:oQwrEDDOci3IM8dJF0d8+jnbfPDllW6vUjNc3DoZm9I=
+github.com/otiai10/mint v1.6.3 h1:87qsV/aw1F5as1eH1zS/yqHY85ANKVMgkDrf9rcxbQs=
+github.com/otiai10/mint v1.6.3/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
+github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
+github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
@@ -163,15 +196,17 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117 h1:67A5tweHp3C7osHjrYsy6pQZ00bYkTTttZ7kiOwwHeA=
 github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117/go.mod h1:XCsSkdKK4gwBMNrOCZWww0pX6AOt+2gYc5Z6jBRrNVg=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zclconf/go-cty v1.15.0 h1:tTCRWxsexYUmtt/wVxgDClUe+uQusuI443uL6e+5sXQ=
-github.com/zclconf/go-cty v1.15.0/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
+github.com/zclconf/go-cty v1.16.2 h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=
+github.com/zclconf/go-cty v1.16.2/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940 h1:4r45xpDWB6ZMSMNJFMOjqrGHynW3DIBuR2H9j0ug+Mo=
 github.com/zclconf/go-cty-debug v0.0.0-20240509010212-0d6042c53940/go.mod h1:CmBdvvj3nqzfzJ6nTCIwDTPZ56aVGvDrmztiO5g3qrM=
+github.com/zclconf/go-cty-yaml v1.1.0 h1:nP+jp0qPHv2IhUVqmQSzjvqAWcObN0KBkUl2rWBdig0=
+github.com/zclconf/go-cty-yaml v1.1.0/go.mod h1:9YLUH4g7lOhVWqUbctnVlZ5KLpg7JAprQNgxSZ1Gyxs=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -196,15 +231,19 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
+golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
+golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -217,8 +256,10 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -237,8 +278,10 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -254,8 +297,10 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -267,17 +312,23 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
-golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
+golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
+golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
+google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
--- a/housekeeping.go
+++ b/housekeeping.go
@@ -13,7 +13,7 @@ import (
 	"time"
 )

-func housekeeping(repo, march string, wg *sync.WaitGroup) error {
+func housekeeping(ctx context.Context, repo, march string, wg *sync.WaitGroup) error {
 	defer wg.Done()
 	fullRepo := repo + "-" + march
 	log.Debugf("[%s] start housekeeping", fullRepo)
@@ -26,7 +26,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 	for _, path := range packages {
 		mPackage := Package(path)

-		dbPkg, err := mPackage.DBPackage(db)
+		dbPkg, err := mPackage.DBPackage(ctx, db)
 		if ent.IsNotFound(err) {
 			log.Infof("[HK] removing orphan %s->%s", fullRepo, filepath.Base(path))
 			pkg := &ProtoPackage{
@@ -50,12 +50,6 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 			Arch:      *mPackage.Arch(),
 		}

-		matchNoBuild, err := MatchGlobList(pkg.Pkgbase, conf.Blacklist.Packages)
-		if err != nil {
-			log.Errorf("[HK] %s->%s error parsing no-build glob: %v", pkg.FullRepo, mPackage.Name(), err)
-			continue
-		}
-
 		// check if package is still part of repo
 		dbs, err := alpmHandle.SyncDBs()
 		if err != nil {
@@ -69,7 +63,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 			pkgResolved.DB().Name() != pkg.Repo.String() ||
 			pkgResolved.Architecture() != pkg.Arch ||
 			pkgResolved.Name() != mPackage.Name() ||
-			matchNoBuild {
+			MatchGlobList(pkg.Pkgbase, conf.Blacklist.Packages) {
 			switch {
 			case err != nil:
 				log.Infof("[HK] %s->%s not included in repo (resolve error: %v)", pkg.FullRepo, mPackage.Name(), err)
@@ -85,7 +79,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 			case pkgResolved.Name() != mPackage.Name():
 				log.Infof("[HK] %s->%s not included in repo (name mismatch: repo:%s != pkg:%s)", pkg.FullRepo,
 					mPackage.Name(), pkgResolved.Name(), mPackage.Name())
-			case matchNoBuild:
+			case MatchGlobList(pkg.Pkgbase, conf.Blacklist.Packages):
 				log.Infof("[HK] %s->%s not included in repo (blacklisted pkgbase %s)", pkg.FullRepo, mPackage.Name(), pkg.Pkgbase)
 			}

@@ -95,7 +89,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 				log.Errorf("[HK] %s->%s unable to get pkg-files: %v", pkg.FullRepo, mPackage.Name(), err)
 				continue
 			}
-			err = db.DBPackage.DeleteOne(pkg.DBPackage).Exec(context.Background())
+			err = db.DBPackage.DeleteOne(pkg.DBPackage).Exec(ctx)
 			pkg.DBPackage = nil
 			buildManager.repoPurge[pkg.FullRepo] <- []*ProtoPackage{pkg}
 			if err != nil {
@@ -105,7 +99,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 		}

 		if pkg.DBPackage.LastVerified.Before(pkg.DBPackage.BuildTimeStart) {
-			err := pkg.DBPackage.Update().SetLastVerified(time.Now().UTC()).Exec(context.Background())
+			err := pkg.DBPackage.Update().SetLastVerified(time.Now().UTC()).Exec(ctx)
 			if err != nil {
 				return err
 			}
@@ -153,7 +147,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 			DBPackage: dbPkg,
 		}

-		if !pkg.isAvailable(alpmHandle) {
+		if !pkg.isAvailable(ctx, alpmHandle) {
 			log.Infof("[HK] %s->%s not found on mirror, removing", pkg.FullRepo, pkg.Pkgbase)
 			err = db.DBPackage.DeleteOne(dbPkg).Exec(context.Background())
 			if err != nil {
@@ -167,9 +161,11 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 			// check lastVersionBuild
 			if dbPkg.LastVersionBuild != dbPkg.RepoVersion {
 				log.Infof("[HK] %s->%s updating lastVersionBuild %s -> %s", fullRepo, dbPkg.Pkgbase, dbPkg.LastVersionBuild, dbPkg.RepoVersion)
-				dbPkg, err = dbPkg.Update().SetLastVersionBuild(dbPkg.RepoVersion).Save(context.Background())
+				nDBPkg, err := dbPkg.Update().SetLastVersionBuild(dbPkg.RepoVersion).Save(ctx)
 				if err != nil {
 					log.Warningf("[HK] error updating lastVersionBuild for %s->%s: %v", fullRepo, dbPkg.Pkgbase, err)
+				} else {
+					dbPkg = nDBPkg
 				}
 			}

@@ -194,7 +190,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 					ClearRepoVersion().
 					ClearTagRev().
 					SetStatus(dbpackage.StatusQueued).
-					Save(context.Background())
+					Save(ctx)
 				if err != nil {
 					return err
 				}
@@ -230,14 +226,14 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 			if dbPkg.TagRev != nil && state.TagRev == *dbPkg.TagRev && state.PkgVer != dbPkg.Version {
 				log.Infof("[HK] reseting package %s->%s with mismatched state information (%s!=%s)",
 					fullRepo, dbPkg.Pkgbase, state.PkgVer, dbPkg.Version)
-				err = dbPkg.Update().SetStatus(dbpackage.StatusQueued).ClearTagRev().Exec(context.Background())
+				err = dbPkg.Update().SetStatus(dbpackage.StatusQueued).ClearTagRev().Exec(ctx)
 				if err != nil {
 					return err
 				}
 			}
 		case dbPkg.Status == dbpackage.StatusLatest && dbPkg.RepoVersion == "":
 			log.Infof("[HK] reseting missing package %s->%s with no repo version", fullRepo, dbPkg.Pkgbase)
-			err = dbPkg.Update().SetStatus(dbpackage.StatusQueued).ClearTagRev().ClearRepoVersion().Exec(context.Background())
+			err = dbPkg.Update().SetStatus(dbpackage.StatusQueued).ClearTagRev().ClearRepoVersion().Exec(ctx)
 			if err != nil {
 				return err
 			}
@@ -249,6 +245,12 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 				DBPackage: dbPkg,
 			}
 			buildManager.repoPurge[fullRepo] <- []*ProtoPackage{pkg}
+		case dbPkg.Status == dbpackage.StatusSkipped && dbPkg.SkipReason == "blacklisted" && !MatchGlobList(pkg.Pkgbase, conf.Blacklist.Packages):
+			log.Infof("[HK] requeue previously blacklisted package %s->%s", fullRepo, dbPkg.Pkgbase)
+			err = dbPkg.Update().SetStatus(dbpackage.StatusQueued).ClearSkipReason().ClearTagRev().Exec(context.Background())
+			if err != nil {
+				return err
+			}
 		case dbPkg.Status == dbpackage.StatusFailed && dbPkg.RepoVersion != "":
 			log.Infof("[HK] package %s->%s failed but still present in repo, removing", fullRepo, dbPkg.Pkgbase)
 			pkg := &ProtoPackage{
@@ -264,7 +266,7 @@ func housekeeping(repo, march string, wg *sync.WaitGroup) error {
 	return nil
 }

-func logHK() error {
+func logHK(ctx context.Context) error {
 	// check if package for log exists and if error can be fixed by rebuild
 	logFiles, err := Glob(filepath.Join(conf.Basedir.Repo, logDir, "/**/*.log"))
 	if err != nil {
@@ -293,7 +295,7 @@ func logHK() error {
 			dbpackage.Pkgbase(pkg.Pkgbase),
 			dbpackage.March(pkg.March),
 			dbpackage.StatusEQ(dbpackage.StatusSkipped),
-		).Exist(context.Background())
+		).Exist(ctx)
 		if err != nil {
 			return err
 		}
@@ -312,7 +314,7 @@ func logHK() error {
 		if rePortError.MatchString(sLogContent) || reSigError.MatchString(sLogContent) || reDownloadError.MatchString(sLogContent) ||
 			reDownloadError2.MatchString(sLogContent) {
 			rows, err := db.DBPackage.Update().Where(dbpackage.Pkgbase(pkg.Pkgbase), dbpackage.March(pkg.March),
-				dbpackage.StatusEQ(dbpackage.StatusFailed)).ClearTagRev().SetStatus(dbpackage.StatusQueued).Save(context.Background())
+				dbpackage.StatusEQ(dbpackage.StatusFailed)).ClearTagRev().SetStatus(dbpackage.StatusQueued).Save(ctx)
 			if err != nil {
 				return err
 			}
@@ -326,7 +328,7 @@ func logHK() error {
 				dbpackage.March(pkg.March),
 				dbpackage.StatusEQ(dbpackage.StatusFailed),
 				dbpackage.LtoNotIn(dbpackage.LtoAutoDisabled, dbpackage.LtoDisabled),
-			).ClearTagRev().SetStatus(dbpackage.StatusQueued).SetLto(dbpackage.LtoAutoDisabled).Save(context.Background())
+			).ClearTagRev().SetStatus(dbpackage.StatusQueued).SetLto(dbpackage.LtoAutoDisabled).Save(ctx)
 			if err != nil {
 				return err
 			}
@@ -343,7 +345,7 @@ func debugHK() {
 	for _, march := range conf.March {
 		if _, err := os.Stat(filepath.Join(conf.Basedir.Debug, march)); err == nil {
 			log.Debugf("[DHK/%s] start cleanup debug packages", march)
-			cleanCmd := exec.Command("paccache", "-rc", filepath.Join(conf.Basedir.Debug, march), "-k", "1") //nolint:gosec
+			cleanCmd := exec.Command("paccache", "-rc", filepath.Join(conf.Basedir.Debug, march), "-k", "1")
 			res, err := cleanCmd.CombinedOutput()
 			if err != nil {
 				log.Warningf("[DHK/%s] cleanup debug packages failed: %v (%s)", march, err, string(res))
--- a/main.go
+++ b/main.go
@@ -86,7 +86,8 @@ func main() {
 		}(db)
 	}

-	if err := db.Schema.Create(context.Background(), migrate.WithDropIndex(true), migrate.WithDropColumn(true)); err != nil {
+	ctx, cancel := context.WithCancel(context.Background())
+	if err := db.Schema.Create(ctx, migrate.WithDropIndex(true), migrate.WithDropColumn(true)); err != nil {
 		log.Panicf("automigrate failed: %v", err)
 	}

@@ -100,11 +101,13 @@ func main() {
 		repoWG:       new(sync.WaitGroup),
 	}

-	err = setupChroot()
+	buildManager.setupMetrics(conf.Metrics.Port)
+
+	err = setupChroot(ctx)
 	if err != nil {
 		log.Panicf("unable to setup chroot: %v", err)
 	}
-	err = syncMarchs()
+	err = syncMarchs(ctx)
 	if err != nil {
 		log.Panicf("error syncing marchs: %v", err)
 	}
@@ -115,8 +118,6 @@ func main() {
 		log.Panicf("error while ALPM-init: %v", err)
 	}

-	ctx, cancel := context.WithCancel(context.Background())
-
 	go func() {
 		_ = buildManager.syncWorker(ctx)
 	}()
--- a/metrics.go
+++ b/metrics.go
@@ -0,0 +1,26 @@
+package main
+
+import (
+	"fmt"
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/prometheus/client_golang/prometheus/promauto"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	log "github.com/sirupsen/logrus"
+	"net/http"
+)
+
+func (b *BuildManager) setupMetrics(port uint32) {
+	b.metrics.queueSize = promauto.NewGaugeVec(prometheus.GaugeOpts{
+		Name: "build_queue_size",
+		Help: "Build queue size",
+	}, []string{"repository", "status"})
+
+	mux := http.NewServeMux()
+	mux.Handle("/", promhttp.Handler())
+	go func() {
+		err := http.ListenAndServe(fmt.Sprintf(":%d", port), mux) //nolint:gosec
+		if err != nil {
+			log.Errorf("failed to start metrics server: %v", err)
+		}
+	}()
+}
--- a/package.go
+++ b/package.go
@@ -70,12 +70,12 @@ func (pkg Package) HasValidSignature() (bool, error) {
 }

 // DBPackage returns ent.DBPackage for package
-func (pkg Package) DBPackage(db *ent.Client) (*ent.DBPackage, error) {
-	return pkg.DBPackageIsolated(*pkg.MArch(), pkg.Repo(), db)
+func (pkg Package) DBPackage(ctx context.Context, db *ent.Client) (*ent.DBPackage, error) {
+	return pkg.DBPackageIsolated(ctx, *pkg.MArch(), pkg.Repo(), db)
 }

 // DBPackageIsolated returns ent.DBPackage like DBPackage, but not relying on the path for march and repo
-func (pkg Package) DBPackageIsolated(march string, repo dbpackage.Repository, db *ent.Client) (*ent.DBPackage, error) {
+func (pkg Package) DBPackageIsolated(ctx context.Context, march string, repo dbpackage.Repository, db *ent.Client) (*ent.DBPackage, error) {
 	dbPkg, err := db.DBPackage.Query().Where(func(s *sql.Selector) {
 		s.Where(
 			sql.And(
@@ -83,7 +83,7 @@ func (pkg Package) DBPackageIsolated(march string, repo dbpackage.Repository, db
 				sql.EQ(dbpackage.FieldMarch, march),
 				sql.EQ(dbpackage.FieldRepository, repo)),
 		)
-	}).Only(context.Background())
+	}).Only(ctx)
 	if ent.IsNotFound(err) {
 		log.Debugf("not found in database: %s", pkg.Name())
 		return nil, err
--- a/proto_package.go
+++ b/proto_package.go
@@ -43,11 +43,6 @@ var (
 )

 func (p *ProtoPackage) isEligible(ctx context.Context) bool {
-	globMatch, err := MatchGlobList(p.Pkgbase, conf.Blacklist.Packages)
-	if err != nil {
-		log.Errorf("error parsing glob from no-build list: %v", err)
-	}
-
 	skipping := false
 	switch {
 	case p.Arch == "any":
@@ -55,13 +50,13 @@ func (p *ProtoPackage) isEligible(ctx context.Context) bool {
 		p.DBPackage.SkipReason = "arch = any"
 		p.DBPackage.Status = dbpackage.StatusSkipped
 		skipping = true
-	case globMatch:
+	case MatchGlobList(p.Pkgbase, conf.Blacklist.Packages):
 		log.Debugf("skipped %s: package on no-build list", p.Pkgbase)
 		p.DBPackage.SkipReason = "blacklisted"
 		p.DBPackage.Status = dbpackage.StatusSkipped
 		skipping = true
-	case p.DBPackage.MaxRss != nil && datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit:
-		log.Debugf("skipped %s: memory limit exceeded (%s)", p.Pkgbase, datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB)
+	case p.DBPackage.MaxRss != nil && datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB > conf.Build.MemoryLimit: //nolint:gosec
+		log.Debugf("skipped %s: memory limit exceeded (%s)", p.Pkgbase, datasize.ByteSize(*p.DBPackage.MaxRss)*datasize.KB) //nolint:gosec
 		p.DBPackage.SkipReason = "memory limit exceeded"
 		p.DBPackage.Status = dbpackage.StatusSkipped
 		skipping = true
@@ -210,17 +205,29 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 	cmd := exec.CommandContext(ctx, "makechrootpkg", "-c", "-D", filepath.Join(conf.Basedir.Work, makepkgDir), //nolint:gosec
 		"-l", chroot, "-r", filepath.Join(conf.Basedir.Work, chrootDir), "--", "-m", "--noprogressbar", "--config",
 		filepath.Join(conf.Basedir.Work, makepkgDir, fmt.Sprintf(makepkgFile, p.March)))
+	cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true}
 	cmd.Dir = filepath.Dir(p.Pkgbuild)
 	var out bytes.Buffer
 	cmd.Stdout = &out
 	cmd.Stderr = &out

-	err = cmd.Start()
-	if err != nil {
+	if err = cmd.Start(); err != nil {
 		return time.Since(start), fmt.Errorf("error starting build: %w", err)
 	}

+	pgid, err := syscall.Getpgid(cmd.Process.Pid)
+	if err != nil {
+		log.Errorf("error getting PGID: %v", err)
+	}
+
+	done := make(chan bool)
+	result := make(chan int64)
+	go pollMemoryUsage(pgid, 1*time.Second, done, result)
+
 	err = cmd.Wait()
+	close(done)
+	peakMem := <-result
+	close(result)

 	Rusage, ok := cmd.ProcessState.SysUsage().(*syscall.Rusage)
 	if !ok {
@@ -320,7 +327,7 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
 		SetBuildTimeStart(start).
 		SetLastVersionBuild(p.Version).
 		SetTagRev(p.State.TagRev).
-		SetMaxRss(Rusage.Maxrss).
+		SetMaxRss(peakMem).
 		SetIoOut(Rusage.Oublock).
 		SetIoIn(Rusage.Inblock).
 		SetUTime(Rusage.Utime.Sec).
@@ -470,7 +477,7 @@ func (p *ProtoPackage) importKeys() error {
 	return nil
 }

-func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
+func (p *ProtoPackage) isAvailable(ctx context.Context, h *alpm.Handle) bool {
 	dbs, err := h.SyncDBs()
 	if err != nil {
 		return false
@@ -486,7 +493,7 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
 	case p.DBPackage != nil && len(p.DBPackage.Packages) > 0:
 		pkg, err = dbs.FindSatisfier(p.DBPackage.Packages[0])
 	default:
-		cmd := exec.Command("unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String(), //nolint:gosec
+		cmd := exec.CommandContext(ctx, "unbuffer", "pacsift", "--exact", "--base="+p.Pkgbase, "--repo="+p.Repo.String(), //nolint:gosec
 			"--sysroot="+filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot))
 		var res []byte
 		res, err = cmd.Output()
@@ -494,18 +501,12 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
 			log.Warningf("error getting packages from pacsift for %s: %v", p.Pkgbase, err)
 			return false
 		} else if len(res) == 0 {
+			log.Warningf("error getting packages from pacsift for %s", p.Pkgbase)
 			return false
 		}

-		// workaround for https://github.com/andrewgregory/pacutils/issues/66
-		// TODO: remove once fixed
-		rRes := reReplacePacsiftWarning.ReplaceAllString(string(res), "")
-		if strings.TrimSpace(rRes) == "" {
-			return false
-		}
-
-		if len(strings.Split(strings.TrimSpace(rRes), "\n")) > 0 {
-			pacsiftLines := strings.Split(strings.TrimSpace(rRes), "\n")
+		if len(strings.Split(strings.TrimSpace(string(res)), "\n")) > 0 {
+			pacsiftLines := strings.Split(strings.TrimSpace(string(res)), "\n")

 			var splitPkgs []string
 			for _, line := range pacsiftLines {
@@ -513,7 +514,10 @@ func (p *ProtoPackage) isAvailable(h *alpm.Handle) bool {
 			}

 			if p.DBPackage != nil {
-				p.DBPackage = p.DBPackage.Update().SetPackages(splitPkgs).SaveX(context.Background())
+				p.DBPackage, err = p.DBPackage.Update().SetPackages(splitPkgs).Save(ctx)
+				if err != nil {
+					return false
+				}
 			}
 			pkg, err = dbs.FindSatisfier(splitPkgs[0])
 		} else {
@@ -656,8 +660,8 @@ func (p *ProtoPackage) findPkgFiles() error {
 	if p.DBPackage != nil {
 		realPkgs = append(realPkgs, p.DBPackage.Packages...)
 	} else {
-		for _, realPkg := range p.Srcinfo.Packages {
-			realPkgs = append(realPkgs, realPkg.Pkgname)
+		for i := range p.Srcinfo.Packages {
+			realPkgs = append(realPkgs, p.Srcinfo.Packages[i].Pkgname)
 		}
 	}

@@ -676,7 +680,7 @@ func (p *ProtoPackage) findPkgFiles() error {
 	return nil
 }

-func (p *ProtoPackage) toDBPackage(create bool) error {
+func (p *ProtoPackage) toDBPackage(ctx context.Context, create bool) error {
 	if p.DBPackage != nil {
 		return nil
 	}
@@ -685,13 +689,16 @@ func (p *ProtoPackage) toDBPackage(create bool) error {
 		dbpackage.Pkgbase(p.Pkgbase),
 		dbpackage.March(p.March),
 		dbpackage.RepositoryEQ(p.Repo),
-	).Only(context.Background())
+	).Only(ctx)
 	if err != nil && ent.IsNotFound(err) && create {
-		dbPkg = db.DBPackage.Create().
+		dbPkg, err = db.DBPackage.Create().
 			SetPkgbase(p.Pkgbase).
 			SetMarch(p.March).
 			SetRepository(p.Repo).
-			SaveX(context.Background())
+			Save(ctx)
+		if err != nil {
+			return err
+		}
 	} else if err != nil && !ent.IsNotFound(err) {
 		return err
 	}
--- a/proto_package_test.go
+++ b/proto_package_test.go
@@ -97,7 +97,7 @@ package() {
 `

 func TestIncreasePkgRel(t *testing.T) { //nolint:paralleltest
-	pkgbuild, err := os.CreateTemp("", "")
+	pkgbuild, err := os.CreateTemp(t.TempDir(), "")
 	if err != nil {
 		t.Fatal("unable to setup temp. PKGBUILD")
 	}
@@ -142,7 +142,7 @@ func TestIncreasePkgRel(t *testing.T) { //nolint:paralleltest
 }

 func TestIncreasePkgRelWithPkgSub(t *testing.T) { //nolint:paralleltest
-	pkgbuild, err := os.CreateTemp("", "")
+	pkgbuild, err := os.CreateTemp(t.TempDir(), "")
 	if err != nil {
 		t.Fatal("unable to setup temp. PKGBUILD")
 	}
--- a/utils.go
+++ b/utils.go
@@ -1,6 +1,7 @@
 package main

 import (
+	"context"
 	"errors"
 	"fmt"
 	"github.com/Jguer/go-alpm/v2"
@@ -26,6 +27,7 @@ import (
 const (
 	pacmanConf     = "/usr/share/devtools/pacman.conf.d/multilib.conf"
 	makepkgConf    = "/usr/share/devtools/makepkg.conf.d/x86_64.conf"
+	makepkgConfExt = "/etc/makepkg.conf.d"
 	logDir         = "logs"
 	pristineChroot = "root"
 	buildDir       = "build"
@@ -85,6 +87,9 @@ type Conf struct {
 		Interval string
 	}
 	MaxCloneRetries uint64 `yaml:"max_clone_retries"`
+	Metrics         struct {
+		Port uint32
+	}
 }

 type Globs []string
@@ -140,7 +145,7 @@ func pkgList2MaxMem(pkgList []*ProtoPackage) datasize.ByteSize {
 	var sum uint64
 	for _, pkg := range pkgList {
 		if pkg.DBPackage.MaxRss != nil {
-			sum += uint64(*pkg.DBPackage.MaxRss)
+			sum += uint64(*pkg.DBPackage.MaxRss) //nolint:gosec
 		}
 	}

@@ -166,7 +171,7 @@ func stateFileMeta(stateFile string) (repo string, subRepo *string, arch string,
 	return
 }

-func movePackagesLive(fullRepo string) error {
+func movePackagesLive(ctx context.Context, fullRepo string) error {
 	if _, err := os.Stat(filepath.Join(conf.Basedir.Work, waitingDir, fullRepo)); os.IsNotExist(err) {
 		return nil
 	} else if err != nil {
@@ -186,7 +191,7 @@ func movePackagesLive(fullRepo string) error {

 	for _, file := range pkgFiles {
 		pkg := Package(file)
-		dbPkg, err := pkg.DBPackageIsolated(march, dbpackage.Repository(repo), db)
+		dbPkg, err := pkg.DBPackageIsolated(ctx, march, dbpackage.Repository(repo), db)
 		if err != nil {
 			if strings.HasSuffix(pkg.Name(), "-debug") {
 				mkErr := os.MkdirAll(filepath.Join(conf.Basedir.Debug, march), 0o755)
@@ -264,8 +269,8 @@ func packages2slice(pkgs any) []string {
 	switch v := pkgs.(type) {
 	case []srcinfo.Package:
 		var sPkgs []string
-		for _, p := range v {
-			sPkgs = append(sPkgs, p.Pkgname)
+		for i := range v {
+			sPkgs = append(sPkgs, v[i].Pkgname)
 		}

 		return sPkgs
@@ -328,36 +333,46 @@ func initALPM(root, dbpath string) (*alpm.Handle, error) {
 	return h, nil
 }

-func setupChroot() error {
+func setupChroot(ctx context.Context) error {
 	_, err := os.Stat(filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot))
 	switch {
 	case err == nil:
-		cmd := exec.Command("arch-nspawn", "-C", pacmanConf, filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot), //nolint:gosec
-			"pacman", "-Syuu", "--noconfirm")
+		cmd := exec.CommandContext(ctx, "arch-nspawn", "-C", pacmanConf, //nolint:gosec
+			filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot), "pacman", "-Syuu", "--noconfirm")
 		res, err := cmd.CombinedOutput()
 		log.Debug(string(res))
 		if err != nil {
-			return fmt.Errorf("error updating chroot: %w\n%s", err, string(res))
+			return fmt.Errorf("error updating chroot: %w: %s", err, string(res))
 		}
 	case os.IsNotExist(err):
 		err = os.MkdirAll(filepath.Join(conf.Basedir.Work, chrootDir), 0o755)
 		if err != nil {
 			return err
 		}
-		cmd := exec.Command("mkarchroot", "-C", pacmanConf, "-M", makepkgConf, //nolint:gosec
+		cmd := exec.CommandContext(ctx, "mkarchroot", "-C", pacmanConf, "-M", makepkgConf, //nolint:gosec
 			filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot), "base-devel", "multilib-devel")
 		res, err := cmd.CombinedOutput()
 		log.Debug(string(res))
 		if err != nil {
-			return fmt.Errorf("error creating chroot: %w\n%s", err, string(res))
+			return fmt.Errorf("error creating chroot: %w: %s", err, string(res))
 		}

-		cmd = exec.Command("sudo", "cp", pacmanConf, //nolint:gosec
+		// copy pacman.conf into pristine chroot to enable multilib
+		cmd = exec.CommandContext(ctx, "sudo", "cp", pacmanConf, //nolint:gosec
 			filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot, "etc/pacman.conf"))
 		res, err = cmd.CombinedOutput()
 		log.Debug(string(res))
 		if err != nil {
-			return fmt.Errorf("error copying pacman.conf to chroot: %w\n%s", err, string(res))
+			return fmt.Errorf("error copying pacman.conf to chroot: %w: %s", err, string(res))
+		}
+
+		// remove makepkg conf extension, they are covered by our custom makepkg
+		cmd = exec.CommandContext(ctx, "sudo", "rm_chroot.py", //nolint:gosec
+			filepath.Join(conf.Basedir.Work, chrootDir, pristineChroot, "etc/makepkg.conf.d"))
+		res, err = cmd.CombinedOutput()
+		log.Debug(string(res))
+		if err != nil {
+			return fmt.Errorf("error removing makepkg.conf.d from chroot: %w: %s", err, string(res))
 		}
 	default:
 		return err
@@ -365,7 +380,7 @@ func setupChroot() error {
 	return nil
 }

-func syncMarchs() error {
+func syncMarchs(ctx context.Context) error {
 	files, err := os.ReadDir(conf.Basedir.Repo)
 	if err != nil {
 		return err
@@ -399,7 +414,7 @@ func syncMarchs() error {
 			repos = append(repos, fRepo)
 			buildManager.repoAdd[fRepo] = make(chan []*ProtoPackage, 1000)
 			buildManager.repoPurge[fRepo] = make(chan []*ProtoPackage, 1000)
-			go buildManager.repoWorker(fRepo)
+			go buildManager.repoWorker(ctx, fRepo)

 			if _, err := os.Stat(filepath.Join(conf.Basedir.Repo, fRepo, "os", conf.Arch)); os.IsNotExist(err) {
 				log.Debugf("creating path %s", filepath.Join(conf.Basedir.Repo, fRepo, "os", conf.Arch))
@@ -482,6 +497,8 @@ func parseFlagSection(section any, makepkgConf, march string) (string, error) {
 			}

 			if _, ok := subMap.(string); ok && len(orgMatch) > 0 {
+				log.Debugf("replace %s with %s", orgMatch[0], fmt.Sprintf("\n%s=%s%s%s",
+					strings.ToUpper(subSec.(string)), orgMatch[2], replaceStringsFromMap(subMap.(string), replaceMap), orgMatch[4]))
 				makepkgConf = strings.ReplaceAll(makepkgConf, orgMatch[0], fmt.Sprintf("\n%s=%s%s%s",
 					strings.ToUpper(subSec.(string)), orgMatch[2], replaceStringsFromMap(subMap.(string), replaceMap), orgMatch[4]))
 				continue
@@ -490,12 +507,18 @@ func parseFlagSection(section any, makepkgConf, march string) (string, error) {
 			if len(orgMatch) == 0 {
 				// no match found, assume env var and append it
 				log.Debugf("no match found for %s:%v, appending", subSec, subMap)
-				if strings.Contains(subMap.(string), " ") {
-					makepkgConf += fmt.Sprintf("\nexport %s=%q", strings.ToUpper(subSec.(string)), replaceStringsFromMap(subMap.(string), replaceMap))
+				switch sm := subMap.(type) {
+				case string:
+					if strings.Contains(sm, " ") {
+						makepkgConf += fmt.Sprintf("\nexport %s=%q", strings.ToUpper(subSec.(string)), replaceStringsFromMap(sm, replaceMap))
 						continue
 					}
-				makepkgConf += fmt.Sprintf("\nexport %s=%s", strings.ToUpper(subSec.(string)), replaceStringsFromMap(subMap.(string), replaceMap))
+					makepkgConf += fmt.Sprintf("\nexport %s=%s", strings.ToUpper(subSec.(string)), replaceStringsFromMap(sm, replaceMap))
 					continue
+				case []string:
+					makepkgConf += fmt.Sprintf("\nexport %s=%q", strings.ToUpper(subSec.(string)), replaceStringsFromMap(strings.Join(sm, " "), replaceMap)) //nolint:lll
+					continue
+				}
 			}

 			log.Debugf("original %s: %v (%d)", subSec, flags, len(flags))
@@ -528,7 +551,24 @@ func setupMakepkg(march string, flags map[string]any) error {
 	if err != nil {
 		return err
 	}
-	makepkgStr := string(t)
+	makepkgStrBuilder := new(strings.Builder)
+	makepkgStrBuilder.Write(t)
+
+	// read makepkg conf.d
+	makepkgConfExt, err := Glob(filepath.Join(makepkgConfExt, "*.conf"))
+	if err != nil {
+		return err
+	}
+
+	for _, makepkgExt := range makepkgConfExt {
+		ext, err := os.ReadFile(makepkgExt)
+		if err != nil {
+			return err
+		}
+		makepkgStrBuilder.Write(ext)
+	}
+
+	makepkgStr := makepkgStrBuilder.String()

 	makepkgStr, err = parseFlagSection(flags["common"], makepkgStr, march)
 	if err != nil {
@@ -664,17 +704,18 @@ func (globs Globs) Expand() ([]string, error) {
 	return matches, nil
 }

-func MatchGlobList(target string, globs []string) (bool, error) {
+func MatchGlobList(target string, globs []string) bool {
 	for _, lGlob := range globs {
 		tGlob, err := glob.Compile(lGlob)
 		if err != nil {
-			return false, fmt.Errorf("failed to compile glob %s: %w", lGlob, err)
+			log.Warningf("failed to compile glob %s: %v", lGlob, err)
+			return false
 		}
 		if tGlob.Match(target) {
-			return true, nil
+			return true
 		}
 	}
-	return false, nil
+	return false
 }

 func Copy(srcPath, dstPath string) (err error) {
@@ -701,8 +742,10 @@ func Copy(srcPath, dstPath string) (err error) {
 	return err
 }

-func downloadSRCINFO(pkg string, tag string) (*srcinfo.Srcinfo, error) {
-	resp, err := http.Get(fmt.Sprintf("https://gitlab.archlinux.org/archlinux/packaging/packages/%s/-/raw/%s/.SRCINFO", pkg, tag))
+func downloadSRCINFO(pkg, tag string) (*srcinfo.Srcinfo, error) {
+	resp, err := http.Get(fmt.Sprintf(
+		"https://gitlab.archlinux.org/archlinux/packaging/packages/%s/-/raw/%s/.SRCINFO", pkg, tag),
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -723,3 +766,127 @@ func downloadSRCINFO(pkg string, tag string) (*srcinfo.Srcinfo, error) {
 	}
 	return nSrcInfo, nil
 }
+
+func getDescendantPIDs(rootPID int) ([]int, error) {
+	pidToPpid := map[int]int{}
+	var descendants []int
+
+	procEntries, err := os.ReadDir("/proc")
+	if err != nil {
+		return nil, err
+	}
+
+	for _, entry := range procEntries {
+		if !entry.IsDir() || entry.Name()[0] < '0' || entry.Name()[0] > '9' {
+			continue
+		}
+		pidStr := entry.Name()
+		pid, err := strconv.Atoi(pidStr)
+		if err != nil {
+			continue
+		}
+
+		statusPath := filepath.Join("/proc", pidStr, "status")
+		data, err := os.ReadFile(statusPath)
+		if err != nil {
+			continue
+		}
+
+		for _, line := range strings.Split(string(data), "\n") {
+			if strings.HasPrefix(line, "PPid:") {
+				fields := strings.Fields(line)
+				if len(fields) == 2 {
+					ppid, _ := strconv.Atoi(fields[1])
+					pidToPpid[pid] = ppid
+				}
+			}
+		}
+	}
+
+	var walk func(int)
+	walk = func(current int) {
+		for pid, ppid := range pidToPpid {
+			if ppid == current {
+				descendants = append(descendants, pid)
+				walk(pid)
+			}
+		}
+	}
+	walk(rootPID)
+	return descendants, nil
+}
+
+type MemStats struct {
+	RSS  int64
+	Swap int64
+}
+
+func getMemoryStats(pid int) (MemStats, error) {
+	statusPath := fmt.Sprintf("/proc/%d/status", pid)
+	data, err := os.ReadFile(statusPath)
+	if err != nil {
+		return MemStats{}, err
+	}
+
+	stats := MemStats{}
+	for _, line := range strings.Split(string(data), "\n") {
+		if strings.HasPrefix(line, "VmRSS:") {
+			fields := strings.Fields(line)
+			if len(fields) >= 2 {
+				kb, _ := strconv.ParseInt(fields[1], 10, 64)
+				stats.RSS = kb
+			}
+		}
+		if strings.HasPrefix(line, "VmSwap:") {
+			fields := strings.Fields(line)
+			if len(fields) >= 2 {
+				kb, _ := strconv.ParseInt(fields[1], 10, 64)
+				stats.Swap = kb
+			}
+		}
+	}
+
+	return stats, nil
+}
+
+func pollMemoryUsage(pid int, interval time.Duration, done chan bool, result chan int64) {
+	var totalMemory int64
+
+	for {
+		select {
+		case <-done:
+			result <- totalMemory
+			return
+		default:
+			var totalRSS, totalSwap int64
+
+			rootStats, err := getMemoryStats(pid)
+			if err == nil {
+				totalRSS += rootStats.RSS
+				totalSwap += rootStats.Swap
+			} else {
+				log.Errorf("failed to get memory stats for root process: %v", err)
+			}
+
+			descendants, err := getDescendantPIDs(pid)
+			if err != nil {
+				log.Errorf("failed to get descendants: %v", err)
+			}
+
+			for _, dpid := range descendants {
+				stats, err := getMemoryStats(dpid)
+				if err == nil {
+					totalRSS += stats.RSS
+					totalSwap += stats.Swap
+				}
+			}
+
+			newMemory := totalRSS + totalSwap
+			if newMemory > totalMemory {
+				totalMemory = newMemory
+			}
+
+			time.Sleep(interval)
+		}
+	}
+}
Author	SHA1	Message	Date
Giovanni Harting	9c2fa9bc2d	remove pacsift workaround	2025-05-09 21:46:12 +02:00
Giovanni Harting	01404adad5	fix double convert to bytes	2025-03-22 23:49:07 +01:00
Giovanni Harting	d057e18453	fix channel read	2025-03-22 23:37:52 +01:00
Giovanni Harting	bcfaccfec5	switch result pointer with channel	2025-03-22 23:13:15 +01:00
Giovanni Harting	f4f64e1999	add nil check	2025-03-22 21:58:38 +01:00
Giovanni Harting	48c66d429a	fix memory val not geeting updated	2025-03-22 21:46:51 +01:00
Giovanni Harting	daf6f13542	try a different memory tracking approach	2025-03-22 21:21:58 +01:00
Giovanni Harting	b73f1c8f60	use task childs instead of pgids to track build process	2025-03-16 21:25:17 +01:00
Giovanni Harting	70a09fbc7d	better errors	2025-03-16 21:06:19 +01:00
Giovanni Harting	a933dee30f	better process memory reading error handling	2025-03-16 20:49:26 +01:00
Giovanni Harting	9369f36c29	add more debugging	2025-03-16 20:33:37 +01:00
Giovanni Harting	cc754cf4c7	stop polling after build	2025-03-16 18:18:30 +01:00
Giovanni Harting	185837bd3c	switched to polling process tree rss usage to track mem usage	2025-03-16 18:16:01 +01:00
Giovanni Harting	26d33f20d3	use promauto to add metric	2025-02-24 14:00:36 +01:00
Giovanni Harting	362c5d379c	use correct conf var	2025-02-24 12:10:01 +01:00
Giovanni Harting	8784e63a9d	minor context refactor; add metrics	2025-02-22 03:05:00 +01:00
Giovanni Harting	1c90e20a10	fix check in housekeeping not checking the actual no-build list	2025-01-26 20:14:16 +01:00
Giovanni Harting	2e080c8268	handle makepkg.conf.d files	2025-01-26 14:43:14 +01:00
Giovanni Harting	1b76a0fcf3	use t.TempDir in tests	2025-01-26 13:33:57 +01:00
Giovanni Harting	7ed9dac855	add housekeeping check for packages removed from the no-build list	2025-01-26 13:33:28 +01:00
Giovanni Harting	9aa5ed719e	update deps	2025-01-22 23:11:54 +01:00
Giovanni Harting	3cfebda5e2	update deps	2024-12-15 02:18:53 +01:00
Giovanni Harting	d4dbfdea1c	revert back to yaml v2, fix envs with yaml lists	2024-12-15 02:11:28 +01:00
Giovanni Harting	ab238cf897	update yaml to v3	2024-12-15 01:16:38 +01:00
Giovanni Harting	7c8626dfcb	update deps	2024-12-15 01:05:52 +01:00
Giovanni Harting	9695d146c5	minor code cleanup	2024-12-15 01:03:39 +01:00