Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
with:
go-version: '1.25.5'
go-version: '1.25.7'

- name: check-fmt
run: make check-fmt
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
with:
go-version: '1.25.5'
go-version: '1.25.7'

- name: Run Tests
run: make ${{ matrix.test-target }}
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
with:
go-version: '1.25.5'
go-version: '1.25.7'
- name: Run Tests
run: make ${{ matrix.test-target }}

Expand All @@ -182,7 +182,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
with:
go-version: '1.25.5'
go-version: '1.25.7'

- name: Build Tempo
run: make tempo
Expand Down Expand Up @@ -211,7 +211,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
with:
go-version: '1.25.5'
go-version: '1.25.7'

- name: Check vendor
run: make vendor-check
Expand All @@ -228,7 +228,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
with:
go-version: '1.25.5'
go-version: '1.25.7'

- name: Check jsonnet
run: make jsonnet-check
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6
with:
go-version: '1.25.5'
go-version: '1.25.7'

- name: Download all coverage artifacts
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* [BUGFIX] Fix query-frontend unable to convert dedicated column blob option [#6377](https://github.com/grafana/tempo/pull/6377) (@stoewer)
* [BUGFIX] Fix issue with additional matched spans in queries with only resource attributes [#6432](https://github.com/grafana/tempo/pull/6432) (@stoewer)
* [CHANGE] Upgrade Tempo to Go 1.25.7 [#6449](https://github.com/grafana/tempo/pull/6449) (@zalegrala)

# v2.10.0

Expand Down
2 changes: 1 addition & 1 deletion build/tools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ TOOL_DIR ?= tools
TOOL_CONFIG ?= $(TOOL_DIR)/tools.go

TOOLS_IMAGE ?= grafana/tempo-ci-tools
TOOLS_IMAGE_TAG ?= main-7162983
TOOLS_IMAGE_TAG ?= main-36bd1c7

GOTOOLS ?= $(shell cd $(TOOL_DIR) && go list -e -f '{{ .Imports }}' -tags tools |tr -d '[]')

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/tempo

go 1.25.5
go 1.25.7

require (
cloud.google.com/go/storage v1.58.0
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grafana/tempo/tools

go 1.25.5
go 1.25.7

require (
github.com/golangci/golangci-lint/v2 v2.8.0
Expand Down
Loading