Use go1.26 from ee0b97c (#7437)

* Use go1.26 from ee0b97c

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

* Update changelog

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

* Update to 1.26.2

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

* Modernize

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

* Remove unused functions

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

* Modernize again

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

---------

Signed-off-by: Friedrich Gonzalez <1517449+friedrichg@users.noreply.github.com>

Author: friedrichg

.github/workflows/test-build-deploy.yml

@@ -17,7 +17,7 @@ jobs:
   lint:
     runs-on: ubuntu-24.04
     container:
-      image: quay.io/cortexproject/build-image:master-fe84258322
+      image: quay.io/cortexproject/build-image:master-ee0b97cc37
     steps:
       - name: Checkout Repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -53,7 +53,7 @@ jobs:
     name: test (${{ matrix.name }})
     runs-on: ${{ matrix.runner }}
     container:
-      image: quay.io/cortexproject/build-image:master-fe84258322
+      image: quay.io/cortexproject/build-image:master-ee0b97cc37
     steps:
       - name: Checkout Repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1 
@@ -81,7 +81,7 @@ jobs:
     name: test-no-race (${{ matrix.name }})
     runs-on: ${{ matrix.runner }}
     container:
-      image: quay.io/cortexproject/build-image:master-fe84258322
+      image: quay.io/cortexproject/build-image:master-ee0b97cc37
     steps:
       - name: Checkout Repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -124,7 +124,7 @@ jobs:
   build:
     runs-on: ubuntu-24.04
     container:
-      image: quay.io/cortexproject/build-image:master-fe84258322
+      image: quay.io/cortexproject/build-image:master-ee0b97cc37
     steps:
       - name: Checkout Repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
@@ -228,7 +228,7 @@ jobs:
       - name: Upgrade golang
         uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
-          go-version: 1.25.8
+          go-version: 1.26.2
       - name: Checkout Repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - name: Install Docker Client
@@ -311,14 +311,14 @@ jobs:
           touch build-image/.uptodate
           MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations
           echo "Running configs integration tests on ${{ matrix.arch }}"
-          make BUILD_IMAGE=quay.io/cortexproject/build-image:master-fe84258322 TTY='' configs-integration-test
+          make BUILD_IMAGE=quay.io/cortexproject/build-image:master-ee0b97cc37 TTY='' configs-integration-test
 
   deploy:
     needs: [build, test, lint, integration, integration-configs-db]
     if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
     runs-on: ubuntu-24.04
     container:
-      image: quay.io/cortexproject/build-image:master-fe84258322
+      image: quay.io/cortexproject/build-image:master-ee0b97cc37
     steps:
       - name: Checkout Repo
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

CHANGELOG.md

@@ -8,6 +8,7 @@
 * [ENHANCEMENT] Distributor: Introduce dynamic `Symbols` slice capacity pooling. #7398 #7401
 * [ENHANCEMENT] Metrics Helper: Add native histogram support for aggregating and merging, including dual-format histogram handling that exposes both native and classic bucket formats. #7359
 * [ENHANCEMENT] Cache: Add per-tenant TTL configuration for query results cache to control cache expiration on a per-tenant basis with separate TTLs for regular and out-of-order data. #7357
+* [ENHANCEMENT] Update build image and Go version to 1.26. #7437
 * [CHANGE] Querier: Make query time range configurations per-tenant: `query_ingesters_within`, `query_store_after`, and `shuffle_sharding_ingesters_lookback_period`. Uses `model.Duration` instead of `time.Duration` to support serialization but has minimum unit of 1ms (nanoseconds/microseconds not supported). #7160
 * [ENHANCEMENT] Tenant Federation: Add a local cache to regex resolver. #7363
 * [ENHANCEMENT] Query Scheduler: Add `cortex_query_scheduler_tracked_requests` metric to track the current number of requests held by the scheduler. #7355

Makefile

@@ -112,7 +112,7 @@ build-image/$(UPTODATE): build-image/*
 SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
 BUILD_IN_CONTAINER := true
 BUILD_IMAGE ?= $(IMAGE_PREFIX)build-image
-LATEST_BUILD_IMAGE_TAG ?= master-fe84258322
+LATEST_BUILD_IMAGE_TAG ?= master-ee0b97cc37
 
 # TTY is parameterized to allow Google Cloud Builder to run builds,
 # as it currently disallows TTY devices. This value needs to be overridden

go.mod

@@ -1,6 +1,6 @@
 module github.com/cortexproject/cortex
 
-go 1.25.0
+go 1.26.0
 
 require (
 	github.com/Masterminds/squirrel v1.5.4

pkg/alertmanager/api.go

@@ -405,8 +405,7 @@ func validateAlertmanagerConfig(cfg any) error {
 
 	// If the input config is a struct, recursively iterate on all fields.
 	if t.Kind() == reflect.Struct {
-		for i := 0; i < t.NumField(); i++ {
-			field := t.Field(i)
+		for field := range t.Fields() {
 			fieldValue := v.FieldByIndex(field.Index)
 
 			// Skip any field value which can't be converted to interface (eg. primitive types).

pkg/ring/kv/multi_test.go

@@ -7,18 +7,14 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
-func boolPtr(b bool) *bool {
-	return &b
-}
-
 func TestMultiRuntimeConfigWithVariousEnabledValues(t *testing.T) {
 	testcases := map[string]struct {
 		yaml     string
 		expected *bool
 	}{
 		"nil":   {"primary: test", nil},
-		"true":  {"primary: test\nmirror_enabled: true", boolPtr(true)},
-		"false": {"mirror_enabled: false", boolPtr(false)},
+		"true":  {"primary: test\nmirror_enabled: true", new(true)},
+		"false": {"mirror_enabled: false", new(false)},
 	}
 
 	for name, tc := range testcases {

pkg/util/metrics_helper.go

@@ -1180,7 +1180,7 @@ func makeBucketsFromMap(buckets map[int]int64) ([]*dto.BucketSpan, []int64) {
 			// at the very beginning, or because we have found a gap
 			// of more than two buckets.
 			spans = append(spans, &dto.BucketSpan{
-				Offset: proto.Int32(iDelta),
+				Offset: new(iDelta),
 				Length: proto.Uint32(0),
 			})
 		} else {