From 14aa57a6abc0a40c7aeb4a58535ec9d3474e1af5 Mon Sep 17 00:00:00 2001 From: Curtis Robert Date: Fri, 6 Sep 2024 15:17:36 -0700 Subject: [PATCH] [chore] go version 1.22.6 -> 1.22.7 (#35059) **Description:** The goal here is to resolve warnings about [GO-2024-3106](https://pkg.go.dev/vuln/GO-2024-3106). Simply replacing all references from `1.22.6` -> `1.22.7` --- .github/workflows/build-and-test-windows.yml | 2 +- .github/workflows/build-and-test.yml | 20 +++++++++---------- .github/workflows/changelog.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/e2e-tests.yml | 8 ++++---- .github/workflows/load-tests.yml | 4 ++-- .github/workflows/prepare-release.yml | 2 +- .../workflows/prometheus-compliance-tests.yml | 2 +- .github/workflows/telemetrygen.yml | 6 +++--- .github/workflows/tidy-dependencies.yml | 2 +- cmd/otelcontribcol/go.mod | 2 +- cmd/oteltestbedcol/go.mod | 2 +- exporter/dorisexporter/go.mod | 2 +- receiver/googlecloudmonitoringreceiver/go.mod | 2 +- 14 files changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml index 41063b6fedf0..9b488e716d46 100644 --- a/.github/workflows/build-and-test-windows.yml +++ b/.github/workflows/build-and-test-windows.yml @@ -58,7 +58,7 @@ jobs: run: Install-WindowsFeature -name Web-Server -IncludeManagementTools - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-mod-cache diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 48c0ef638835..e14ab4dff770 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -26,7 +26,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -92,7 +92,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -161,7 +161,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -184,7 +184,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -253,7 +253,7 @@ jobs: strategy: fail-fast: false matrix: - go-version: ["1.23.0", "1.22.6"] # 1.20 is interpreted as 1.2 without quotes + go-version: ["1.23.0", "1.22.7"] # 1.20 is interpreted as 1.2 without quotes runner: [ubuntu-latest] group: - receiver-0 @@ -369,7 +369,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -407,7 +407,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -433,7 +433,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -503,7 +503,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -604,7 +604,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Mkdir bin and dist run: | diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index ed750232fe5f..08cb11aad328 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -33,7 +33,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index bf58b18331cc..7a78278bd1f8 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false # Initializes the CodeQL tools for scanning. diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 93420f247f1c..86f41fd6fe27 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -26,7 +26,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -55,7 +55,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -87,7 +87,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -133,7 +133,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/load-tests.yml b/.github/workflows/load-tests.yml index 876b59f1e9fb..1c5cefeec26f 100644 --- a/.github/workflows/load-tests.yml +++ b/.github/workflows/load-tests.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -66,7 +66,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml index 4ec1d1b309cc..5abc56fdf205 100644 --- a/.github/workflows/prepare-release.yml +++ b/.github/workflows/prepare-release.yml @@ -26,7 +26,7 @@ jobs: path: opentelemetry-collector-contrib - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Prepare release for contrib working-directory: opentelemetry-collector-contrib diff --git a/.github/workflows/prometheus-compliance-tests.yml b/.github/workflows/prometheus-compliance-tests.yml index c5f421896512..62ab3c895bfc 100644 --- a/.github/workflows/prometheus-compliance-tests.yml +++ b/.github/workflows/prometheus-compliance-tests.yml @@ -31,7 +31,7 @@ jobs: path: opentelemetry-collector-contrib - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/telemetrygen.yml b/.github/workflows/telemetrygen.yml index b8399c2864d3..7fe4f2e2dc00 100644 --- a/.github/workflows/telemetrygen.yml +++ b/.github/workflows/telemetrygen.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -67,7 +67,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache @@ -112,7 +112,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml index 18f781861e6e..2de7e1c83f02 100644 --- a/.github/workflows/tidy-dependencies.yml +++ b/.github/workflows/tidy-dependencies.yml @@ -21,7 +21,7 @@ jobs: ref: ${{ github.head_ref }} - uses: actions/setup-go@v5 with: - go-version: "1.22.6" + go-version: "1.22.7" cache: false - name: Cache Go id: go-cache diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index fe3a02c0dc5d..f2f25575d777 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib go 1.22.0 -toolchain go1.22.6 +toolchain go1.22.7 require ( github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.108.0 diff --git a/cmd/oteltestbedcol/go.mod b/cmd/oteltestbedcol/go.mod index f27948b2c1c6..7fe175bbee32 100644 --- a/cmd/oteltestbedcol/go.mod +++ b/cmd/oteltestbedcol/go.mod @@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/oteltestbed go 1.22.0 -toolchain go1.22.6 +toolchain go1.22.7 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.108.0 diff --git a/exporter/dorisexporter/go.mod b/exporter/dorisexporter/go.mod index c7d3e491ec04..efdb8dd6ac34 100644 --- a/exporter/dorisexporter/go.mod +++ b/exporter/dorisexporter/go.mod @@ -2,7 +2,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dorise go 1.22.0 -toolchain go1.22.6 +toolchain go1.22.7 require ( github.com/cenkalti/backoff/v4 v4.3.0 diff --git a/receiver/googlecloudmonitoringreceiver/go.mod b/receiver/googlecloudmonitoringreceiver/go.mod index 920472b030a0..0f71ca81f539 100644 --- a/receiver/googlecloudmonitoringreceiver/go.mod +++ b/receiver/googlecloudmonitoringreceiver/go.mod @@ -1,6 +1,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudmonitoringreceiver -go 1.22.6 +go 1.22.7 require ( github.com/stretchr/testify v1.9.0