Merge branch 'drop-old-inmemory-samples' into v0.48.1-drop-old-samples

.github/CODEOWNERS

@@ -6,3 +6,5 @@
 /tsdb @jesusvazquez
 /promql @roidelapluie
 /cmd/promtool @dgl
+/documentation/prometheus-mixin @metalmatze
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,8 @@
 <!--
+ Please give your PR a title in the form "area: short description". For example "tsdb: reduce disk usage by 95%"
+
+ If your PR is to fix an issue, put "Fixes #issue-number" in the description.
+
  Don't forget!
 
  - Please sign CNCF's Developer Certificate of Origin and sign-off your commits by adding the -s / --signoff flag to `git commit`. See https://github.com/apps/dco for more information.
@@ -7,8 +11,6 @@
 
  - Where possible use only exported APIs for tests to simplify the review and make it as close as possible to an actual library usage.
 
- - No tests are needed for internal implementation changes.
-
  - Performance improvements would need a benchmark test to prove it.
 
  - All exposed objects should have a comment.

.github/workflows/buf-lint.yml

@@ -12,8 +12,8 @@ jobs:
  name: lint
  runs-on: ubuntu-latest
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
- - uses: bufbuild/buf-setup-action@eb60cd0de4f14f1f57cf346916b8cd69a9e7ed0b # v1.26.1
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ - uses: bufbuild/buf-setup-action@382440cdb8ec7bc25a68d7b4711163d95f7cc3aa # v1.28.1
  with:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  - uses: bufbuild/buf-lint-action@bd48f53224baaaf0fc55de9a913e7680ca6dbea4 # v1.0.3

.github/workflows/buf.yml

@@ -12,8 +12,8 @@ jobs:
  runs-on: ubuntu-latest
  if: github.repository_owner == 'prometheus'
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
- - uses: bufbuild/buf-setup-action@eb60cd0de4f14f1f57cf346916b8cd69a9e7ed0b # v1.26.1
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ - uses: bufbuild/buf-setup-action@382440cdb8ec7bc25a68d7b4711163d95f7cc3aa # v1.28.1
  with:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  - uses: bufbuild/buf-lint-action@bd48f53224baaaf0fc55de9a913e7680ca6dbea4 # v1.0.3

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
  container:
  image: quay.io/prometheus/golang-builder:1.21-base
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
  - uses: ./.github/promci/actions/setup_environment
  - run: make GO_ONLY=1 SKIP_GOLANGCI_LINT=1
@@ -35,7 +35,7 @@ jobs:
  image: quay.io/prometheus/golang-builder:1.21-base
 
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
  - uses: ./.github/promci/actions/setup_environment
  with:
@@ -52,10 +52,10 @@ jobs:
  name: Go tests on Windows
  runs-on: windows-latest
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: '>=1.21 <1.22'
+ go-version: 1.21.x
  - run: |
  $TestTargets = go list ./... | Where-Object { $_ -NotMatch "(github.com/prometheus/prometheus/discovery.*|github.com/prometheus/prometheus/config|github.com/prometheus/prometheus/web)"}
  go test $TestTargets -vet=off -v
@@ -68,7 +68,7 @@ jobs:
  container:
  image: quay.io/prometheus/golang-builder:1.20-base
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - run: make build
  - run: go test ./tsdb/...
  - run: go test ./tsdb/ -test.tsdb-isolation=false
@@ -81,7 +81,7 @@ jobs:
  container:
  image: quay.io/prometheus/golang-builder:1.20-base
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - run: go install ./cmd/promtool/.
  - run: go install github.com/google/go-jsonnet/cmd/jsonnet@latest
  - run: go install github.com/google/go-jsonnet/cmd/jsonnetfmt@latest
@@ -104,7 +104,7 @@ jobs:
  matrix:
  thread: [ 0, 1, 2 ]
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
  - uses: ./.github/promci/actions/build
  with:
@@ -127,7 +127,7 @@ jobs:
  # Whenever the Go version is updated here, .promu.yml
  # should also be updated.
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
  - uses: ./.github/promci/actions/build
  with:
@@ -138,20 +138,21 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Checkout repository
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - name: Install Go
  uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
  cache: false
- go-version: 1.20.x
+ go-version: 1.21.x
  - name: Install snmp_exporter/generator dependencies
  run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
  if: github.repository == 'prometheus/snmp_exporter'
  - name: Lint
  uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0
  with:
  args: --verbose
- version: v1.54.2
+ # Make sure to sync this with Makefile.common and scripts/golangci-lint.yml.
+ version: v1.55.2
  fuzzing:
  uses: ./.github/workflows/fuzzing.yml
  if: github.event_name == 'pull_request'
@@ -164,7 +165,7 @@ jobs:
  needs: [test_ui, test_go, test_windows, golangci, codeql, build_all]
  if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
  - uses: ./.github/promci/actions/publish_main
  with:
@@ -178,7 +179,7 @@ jobs:
  needs: [test_ui, test_go, test_windows, golangci, codeql, build_all]
  if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v2.')
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
  - uses: ./.github/promci/actions/publish_release
  with:
@@ -193,7 +194,7 @@ jobs:
  needs: [test_ui, codeql]
  steps:
  - name: Checkout
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: prometheus/promci@3cb0c3871f223bd5ce1226995bd52ffb314798b6 # v0.1.0
  - name: Install nodejs
  uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1

.github/workflows/codeql-analysis.yml

@@ -24,18 +24,18 @@ jobs:
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
  with:
- go-version: '>=1.21 <1.22'
+ go-version: 1.21.x
 
  - name: Initialize CodeQL
- uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
+ uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
  with:
  languages: ${{ matrix.language }}
 
  - name: Autobuild
- uses: github/codeql-action/autobuild@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
+ uses: github/codeql-action/autobuild@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
+ uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8

.github/workflows/lock.yml

@@ -16,7 +16,7 @@ jobs:
  runs-on: ubuntu-latest
  if: github.repository_owner == 'prometheus'
  steps:
- - uses: dessant/lock-threads@be8aa5be94131386884a6da4189effda9b14aa21 # v4.0.1
+ - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
  with:
  process-only: 'issues'
  issue-inactive-days: '180'

.github/workflows/repo_sync.yml

@@ -13,7 +13,7 @@ jobs:
  container:
  image: quay.io/prometheus/golang-builder
  steps:
- - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+ - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
  - run: ./scripts/sync_repo_files.sh
  env:
  GITHUB_TOKEN: ${{ secrets.PROMBOT_GITHUB_TOKEN }}

.github/workflows/scorecards.yml

@@ -21,12 +21,12 @@ jobs:
 
  steps:
  - name: "Checkout code"
- uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
  with:
  persist-credentials: false
 
  - name: "Run analysis"
- uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # tag=v2.2.0
+ uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # tag=v2.3.1
  with:
  results_file: results.sarif
  results_format: sarif
@@ -45,6 +45,6 @@ jobs:
 
  # Upload the results to GitHub's code scanning dashboard.
  - name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # tag=v1.0.26
+ uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # tag=v2.22.8
  with:
  sarif_file: results.sarif

.golangci.yml

@@ -6,6 +6,7 @@ run:
  skip-dirs:
  # Copied it from a different source
  - storage/remote/otlptranslator/prometheusremotewrite
+ - storage/remote/otlptranslator/prometheus
 
 output:
  sort-results: true
@@ -15,11 +16,14 @@ linters:
  - depguard
  - errorlint
  - gocritic
+ - godot
  - gofumpt
  - goimports
  - misspell
+ - nolintlint
  - predeclared
  - revive
+ - testifylint
  - unconvert
  - unused
 
@@ -32,24 +36,12 @@ issues:
  - path: _test.go
  linters:
  - errcheck
- - path: discovery/
- linters:
- - errorlint
- - path: scrape/
- linters:
- - errorlint
- - path: storage/
- linters:
- - errorlint
- - path: tsdb/
- linters:
- - errorlint
- - path: util/
- linters:
- - errorlint
- - path: web/
+ - path: "tsdb/head_wal.go"
  linters:
  - errorlint
+ - linters:
+ - godot
+ source: "^// ==="
 
 linters-settings:
  depguard:
@@ -66,6 +58,8 @@ linters-settings:
  desc: "Use corresponding 'os' or 'io' functions instead."
  - pkg: "regexp"
  desc: "Use github.com/grafana/regexp instead of regexp"
+ - pkg: "github.com/pkg/errors"
+ desc: "Use 'errors' or 'fmt' instead of github.com/pkg/errors"
  errcheck:
  exclude-functions:
  # Don't flag lines such as "io.Copy(io.Discard, resp.Body)".
@@ -84,8 +78,55 @@ linters-settings:
  gofumpt:
  extra-rules: true
  revive:
+ # By default, revive will enable only the linting rules that are named in the configuration file.
+ # So, it's needed to explicitly set in configuration all required rules.
+ # The following configuration enables all the rules from the defaults.toml
+ # https://github.com/mgechev/revive/blob/master/defaults.toml
  rules:
- # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-parameter
+ # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
+ - name: blank-imports
+ - name: context-as-argument
+ arguments:
+ # allow functions with test or bench signatures
+ - allowTypesBefore: "*testing.T,testing.TB"
+ - name: context-keys-type
+ - name: dot-imports
+ # A lot of false positives: incorrectly identifies channel draining as "empty code block".
+ # See https://github.com/mgechev/revive/issues/386
+ - name: empty-block
+ disabled: true
+ - name: error-naming
+ - name: error-return
+ - name: error-strings
+ - name: errorf
+ - name: exported
+ - name: increment-decrement
+ - name: indent-error-flow
+ - name: package-comments
+ - name: range
+ - name: receiver-naming
+ - name: redefines-builtin-id
+ - name: superfluous-else
+ - name: time-naming
+ - name: unexported-return
+ - name: unreachable-code
  - name: unused-parameter
- severity: warning
  disabled: true
+ - name: var-declaration
+ - name: var-naming
+ testifylint:
+ disable:
+ - float-compare
+ - go-require
+ enable:
+ - bool-compare
+ - compares
+ - empty
+ - error-is-as
+ - error-nil
+ - expected-actual
+ - len
+ - require-error
+ - suite-dont-use-pkg
+ - suite-extra-assert-call
+

.promu.yml

@@ -18,7 +18,6 @@ build:
  windows:
  - builtinassets
  - stringlabels
- flags: -a
  ldflags: |
  -X github.com/prometheus/common/version.Version={{.Version}}
  -X github.com/prometheus/common/version.Revision={{.Revision}}

CHANGELOG.md

@@ -1,9 +1,9 @@
 # Changelog
 
-## 2.48.1 / 2023-12-08
+## unreleased
 
-* [BUGFIX] TSDB: Make the wlog watcher read segments synchronously when not tailing. #13224
-* [BUGFIX] Agent: Participate in notify calls (fixes slow down in remote write handling introduced in 2.45). #13223
+* [ENHANCEMENT] TSDB: Make the wlog watcher read segments synchronously when not tailing. #13224
+* [BUGFIX] Agent: Participate in notify calls. #13223
 
 ## 2.48.0 / 2023-11-16
 

MAINTAINERS.md

@@ -7,7 +7,7 @@ Julien Pivotto (<roidelapluie@prometheus.io> / @roidelapluie) and Levi Harrison
 * `discovery`
  * `k8s`: Frederic Branczyk (<fbranczyk@gmail.com> / @brancz)
 * `documentation`
- * `prometheus-mixin`: Björn Rabenstein (<beorn@grafana.com> / @beorn7)
+ * `prometheus-mixin`: Matthias Loibl (<mail@matthiasloibl.com> / @metalmatze)
 * `storage`
  * `remote`: Chris Marchbanks (<csmarchbanks@gmail.com> / @csmarchbanks), Callum Styan (<callumstyan@gmail.com> / @cstyan), Bartłomiej Płotka (<bwplotka@gmail.com> / @bwplotka), Tom Wilkie (<tom.wilkie@gmail.com> / @tomwilkie)
 * `tsdb`: Ganesh Vernekar (<ganesh@grafana.com> / @codesome), Bartłomiej Płotka (<bwplotka@gmail.com> / @bwplotka), Jesús Vázquez (<jesus.vazquez@grafana.com> / @jesusvazquez)