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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test-darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Install Tools
if: steps.go-cache.outputs.cache-hit != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-mod-cache
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -154,7 +154,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -178,7 +178,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -358,7 +358,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -397,7 +397,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand All @@ -424,7 +424,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -496,7 +496,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -546,7 +546,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Mkdir bin and dist
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v4
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: make update changelog
run: make chlog-update-aws
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-codeowners.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false

- name: Cache Go Tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false

# Initializes the CodeQL tools for scanning.
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-tests-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-mod-cache
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-mod-cache
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/load-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
path: opentelemetry-collector-contrib
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Prepare release for contrib
working-directory: opentelemetry-collector-contrib
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prometheus-compliance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
path: opentelemetry-collector-contrib
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scoped-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false

- name: Try to restore go-cache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/telemetrygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tidy-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: actions/setup-go@v5
with:
go-version: "1.24.6"
go-version: "1.24.9"
cache: false
- name: Cache Go
id: go-cache
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ gotidy:
@find . -name 'go.mod' | while read modfile; do \
dir=$$(dirname $$modfile); \
echo "Tidying $$dir"; \
(cd $$dir && rm -f go.sum && $(GOCMD) mod tidy -compat=1.24.6) || exit $$?; \
(cd $$dir && rm -f go.sum && $(GOCMD) mod tidy -compat=1.24.9) || exit $$?; \
done

.PHONY: remove-toolchain
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ govulncheck: $(GOVULNCHECK)
.PHONY: tidy
tidy:
rm -fr go.sum
$(GOCMD) mod tidy -compat=1.24.6
$(GOCMD) mod tidy -compat=1.24.9

.PHONY: toolchain
toolchain:
Expand Down
2 changes: 1 addition & 1 deletion cmd/opampsupervisor/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/opampsupervisor

go 1.24.6
go 1.24.9

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Do we need to update the go mods? Shouldn't they pick up whatever version of go is provided so long as it's greater than the minimum version in the go.mod? I would think we'd just need to update the workflows.


require (
github.com/cenkalti/backoff/v4 v4.3.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/otlphistgen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otlphistgen

go 1.24.6
go 1.24.9

replace (
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen => ../telemetrygen
Expand Down
2 changes: 1 addition & 1 deletion cmd/promgen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/promgen

go 1.24.6
go 1.24.9

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/aws => ../../pkg/aws

Expand Down
2 changes: 1 addition & 1 deletion cmd/telemetrygen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen

go 1.24.6
go 1.24.9

require (
github.com/spf13/cobra v1.9.1
Expand Down
2 changes: 1 addition & 1 deletion cmd/telemetrygen/internal/e2etest/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen/internal/e2etest

go 1.24.6
go 1.24.9

require (
github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen v0.124.1
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/aesprovider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/aesprovider

go 1.24.6
go 1.24.9

require (
github.com/stretchr/testify v1.10.0
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/s3provider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider

go 1.24.6
go 1.24.9

require (
github.com/aws/aws-sdk-go-v2 v1.36.3
Expand Down
2 changes: 1 addition & 1 deletion confmap/provider/secretsmanagerprovider/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/secretsmanagerprovider

go 1.24.6
go 1.24.9

require (
github.com/aws/aws-sdk-go-v2/config v1.29.13
Expand Down
2 changes: 1 addition & 1 deletion connector/countconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector

go 1.24.6
go 1.24.9

require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.124.1
Expand Down
2 changes: 1 addition & 1 deletion connector/datadogconnector/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector

go 1.24.6
go 1.24.9

require (
github.com/DataDog/datadog-agent/comp/otelcol/otlp/components/metricsclient v0.66.0-devel.0.20250407180930-ebfcfa2817ce
Expand Down
Loading
Loading