From 6f7d4b7b7980e3cdb703d31eada68c32a6add410 Mon Sep 17 00:00:00 2001
From: kruskall <99559985+kruskall@users.noreply.github.com>
Date: Mon, 25 Mar 2024 14:02:39 +0100
Subject: [PATCH] build: bump go to 1.22 (#12835)

* build: bump go to 1.22

* lint: run go mod tidy
---
 .go-version                 | 2 +-
 README.md                   | 2 +-
 cmd/intake-receiver/go.mod  | 4 ++--
 go.mod                      | 4 ++--
 internal/glog/go.mod        | 4 ++--
 packaging/docker/Dockerfile | 2 +-
 systemtest/go.mod           | 4 ++--
 tools/go.mod                | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.go-version b/.go-version
index 8819d012cee..6245beecd39 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.21.7
+1.22.1
diff --git a/README.md b/README.md
index aab51704333..a454d0adb12 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ To get started with APM, see our [Quick start guide](https://www.elastic.co/guid
 
 ### Requirements
 
-* [Go][golang-download] 1.21.x
+* [Go][golang-download] 1.22.x
 
 [golang-download]: https://golang.org/dl/
 
diff --git a/cmd/intake-receiver/go.mod b/cmd/intake-receiver/go.mod
index c64217c60d7..0833f7b5920 100644
--- a/cmd/intake-receiver/go.mod
+++ b/cmd/intake-receiver/go.mod
@@ -1,8 +1,8 @@
 module github.com/elastic/apm-server/cmd/intake-receiver
 
-go 1.21
+go 1.22
 
-toolchain go1.21.3
+toolchain go1.22.1
 
 require (
 	github.com/stretchr/testify v1.6.1
diff --git a/go.mod b/go.mod
index c15f2004ca1..660c752af53 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/elastic/apm-server
 
-go 1.21
+go 1.22
 
-toolchain go1.21.3
+toolchain go1.22.1
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0
diff --git a/internal/glog/go.mod b/internal/glog/go.mod
index 265d1569169..117d275f9eb 100644
--- a/internal/glog/go.mod
+++ b/internal/glog/go.mod
@@ -1,5 +1,5 @@
 module github.com/golang/glog
 
-go 1.21
+go 1.22
 
-toolchain go1.21.3
+toolchain go1.22.1
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index c24d3ca1500..d17c5f07da8 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -2,7 +2,7 @@ ARG BASE_IMAGE=ubuntu:22.04
 
 # Build the apm-server binary. The golang image version is kept
 # up to date with go.mod by Makefile.
-FROM golang:1.21.7 as builder
+FROM golang:1.22.1 as builder
 WORKDIR /src
 COPY go.mod go.sum /src/
 COPY internal/glog/go.mod /src/internal/glog/go.mod
diff --git a/systemtest/go.mod b/systemtest/go.mod
index 4bfd93952a5..49baa4550bc 100644
--- a/systemtest/go.mod
+++ b/systemtest/go.mod
@@ -1,8 +1,8 @@
 module github.com/elastic/apm-server/systemtest
 
-go 1.21
+go 1.22
 
-toolchain go1.21.3
+toolchain go1.22.1
 
 require (
 	github.com/docker/docker v24.0.9+incompatible
diff --git a/tools/go.mod b/tools/go.mod
index bbe9f4bd7ff..284276cb773 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,8 +1,8 @@
 module github.com/elastic/apm-server/tools
 
-go 1.21.0
+go 1.22
 
-toolchain go1.21.3
+toolchain go1.22.1
 
 require (
 	github.com/elastic/apm-tools v0.0.0-20230828065051-3f799314cc8b