From 2d49ceb9ad2e1ed3b513a455c9501b8dafd5e354 Mon Sep 17 00:00:00 2001
From: David Ashpole <dashpole@google.com>
Date: Fri, 9 Feb 2024 12:05:05 -0500
Subject: [PATCH] start testing on go 1.22 (#802)

---
 .github/workflows/ci.yml                 | 4 ++--
 cloudbuild-e2e-cloud-functions-gen2.yaml | 2 +-
 cloudbuild-integration-tests.yaml        | 2 +-
 e2e-test-server/Dockerfile               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2862408d..09bca1d3a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ env:
   # Path to where test results will be saved.
   TEST_RESULTS: /tmp/test-results
   # Default minimum version of Go to support.
-  DEFAULT_GO_VERSION: "1.21"
+  DEFAULT_GO_VERSION: "1.22"
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -113,7 +113,7 @@ jobs:
   compatibility-test:
     strategy:
       matrix:
-        go-version: ["1.21", "1.20"]
+        go-version: ["1.22", "1.21", "1.20"]
         os: [ubuntu-latest, macos-latest, windows-latest]
         arch: ["386", amd64]
         exclude:
diff --git a/cloudbuild-e2e-cloud-functions-gen2.yaml b/cloudbuild-e2e-cloud-functions-gen2.yaml
index f97fe8c11..cde12bc1f 100644
--- a/cloudbuild-e2e-cloud-functions-gen2.yaml
+++ b/cloudbuild-e2e-cloud-functions-gen2.yaml
@@ -14,7 +14,7 @@
 
 steps:
   # Vendor dependencies, and zip the code.
-  - name: golang:1.21
+  - name: golang:1.22
     id: zip-code
     entrypoint: /bin/bash
     args:
diff --git a/cloudbuild-integration-tests.yaml b/cloudbuild-integration-tests.yaml
index 7971a5096..55c61a94f 100644
--- a/cloudbuild-integration-tests.yaml
+++ b/cloudbuild-integration-tests.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 steps:
-  - name: golang:1.21
+  - name: golang:1.22
     env: ["SECOND_PROJECT_ID=opentelemetry-ops-e2e-2"]
     args: ["make", "integrationtest"]
 logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
diff --git a/e2e-test-server/Dockerfile b/e2e-test-server/Dockerfile
index d387576b6..1df708185 100644
--- a/e2e-test-server/Dockerfile
+++ b/e2e-test-server/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.21 as builder
+FROM golang:1.22 as builder
 
 WORKDIR /workspace/e2e-test-server/