[main] Merge upstream prometheus/main to 49254f45e9ec

[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: 49254f45e9ecf61cd0836270e67fe94983ce1077
• Latest upstream commit date: 2025-11-07

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-202511100236

# 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 49254f45e9ecf61cd0836270e67fe94983ce1077 --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

Adds per-target end-of-run staleness-marker disabling, optional metadata WAL writes for remote/OTLP, upgrades UI to Mantine v8 with a custom Accordion and perf tweaks, and documents unified AWS service discovery (incl. ECS) and Agent mode.

• Scrape/Runtime:
  • Add Manager.DisableEndOfRunStalenessMarkers() and wire through scrapeLoop (atomic flag) to suppress end-of-run staleness for selected targets.
• Remote Write/OTLP:
  • NewWriteHandler(..., appendMetadata) and conditional WAL metadata updates; API/web plumb new AppendMetadata option.
• Discovery & Docs:
  • Document unified aws_sd_configs with roles (ec2, lightsail, ecs) and STS FIPS toggle; new Prometheus Agent doc.
• UI:
  • Upgrade to Mantine v8/React 19.2; switch code highlight to highlight.js adapter.
  • Replace Mantine Accordion with local fork (unmounts collapsed content); perf/UX tweaks (infinite scroll for Alerts/Rules, DateTimePicker handling).
• SDK/Client:
  • Prometheus HTTP client now queries label names/values via /labels//label/:name/values with optional lookback/matchers.
• Tests/Infra:
  • Modernize tests/benchmarks (b.Loop(), t.Context()), numerous small return cleanups; dependency bumps across Go/TS toolchain.

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

[mimir-vendoring]

I'm approving this upstream merge PR.
This PR merges changes from prometheus/prometheus upstream repository.
Related GitHub action is defined 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 13 committers have signed the CLA.

✅ bboreham
✅ krajorama
✅ thampiotr
✅ lamida
❌ mercenarysre
❌ machine424
❌ SuperQ
❌ pipiland2612
❌ Devansh-ops
❌ matt-gp
❌ jan--f
❌ Nexucis
❌ juliusv
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

[lamida]

Merge Conflict Resolution

You can review how conflicts were resolved using:

git show --remerge-diff

Click to expand remerge diff output

commit b1322d4abc7df50a24dd7f474c7225696e6d8b61
Merge: 2ed549ed9 49254f45e
Author: Jon Kartago Lamida <[email protected]>
Date:   Mon Nov 10 11:34:25 2025 +0800

    Merge commit '49254f45e9ecf61cd0836270e67fe94983ce1077' into bot/main/merge-upstream-main-202511100236

diff --git a/.github/workflows/prombench.yml b/.github/workflows/prombench.yml
remerge CONFLICT (modify/delete): .github/workflows/prombench.yml deleted in 2ed549ed9 (Change LookupPlanner interface to use SelectHints (#1031)) and modified in 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate).  Version 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate) of .github/workflows/prombench.yml left in tree.
index 5eb9becc0..e69de29bb 100644
--- a/.github/workflows/prombench.yml
+++ b/.github/workflows/prombench.yml
@@ -1,130 +0,0 @@
-on:
-  repository_dispatch:
-    types: [prombench_start, prombench_restart, prombench_stop]
-name: Prombench Workflow
-permissions:
-  contents: read
-env:
-  AUTH_FILE: ${{ secrets.TEST_INFRA_PROVIDER_AUTH }}
-  CLUSTER_NAME: test-infra
-  DOMAIN_NAME: prombench.prometheus.io
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  GITHUB_ORG: prometheus
-  GITHUB_REPO: prometheus
-  GITHUB_STATUS_TARGET_URL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
-  LAST_COMMIT_SHA: ${{ github.event.client_payload.LAST_COMMIT_SHA }}
-  GKE_PROJECT_ID: macro-mile-203600
-  PR_NUMBER: ${{ github.event.client_payload.PR_NUMBER }}
-  PROVIDER: gke
-  RELEASE: ${{ github.event.client_payload.RELEASE }}
-  BENCHMARK_VERSION: ${{ github.event.client_payload.BENCHMARK_VERSION }}
-  BENCHMARK_DIRECTORY: ${{ github.event.client_payload.BENCHMARK_DIRECTORY }}
-  ZONE: europe-west3-a
-jobs:
-  benchmark_start:
-    name: Benchmark Start
-    if: github.event.action == 'prombench_start'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Update status to pending
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"pending",  "context": "prombench-status-update-start", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
-      - name: Run make deploy to start test
-        id: make_deploy
-        uses: docker://prominfra/prombench:master
-        with:
-          args: >-
-            make deploy;
-            until make all_nodes_running; do echo "waiting for nodepools to be created"; sleep 10; done;
-      - name: Update status to failure
-        if: failure()
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"failure",  "context": "prombench-status-update-start", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
-      - name: Update status to success
-        if: success()
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"success",  "context": "prombench-status-update-start", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
-  benchmark_cancel:
-    name: Benchmark Cancel
-    if: github.event.action == 'prombench_stop'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Update status to pending
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"pending",  "context": "prombench-status-update-cancel", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
-      - name: Run make clean to stop test
-        id: make_clean
-        uses: docker://prominfra/prombench:master
-        with:
-          args: >-
-            make clean;
-            until make all_nodes_deleted; do echo "waiting for nodepools to be deleted"; sleep 10; done;
-      - name: Update status to failure
-        if: failure()
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"failure",  "context": "prombench-status-update-cancel", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
-      - name: Update status to success
-        if: success()
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"success",  "context": "prombench-status-update-cancel", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
-  benchmark_restart:
-    name: Benchmark Restart
-    if: github.event.action == 'prombench_restart'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Update status to pending
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"pending",  "context": "prombench-status-update-restart", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
-      - name: Run make clean then make deploy to restart test
-        id: make_restart
-        uses: docker://prominfra/prombench:master
-        with:
-          args: >-
-            make clean;
-            until make all_nodes_deleted; do echo "waiting for nodepools to be deleted"; sleep 10; done;
-            make deploy;
-            until make all_nodes_running; do echo "waiting for nodepools to be created"; sleep 10; done;
-      - name: Update status to failure
-        if: failure()
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"failure",  "context": "prombench-status-update-restart", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
-      - name: Update status to success
-        if: success()
-        run: >-
-          curl -i -X POST
-          -H "Authorization: Bearer $GITHUB_TOKEN"
-          -H "Content-Type: application/json"
-          --data '{"state":"success",  "context": "prombench-status-update-restart", "target_url": "'$GITHUB_STATUS_TARGET_URL'"}'
-          "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/$LAST_COMMIT_SHA"
diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml
remerge CONFLICT (modify/delete): .github/workflows/scorecards.yml deleted in 2ed549ed9 (Change LookupPlanner interface to use SelectHints (#1031)) and modified in 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate).  Version 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate) of .github/workflows/scorecards.yml left in tree.
index 658e140f2..e69de29bb 100644
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -1,50 +0,0 @@
-# Copyright 2022 Google LLC
-
-name: Scorecards supply-chain security
-on:
-  pull_request:
-  push:
-    branches: [ "main" ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecards analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Used to receive a badge.
-      id-token: write
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # tag=v2.4.3
-        with:
-          results_file: results.sarif
-          results_format: sarif
-          # Publish the results for public repositories to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results.
-          publish_results: ${{ github.event_name != 'pull_request' }}
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag=v5.0.0
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # tag=v4.31.2
-        with:
-          sarif_file: results.sarif
diff --git a/go.mod b/go.mod
remerge CONFLICT (content): Merge conflict in go.mod
index f0a7d6afe..037eb525a 100644
--- a/go.mod
+++ b/go.mod
@@ -200,15 +200,9 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
-<<<<<<< 2ed549ed9 (Change LookupPlanner interface to use SelectHints (#1031))
 	github.com/oklog/ulid v1.3.1
-	github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.136.0 // indirect
-	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.136.0 // indirect
-=======
-	github.com/oklog/ulid v1.3.1 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/metrics v0.139.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.139.0 // indirect
->>>>>>> 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate)
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
diff --git a/go.sum b/go.sum
remerge CONFLICT (content): Merge conflict in go.sum
index 1fbb75254..3be63fa02 100644
--- a/go.sum
+++ b/go.sum
@@ -118,17 +118,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE=
 github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA=
-<<<<<<< 2ed549ed9 (Change LookupPlanner interface to use SelectHints (#1031))
 github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8=
 github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/digitalocean/godo v1.165.1 h1:H37+W7TaGFOVH+HpMW4ZeW/hrq3AGNxg+B/K8/dZ9mQ=
-github.com/digitalocean/godo v1.165.1/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU=
-=======
 github.com/digitalocean/godo v1.168.0 h1:mlORtUcPD91LQeJoznrH3XvfvgK3t8Wvrpph9giUT/Q=
 github.com/digitalocean/godo v1.168.0/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU=
->>>>>>> 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate)
 github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
 github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI=
diff --git a/promql/parser/parse.go b/promql/parser/parse.go
remerge CONFLICT (content): Merge conflict in promql/parser/parse.go
index 5d0084c06..c19d51594 100644
--- a/promql/parser/parse.go
+++ b/promql/parser/parse.go
@@ -459,15 +459,10 @@ func (p *parser) newAggregateExpr(op Item, modifier, args Node, overread bool) (
 	desiredArgs := 1
 	if ret.Op.IsAggregatorWithParam() {
 		if !EnableExperimentalFunctions && ret.Op.IsExperimentalAggregator() {
-<<<<<<< 2ed549ed9 (Change LookupPlanner interface to use SelectHints (#1031))
 			// In mimir we return a custom message which doesn't mention the CLI flag that should be used to enable
 			// experimental functions, given it's different (and in SaaS customers don't even have access to it).
 			p.addParseErrf(ret.PositionRange(), "limitk() and limit_ratio() functions are not enabled")
 			return
-=======
-			p.addParseErrf(ret.PositionRange(), "%s() is experimental and must be enabled with --enable-feature=promql-experimental-functions", ret.Op)
-			return ret
->>>>>>> 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate)
 		}
 		desiredArgs = 2
 
diff --git a/tsdb/head.go b/tsdb/head.go
remerge CONFLICT (content): Merge conflict in tsdb/head.go
index e7a635d9c..a9fdb607e 100644
--- a/tsdb/head.go
+++ b/tsdb/head.go
@@ -1790,24 +1790,10 @@ func (h *Head) getOrCreate(hash uint64, lset labels.Labels, pendingCommit bool)
 	return h.getOrCreateWithOptionalID(0, hash, lset, pendingCommit)
 }
 
-<<<<<<< 2ed549ed9 (Change LookupPlanner interface to use SelectHints (#1031))
-func (h *Head) getOrCreateWithID(id chunks.HeadSeriesRef, hash uint64, lset labels.Labels, pendingCommit bool) (*memSeries, bool, error) {
-	s, created, err := h.series.getOrSet(hash, lset, func() *memSeries {
-		shardHash := uint64(0)
-		if h.opts.EnableSharding {
-			shardHash = labels.StableHash(lset)
-		}
-
-		return newMemSeries(lset, id, shardHash, h.secondaryHashFunc(lset), h.opts.ChunkEndTimeVariance, h.opts.IsolationDisabled, pendingCommit)
-	})
-	if err != nil {
-		return nil, false, err
-=======
 // If id is zero, one will be allocated.
 func (h *Head) getOrCreateWithOptionalID(id chunks.HeadSeriesRef, hash uint64, lset labels.Labels, pendingCommit bool) (*memSeries, bool, error) {
 	if preCreationErr := h.series.seriesLifecycleCallback.PreCreation(lset); preCreationErr != nil {
 		return nil, false, preCreationErr
->>>>>>> 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate)
 	}
 	if id == 0 {
 		// Note this id is wasted in the case where a concurrent operation creates the same series first.
@@ -1818,7 +1804,7 @@ func (h *Head) getOrCreateWithOptionalID(id chunks.HeadSeriesRef, hash uint64, l
 	if h.opts.EnableSharding {
 		shardHash = labels.StableHash(lset)
 	}
-	optimisticallyCreatedSeries := newMemSeries(lset, id, shardHash, h.opts.IsolationDisabled, pendingCommit)
+	optimisticallyCreatedSeries := newMemSeries(lset, id, shardHash, h.secondaryHashFunc(lset), h.opts.ChunkEndTimeVariance, h.opts.IsolationDisabled, pendingCommit)
 
 	s, created := h.series.setUnlessAlreadySet(hash, lset, optimisticallyCreatedSeries)
 	if !created {
diff --git a/tsdb/index/index_test.go b/tsdb/index/index_test.go
remerge CONFLICT (content): Merge conflict in tsdb/index/index_test.go
index 51eb11c75..79de0869f 100644
--- a/tsdb/index/index_test.go
+++ b/tsdb/index/index_test.go
@@ -517,22 +517,14 @@ func BenchmarkReader_ShardedPostings(b *testing.B) {
 			labels: labels.FromStrings("const", fmt.Sprintf("%10d", 1), "unique", fmt.Sprintf("%10d", i)),
 		})
 	}
-<<<<<<< 2ed549ed9 (Change LookupPlanner interface to use SelectHints (#1031))
 	for _, cacheEnabled := range []bool{true, false} {
 		b.Run(fmt.Sprintf("cached enabled: %v", cacheEnabled), func(b *testing.B) {
 			ir, _, _ := createFileReaderWithOptions(ctx, b, input, cacheEnabled)
 			b.ResetTimer()
 
-			for n := 0; n < b.N; n++ {
+			for n := 0; b.Loop(); n++ {
 				allPostings, err := ir.Postings(ctx, "const", fmt.Sprintf("%10d", 1))
 				require.NoError(b, err)
-=======
-	ir, _, _ := createFileReader(ctx, b, input)
-
-	for n := 0; b.Loop(); n++ {
-		allPostings, err := ir.Postings(ctx, "const", fmt.Sprintf("%10d", 1))
-		require.NoError(b, err)
->>>>>>> 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate)
 
 				ir.ShardedPostings(allPostings, uint64(n%numShards), numShards)
 			}
diff --git a/tsdb/querier_bench_test.go b/tsdb/querier_bench_test.go
remerge CONFLICT (content): Merge conflict in tsdb/querier_bench_test.go
index f3ccdcce5..e04c88dee 100644
--- a/tsdb/querier_bench_test.go
+++ b/tsdb/querier_bench_test.go
@@ -309,7 +309,6 @@ func benchmarkSelect(b *testing.B, queryable storage.Queryable, numSeries int, s
 			require.NoError(b, err)
 
 			b.ResetTimer()
-<<<<<<< 2ed549ed9 (Change LookupPlanner interface to use SelectHints (#1031))
 			for i := 0; i < b.N; i++ {
 				var hints *storage.SelectHints
 				if sharding {
@@ -321,10 +320,6 @@ func benchmarkSelect(b *testing.B, queryable storage.Queryable, numSeries int, s
 					}
 				}
 				ss := q.Select(context.Background(), sorted, hints, matcher)
-=======
-			for b.Loop() {
-				ss := q.Select(context.Background(), sorted, nil, matcher)
->>>>>>> 49254f45e (Merge pull request #17351 from bboreham/simplify-precreate)
 				for ss.Next() {
 				}
 				require.NoError(b, ss.Err())