[main] Merge upstream prometheus/main to 323972309814

[mimir-github-bot]

Merge Conflicts Detected

This PR was automatically created by the merge-upstream-prometheus workflow due to merge conflicts.

For reviewers: After conflicts are resolved, the author should post a comment with the output of git show --remerge-diff. This shows how merge conflicts were manually resolved compared to what Git would have done automatically, making conflict resolution transparent and allowing validation that conflicts were resolved correctly.

Details

• Upstream branch: main
• Local branch: main
• Latest upstream commit: 3239723098143242b6ab5419e88e2e9ff75ba14e
• Latest upstream commit date: 2025-12-05

Action Required

This closed PR serves as a placeholder that holds the branch and instructions for conflict resolution. Follow these steps to resolve conflicts and reopen this PR:

# 1. Fetch and check out the empty branch created by CI
git fetch origin
git checkout bot/main/merge-upstream-main-202512080237

# 2. Fetch and merge the upstream commit to trigger conflicts
git remote add upstream https://github.com/prometheus/prometheus.git # Omit this step if you already have a remote configured for prometheus/prometheus.
git fetch upstream
git merge 3239723098143242b6ab5419e88e2e9ff75ba14e --no-edit

# 3. If conflicts occur:
#    - Edit conflicted files and resolve conflicts
#    - Look for conflict markers: <<<<<<< HEAD, =======, >>>>>>>
#    - Remove conflict markers after resolving
#    - Run: git add . && git merge --continue

# 4. Push your resolved merge (no force-push needed)
git push

# 5. Re-open the closed PR

# 6. Post the remerge diff as a comment for reviewers:
gh pr comment --body "## Merge Conflict Resolution

You can review how conflicts were resolved using:

\`\`\`bash
git show --remerge-diff
\`\`\`

<details>
<summary>Click to expand remerge diff output</summary>

\`\`\`diff
$(git show --remerge-diff)
\`\`\`

</details>"

---

Note

Upgrades to Prometheus v3.8.0 and adds TSDB delayed-compaction via upload-tracking, unit-test start timestamps, Azure AD custom OAuth scope, PromQL/UI matching and histogram fixes, plus CI/lint/deps and UI package bumps.

• Release/Versioning:
  • Bump to VERSION 3.8.0 and update CHANGELOG.md.
• TSDB/Compaction:
  • New flag --storage.tsdb.delay-compact-file.path to delay compactions for blocks not yet uploaded; wires BlockCompactionExcludeFunc through TSDB and compactor; adds tests and docs.
  • Make DB.Close() idempotent; test helpers refactored.
• Promtool Unit Tests:
  • Support start_timestamp (RFC3339 or unix) in rule tests; propagate through loader; add tests and docs.
• PromQL/Parser & UI:
  • Preserve empty ignoring() when grouping is present; printer/serializer/formatter updated with tests.
  • Fix histogram_fraction interpolation for infinite buckets; expand test coverage.
• Remote Write (Azure AD):
  • Add optional scope to AzureAD config with validation and usage; tests and docs added.
• Infra/Tooling:
  • CI: bump prometheus/promci to v0.5.3.
  • Lint: bump golangci-lint to v2.6.2; enable modernize (omit omitzero).
  • Deps: github.com/prometheus/common → v0.67.4; assorted minor code modernizations.
• UI Packages:
  • Bump web UI modules to 0.308.0; align internal dependencies.

^{Written by Cursor Bugbot for commit 580ba23. This will update automatically on new commits. Configure here.}

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
4 out of 12 committers have signed the CLA.

✅ JorTurFer
✅ roidelapluie
✅ dongjiang1989
✅ zenador
❌ MohammadAlavi1986
❌ jan--f
❌ bwplotka
❌ zjumathcode
❌ prymitive
❌ Tigger2014
❌ juliusv
❌ SuperQ
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[zenador]

Merge Conflict Resolution

You can review how conflicts were resolved using:

git show --remerge-diff

Click to expand remerge diff output

commit a637089a8952afe96adddbbfca2c530acd4fbef7
Merge: e50e74795 323972309
Author: Jeanette Tan <[email protected]>
Date:   Mon Dec 8 19:26:23 2025 +0800

    Merge commit '3239723098143242b6ab5419e88e2e9ff75ba14e' into bot/main/merge-upstream-main-202512080237

diff --git a/tsdb/compact.go b/tsdb/compact.go
remerge CONFLICT (content): Merge conflict in tsdb/compact.go
index 3eccc9cc2..8d30f9d1f 100644
--- a/tsdb/compact.go
+++ b/tsdb/compact.go
@@ -246,11 +246,8 @@ func NewLeveledCompactorWithOptions(ctx context.Context, r prometheus.Registerer
 		postingsEncoder:             pe,
 		postingsDecoderFactory:      opts.PD,
 		enableOverlappingCompaction: opts.EnableOverlappingCompaction,
-<<<<<<< e50e74795 (Merge pull request #1044 from grafana/bot/main/merge-upstream-main-202512010249)
 		concurrencyOpts:             DefaultLeveledCompactorConcurrencyOptions(),
-=======
 		blockExcludeFunc:            opts.BlockExcludeFilter,
->>>>>>> 323972309 (Update golangci-lint and add modernize check (#17640))
 	}, nil
 }
 
diff --git a/tsdb/db.go b/tsdb/db.go
remerge CONFLICT (content): Merge conflict in tsdb/db.go
index e69387908..7292943f3 100644
--- a/tsdb/db.go
+++ b/tsdb/db.go
@@ -318,7 +318,6 @@ type Options struct {
 	// UseUncachedIO allows bypassing the page cache when appropriate.
 	UseUncachedIO bool
 
-<<<<<<< e50e74795 (Merge pull request #1044 from grafana/bot/main/merge-upstream-main-202512010249)
 	// IndexLookupPlannerFunc is a function to return index.LookupPlanner from a BlockReader.
 	// Similar to BlockChunkQuerierFunc, this allows per-block planner creation.
 	// For on-disk blocks, IndexLookupPlannerFunc is invoked once when they are opened.
@@ -326,11 +325,10 @@ type Options struct {
 	IndexLookupPlannerFunc IndexLookupPlannerFunc
 
 	PostingsClonerFactory PostingsClonerFactory
-=======
+
 	// BlockCompactionExcludeFunc is a function which returns true for blocks that should NOT be compacted.
 	// It's passed down to the TSDB compactor.
 	BlockCompactionExcludeFunc BlockExcludeFilterFunc
->>>>>>> 323972309 (Update golangci-lint and add modernize check (#17640))
 }
 
 type NewCompactorFunc func(ctx context.Context, r prometheus.Registerer, l *slog.Logger, ranges []int64, pool chunkenc.Pool, opts *Options) (Compactor, error)
diff --git a/tsdb/db_test.go b/tsdb/db_test.go
remerge CONFLICT (content): Merge conflict in tsdb/db_test.go
index 7b40affd7..68a0229a8 100644
--- a/tsdb/db_test.go
+++ b/tsdb/db_test.go
@@ -136,7 +136,6 @@ func newTestDB(t testing.TB, opts ...testDBOpt) (db *DB) {
 	return db
 }
 
-<<<<<<< e50e74795 (Merge pull request #1044 from grafana/bot/main/merge-upstream-main-202512010249)
 // queryHead is a helper to query the head for a given time range and labelset.
 func queryHead(t testing.TB, head *Head, mint, maxt int64, label labels.Label) (map[string][]chunks.Sample, error) {
 	q, err := NewBlockQuerier(head, mint, maxt)
@@ -144,7 +143,8 @@ func queryHead(t testing.TB, head *Head, mint, maxt int64, label labels.Label) (
 		return nil, err
 	}
 	return query(t, q, labels.MustNewMatcher(labels.MatchEqual, label.Name, label.Value)), nil
-=======
+}
+
 func TestDBClose_AfterClose(t *testing.T) {
 	db := newTestDB(t)
 	require.NoError(t, db.Close())
@@ -154,7 +154,6 @@ func TestDBClose_AfterClose(t *testing.T) {
 	db = newTestDB(t)
 	require.NoError(t, db.Close())
 	require.NoError(t, db.Close())
->>>>>>> 323972309 (Update golangci-lint and add modernize check (#17640))
 }
 
 // query runs a matcher query against the querier and fully expands its data.
@@ -3131,28 +3130,16 @@ func TestCompactHead(t *testing.T) {
 	t.Parallel()
 
 	// Open a DB and append data to the WAL.
-<<<<<<< e50e74795 (Merge pull request #1044 from grafana/bot/main/merge-upstream-main-202512010249)
-	tsdbCfg := DefaultOptions()
-	tsdbCfg.RetentionDuration = int64(time.Hour * 24 * 15 / time.Millisecond)
-	tsdbCfg.NoLockfile = true
-	tsdbCfg.MinBlockDuration = int64(time.Hour * 2 / time.Millisecond)
-	tsdbCfg.MaxBlockDuration = int64(time.Hour * 2 / time.Millisecond)
-	tsdbCfg.WALCompression = compression.Snappy
-	tsdbCfg.HeadPostingsForMatchersCacheMetrics = NewPostingsForMatchersCacheMetrics(nil)
-	tsdbCfg.BlockPostingsForMatchersCacheMetrics = NewPostingsForMatchersCacheMetrics(nil)
-
-	db, err := Open(dbDir, promslog.NewNopLogger(), prometheus.NewRegistry(), tsdbCfg, nil)
-	require.NoError(t, err)
-=======
-	opts := &Options{
-		RetentionDuration: int64(time.Hour * 24 * 15 / time.Millisecond),
-		NoLockfile:        true,
-		MinBlockDuration:  int64(time.Hour * 2 / time.Millisecond),
-		MaxBlockDuration:  int64(time.Hour * 2 / time.Millisecond),
-		WALCompression:    compression.Snappy,
-	}
+	opts := DefaultOptions()
+	opts.RetentionDuration = int64(time.Hour * 24 * 15 / time.Millisecond)
+	opts.NoLockfile = true
+	opts.MinBlockDuration = int64(time.Hour * 2 / time.Millisecond)
+	opts.MaxBlockDuration = int64(time.Hour * 2 / time.Millisecond)
+	opts.WALCompression = compression.Snappy
+	opts.HeadPostingsForMatchersCacheMetrics = NewPostingsForMatchersCacheMetrics(nil)
+	opts.BlockPostingsForMatchersCacheMetrics = NewPostingsForMatchersCacheMetrics(nil)
+
 	db := newTestDB(t, withOpts(opts))
->>>>>>> 323972309 (Update golangci-lint and add modernize check (#17640))
 	ctx := context.Background()
 	app := db.Appender(ctx)
 	var expSamples []sample
@@ -9097,10 +9084,7 @@ func TestNewCompactorFunc(t *testing.T) {
 
 func TestCompactHeadWithoutTruncation(t *testing.T) {
 	setupDB := func() *DB {
-		db := openTestDB(t, nil, nil)
-		t.Cleanup(func() {
-			require.NoError(t, db.Close())
-		})
+		db := newTestDB(t)
 		db.DisableCompactions()
 
 		// Add samples to the head.
@@ -9390,11 +9374,8 @@ func TestBiggerBlocksForOldOOOData(t *testing.T) {
 	opts := DefaultOptions()
 	opts.OutOfOrderTimeWindow = 10 * day
 	opts.EnableBiggerOOOBlockForOldSamples = true
-	db := openTestDB(t, opts, nil)
+	db := newTestDB(t, withOpts(opts))
 	db.DisableCompactions()
-	t.Cleanup(func() {
-		require.NoError(t, db.Close())
-	})
 
 	// 1 in-order sample.
 	app := db.Appender(ctx)
@@ -9420,10 +9401,7 @@ func TestBiggerBlocksForOldOOOData(t *testing.T) {
 	// Check that blocks are alright.
 	// Move all the blocks to a new DB and check for all OOO samples
 	// getting into the new DB and the old DB only has the in-order sample.
-	newDB := openTestDB(t, opts, nil)
-	t.Cleanup(func() {
-		require.NoError(t, newDB.Close())
-	})
+	newDB := newTestDB(t, withOpts(opts))
 	for _, b := range db.Blocks() {
 		err := os.Rename(b.Dir(), path.Join(newDB.Dir(), b.Meta().ULID.String()))
 		require.NoError(t, err)

[cursor]

Bug: Block exclude filter uses break instead of continue

The blockExcludeFunc check in the Plan function uses break instead of continue when a block is excluded. This causes the entire loop to exit when the first excluded block is encountered, skipping all subsequent blocks even if they should be included in compaction. The intent is to exclude individual blocks from compaction planning, not to stop processing all remaining blocks.

 

[dimitarvdimitrov]

this is actually very valid

[dimitarvdimitrov]

left a question on the original PR https://github.com/prometheus/prometheus/pull/17435/files#r2598635854

[cursor]

Bug: Global cache variables accessed without synchronization

The tsdbDelayCompactLastMeta and tsdbDelayCompactLastMetaTime global variables are read and written without any synchronization in exludeBlocksPendingUpload. The returned closure can be called concurrently from the compactor, causing data races when reading/writing these shared variables. This could lead to inconsistent cache state or memory corruption.

 

looking into this comment https://github.com/grafana/mimir-prometheus/pull/1046/files/580ba239319d82ff7da77cd308e442d33946fdbc#r2598605607

[dimitarvdimitrov]

that questionable functionality shouldn't actually break us because we're not using BlockCompactionExcludeFunc. If you're blocked on this feel free to merge, otherwise i'd be more comfortable to wait for a response from the author upstream

[zenador]

Thanks! I'm not blocked, but the original author has replied, are you satisfied with their answer?

[dimitarvdimitrov]

yeah i guess i am