chore: [release-2.9.x] Bump build-image 0.33.1 and golang 1.21.9

.devcontainer/devcontainer.json

@@ -1,5 +1,5 @@
 {
-  "image": "grafana/loki-build-image:0.29.0",
+  "image": "grafana/loki-build-image:0.33.1-golangci.1.51.2",
   "containerEnv": {
     "BUILD_IN_CONTAINER": "false"
   },

.drone/drone.yml

@@ -93,14 +93,14 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: check-drone-drift
 - commands:
   - make BUILD_IN_CONTAINER=false check-generated-files
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: check-generated-files
 - commands:
   - cd ..
@@ -110,7 +110,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: clone-target-branch
   when:
     event:
@@ -121,14 +121,14 @@ steps:
   - clone-target-branch
   - check-generated-files
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: test
 - commands:
   - cd ../loki-target-branch && BUILD_IN_CONTAINER=false make test
   depends_on:
   - clone-target-branch
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: test-target-branch
   when:
     event:
@@ -141,7 +141,7 @@ steps:
   - test
   - test-target-branch
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: compare-coverage
   when:
     event:
@@ -159,7 +159,7 @@ steps:
     TOKEN:
       from_secret: github_token
     USER: grafanabot
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: report-coverage
   when:
     event:
@@ -169,15 +169,15 @@ steps:
   depends_on:
   - check-generated-files
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: lint
 - commands:
   - make BUILD_IN_CONTAINER=false check-mod
   depends_on:
   - test
   - lint
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: check-mod
 - commands:
   - apk add make bash && make lint-scripts
@@ -188,21 +188,21 @@ steps:
   depends_on:
   - check-generated-files
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: loki
 - commands:
   - make BUILD_IN_CONTAINER=false check-doc
   depends_on:
   - loki
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: check-doc
 - commands:
   - make BUILD_IN_CONTAINER=false check-format GIT_TARGET_BRANCH="$DRONE_TARGET_BRANCH"
   depends_on:
   - loki
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: check-format
   when:
     event:
@@ -212,14 +212,14 @@ steps:
   depends_on:
   - loki
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: validate-example-configs
 - commands:
   - make BUILD_IN_CONTAINER=false check-example-config-doc
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: check-example-config-doc
 - commands:
   - mkdir -p /hugo/content/docs/loki/latest
@@ -252,7 +252,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: loki-mixin-check
   when:
     event:
@@ -277,7 +277,7 @@ steps:
   depends_on:
   - clone
   environment: {}
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: documentation-helm-reference-check
 trigger:
   ref:
@@ -1683,15 +1683,15 @@ steps:
     NFPM_SIGNING_KEY:
       from_secret: gpg_private_key
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: write-key
 - commands:
   - make BUILD_IN_CONTAINER=false packages
   environment:
     NFPM_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: test packaging
 - commands:
   - ./tools/packaging/verify-deb-install.sh
@@ -1717,7 +1717,7 @@ steps:
     NFPM_PASSPHRASE:
       from_secret: gpg_passphrase
     NFPM_SIGNING_KEY_FILE: /drone/src/private-key.key
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: publish
   when:
     event:
@@ -1752,7 +1752,7 @@ steps:
       from_secret: docker_password
     DOCKER_USERNAME:
       from_secret: docker_username
-  image: grafana/loki-build-image:0.30.1
+  image: grafana/loki-build-image:0.33.1-golangci.1.51.2
   name: build and push
   privileged: true
   volumes:
@@ -2017,6 +2017,6 @@ kind: secret
 name: gpg_private_key
 ---
 kind: signature
-hmac: 016d84867476782105e34f5165893b0fbb62e393be4cf5436c199f6e339d79d7
+hmac: f76dd17855d25e98563815a3248834d72b19bffa5427277ee167dcf28dd5dbad
 
 ...

.github/workflows/check.yml

@@ -2,10 +2,10 @@
   "check":
     "uses": "grafana/loki-release/.github/workflows/[email protected]"
     "with":
-      "build_image": "grafana/loki-build-image:0.30.1"
+      "build_image": "grafana/loki-build-image:0.33.1-golangci.1.51.2"
       "golang_ci_lint_version": "v1.51.2"
       "release_lib_ref": "loki-2.9.x"
-      "skip_validation": false
+      "skip_validation": true
       "use_github_app_token": true
 "name": "check"
 "on":

.github/workflows/helm-ci.yml

@@ -60,7 +60,9 @@ jobs:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/[email protected]
+        uses: helm/[email protected]
+        with:
+          version: v3.8.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed

.github/workflows/minor-release-pr.yml

@@ -14,7 +14,7 @@ jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/[email protected]"
     with:
-      build_image: "grafana/loki-build-image:0.30.1"
+      build_image: "grafana/loki-build-image:0.33.1-golangci.1.51.2"
       golang_ci_lint_version: "v1.51.2"
       release_lib_ref: "loki-2.9.x"
       skip_validation: false
@@ -136,7 +136,7 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.30.1"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.33.1-golangci.1.51.2"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages

.github/workflows/patch-release-pr.yml

@@ -14,7 +14,7 @@ jobs:
   check:
     uses: "grafana/loki-release/.github/workflows/[email protected]"
     with:
-      build_image: "grafana/loki-build-image:0.30.1"
+      build_image: "grafana/loki-build-image:0.33.1-golangci.1.51.2"
       golang_ci_lint_version: "v1.51.2"
       release_lib_ref: "loki-2.9.x"
       skip_validation: false
@@ -136,7 +136,7 @@ jobs:
           --env SKIP_ARM \
           --volume .:/src/loki \
           --workdir /src/loki \
-          --entrypoint /bin/sh "grafana/loki-build-image:0.30.1"
+          --entrypoint /bin/sh "grafana/loki-build-image:0.33.1-golangci.1.51.2"
           git config --global --add safe.directory /src/loki
           echo "${NFPM_SIGNING_KEY}" > $NFPM_SIGNING_KEY_FILE
           make dist packages

.golangci.yml

@@ -88,5 +88,10 @@ issues:
     - Error return value of .*log\.Logger\)\.Log\x60 is not checked
     - Error return value of .*.Log.* is not checked
     - Error return value of `` is not checked
-
+  exclude-rules:
+    - path: pkg/scheduler/scheduler.go
+      text: 'SA1019: msg.GetHttpRequest is deprecated: Do not use'
+    - path: '(.+)_test\.go'
+      linters:
+        - goconst
   fix: true

Makefile

@@ -37,7 +37,7 @@ DOCKER_IMAGE_DIRS := $(patsubst %/Dockerfile,%,$(DOCKERFILES))
 BUILD_IN_CONTAINER ?= true
 
 # ensure you run `make drone` after changing this
-BUILD_IMAGE_VERSION := 0.30.1
+BUILD_IMAGE_VERSION := 0.33.1-golangci.1.51.2
 
 # Docker image info
 IMAGE_PREFIX ?= grafana

clients/cmd/docker-driver/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.29.3
+ARG BUILD_IMAGE=grafana/loki-build-image:0.33.1-golangci.1.51.2
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/loki -f cmd/loki/Dockerfile .

clients/cmd/fluent-bit/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3-bullseye AS builder
+FROM golang:1.21.9-bullseye AS builder
 
 COPY . /src
 

clients/cmd/promtail/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3-bullseye as build
+FROM golang:1.21.9-bullseye as build
 
 COPY . /src/loki
 WORKDIR /src/loki

clients/cmd/promtail/Dockerfile.arm32

@@ -1,4 +1,4 @@
-FROM golang:1.20.6-bullseye as build
+FROM golang:1.21.9-bullseye as build
 
 COPY . /src/loki
 WORKDIR /src/loki

clients/cmd/promtail/Dockerfile.cross

@@ -1,8 +1,8 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.29.3
+ARG BUILD_IMAGE=grafana/loki-build-image:0.33.1-golangci.1.51.2
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile .
-FROM golang:1.20.6-alpine as goenv
+FROM golang:1.21.9-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 

clients/cmd/promtail/Dockerfile.debug

@@ -2,7 +2,7 @@
 # This file is intended to be called from the root like so:
 # docker build -t grafana/promtail -f clients/cmd/promtail/Dockerfile.debug .
 
-FROM grafana/loki-build-image:0.29.3 as build
+FROM grafana/loki-build-image:0.33.1-golangci.1.51.2 as build
 ARG GOARCH="amd64"
 COPY . /src/loki
 WORKDIR /src/loki

clients/pkg/logentry/stages/metrics.go

@@ -179,6 +179,7 @@ func (m *metricStage) Name() string {
 }
 
 // recordCounter will update a counter metric
+// nolint:goconst
 func (m *metricStage) recordCounter(name string, counter *metric.Counters, labels model.LabelSet, v interface{}) {
 	// If value matching is defined, make sure value matches.
 	if counter.Cfg.Value != nil {

cmd/logcli/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3 as build
+FROM golang:1.21.9 as build
 
 COPY . /src/loki
 WORKDIR /src/loki

cmd/logql-analyzer/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3 as build
+FROM golang:1.21.9 as build
 
 COPY . /src/loki
 WORKDIR /src/loki

cmd/loki-canary-boringcrypto/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3 as build
+FROM golang:1.21.9 as build
 
 COPY . /src/loki
 WORKDIR /src/loki

cmd/loki-canary/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3 as build
+FROM golang:1.21.9 as build
 
 COPY . /src/loki
 WORKDIR /src/loki

cmd/loki-canary/Dockerfile.cross

@@ -1,8 +1,8 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.29.3
+ARG BUILD_IMAGE=grafana/loki-build-image:0.33.1-golangci.1.51.2
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/promtail -f cmd/promtail/Dockerfile .
-FROM golang:1.20.6-alpine as goenv
+FROM golang:1.21.9-alpine as goenv
 RUN go env GOARCH > /goarch && \
   go env GOARM > /goarm
 

cmd/loki/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3 as build
+FROM golang:1.21.9 as build
 
 COPY . /src/loki
 WORKDIR /src/loki

cmd/loki/Dockerfile.cross

@@ -1,8 +1,8 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.29.3
+ARG BUILD_IMAGE=grafana/loki-build-image:0.33.1-golangci.1.51.2
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/loki -f cmd/loki/Dockerfile .
-FROM golang:1.20.7-alpine as goenv
+FROM golang:1.21.9-alpine as goenv
 RUN go env GOARCH > /goarch && \
     go env GOARM > /goarm
 

cmd/loki/Dockerfile.debug

@@ -1,9 +1,9 @@
-ARG BUILD_IMAGE=grafana/loki-build-image:0.29.3
+ARG BUILD_IMAGE=grafana/loki-build-image:0.33.1-golangci.1.51.2
 # Directories in this file are referenced from the root of the project not this folder
 # This file is intended to be called from the root like so:
 # docker build -t grafana/loki -f cmd/loki/Dockerfile.debug .
 
-FROM golang:1.20.7-alpine as goenv
+FROM golang:1.21.9-alpine as goenv
 RUN go env GOARCH > /goarch && \
     go env GOARM > /goarm && \
     go install github.com/go-delve/delve/cmd/dlv@latest

cmd/migrate/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3 as build
+FROM golang:1.21.9 as build
 COPY . /src/loki
 WORKDIR /src/loki
 RUN make clean && make BUILD_IN_CONTAINER=false migrate

cmd/querytee/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21.3 as build
+FROM golang:1.21.9 as build
 
 COPY . /src/loki
 WORKDIR /src/loki