From 0ab388b9bd456c3bc59c141d5869f6b4b0e8098e Mon Sep 17 00:00:00 2001
From: Pablo Baeyens <pablo.baeyens@datadoghq.com>
Date: Wed, 5 Jun 2024 13:48:00 +0000
Subject: [PATCH] [chore] update go to 1.21.11/1.22.4 (#10321) (#10325)

Backport of #10321

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
---
 .github/workflows/build-and-test-arm.yml |  2 +-
 .github/workflows/build-and-test.yml     | 14 +++++++-------
 .github/workflows/tidy-dependencies.yml  |  2 +-
 cmd/otelcorecol/go.mod                   |  2 +-
 pdata/pprofile/go.mod                    |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml
index 1729c3ec69b..6eae718ca9a 100644
--- a/.github/workflows/build-and-test-arm.yml
+++ b/.github/workflows/build-and-test-arm.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: "~1.22.3"
+          go-version: "~1.22.4"
           cache: false
       - name: Cache Go
         id: go-cache
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 9e48709b2ad..7d238d9aaeb 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: ~1.21.10
+          go-version: ~1.21.11
           cache: false
       - name: Cache Go
         id: go-cache
@@ -45,7 +45,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: ~1.21.10
+          go-version: ~1.21.11
           cache: false
       - name: Cache Go
         id: go-cache
@@ -69,7 +69,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: ~1.21.10
+          go-version: ~1.21.11
           cache: false
       - name: Cache Go
         id: go-cache
@@ -94,7 +94,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: ~1.21.10
+          go-version: ~1.21.11
           cache: false
       - name: Cache Go
         id: go-cache
@@ -141,7 +141,7 @@ jobs:
     strategy:
       matrix:
         runner: [ubuntu-latest]
-        go-version: ["~1.22", "~1.21.10"] # 1.20 needs quotes otherwise it's interpreted as 1.2
+        go-version: ["~1.22", "~1.21.11"] # 1.20 needs quotes otherwise it's interpreted as 1.2
     runs-on: ${{ matrix.runner }}
     needs: [setup-environment]
     steps:
@@ -201,7 +201,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: ~1.21.10
+          go-version: ~1.21.11
           cache: false
       - name: Cache Go
         id: go-cache
@@ -263,7 +263,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: ~1.21.10
+          go-version: ~1.21.11
           cache: false
       - name: Cache Go
         id: go-cache
diff --git a/.github/workflows/tidy-dependencies.yml b/.github/workflows/tidy-dependencies.yml
index 1cf7b52e623..fd462b79e1d 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@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
         with:
-          go-version: ~1.21.10
+          go-version: ~1.21.11
           cache: false
       - name: Cache Go
         id: go-cache
diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
index 2678acaaefc..d287217ea4d 100644
--- a/cmd/otelcorecol/go.mod
+++ b/cmd/otelcorecol/go.mod
@@ -4,7 +4,7 @@ module go.opentelemetry.io/collector/cmd/otelcorecol
 
 go 1.21.0
 
-toolchain go1.21.10
+toolchain go1.21.11
 
 require (
 	go.opentelemetry.io/collector/component v0.102.0
diff --git a/pdata/pprofile/go.mod b/pdata/pprofile/go.mod
index f3a7ba1375e..76e0d91d9ad 100644
--- a/pdata/pprofile/go.mod
+++ b/pdata/pprofile/go.mod
@@ -2,7 +2,7 @@ module go.opentelemetry.io/collector/pdata/pprofile
 
 go 1.21.0
 
-toolchain go1.21.10
+toolchain go1.21.11
 
 require (
 	github.com/stretchr/testify v1.9.0