From 92564d6c82fdd0dcca14f162de3b7b0f94bda2a9 Mon Sep 17 00:00:00 2001
From: Jeff Cheng <83052155+jeffreyc-splunk@users.noreply.github.com>
Date: Wed, 20 Apr 2022 10:42:46 -0400
Subject: [PATCH] Upgrade to golang 1.18.1 (#1464)

* Upgrade to golang 1.18.1

* Update changelog
---
 .github/workflows/build-and-test.yml                   | 2 +-
 .github/workflows/deps-test.yml                        | 2 +-
 .github/workflows/integration-test.yml                 | 2 +-
 .github/workflows/windows-test.yml                     | 2 +-
 .gitlab-ci.yml                                         | 8 ++++----
 CHANGELOG.md                                           | 4 ++++
 examples/prometheus-federation/prom-counter/Dockerfile | 2 +-
 examples/splunk-hec-traces/tracing/Dockerfile          | 2 +-
 examples/splunk-hec/logging/Dockerfile                 | 2 +-
 9 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 4eb3f650c56..0531b4cc32d 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -25,7 +25,7 @@ env:
   PIP_VERSION: 20.2.4
   REQUIREMENTS_PATH: "internal/buildscripts/packaging/tests/requirements.txt"
   RESULT_PATH: "~/testresults"
-  GO_VERSION: 1.18
+  GO_VERSION: 1.18.1
 
 jobs:
   setup-environment:
diff --git a/.github/workflows/deps-test.yml b/.github/workflows/deps-test.yml
index 6ecb1c47e89..30ed051505e 100644
--- a/.github/workflows/deps-test.yml
+++ b/.github/workflows/deps-test.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.18.1
       - name: Setup Go Environment
         run: |
           echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index d063841d5ec..677991a4af2 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.18.1
       - id: module-cache
         uses: actions/cache@v3
         env:
diff --git a/.github/workflows/windows-test.yml b/.github/workflows/windows-test.yml
index 6905e4298f5..ab932912d04 100644
--- a/.github/workflows/windows-test.yml
+++ b/.github/workflows/windows-test.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.18.1
 
       - name: Install golang dependency
         run: |
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1d7ec30062..ee9866125a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ whitesource:
     - schedules
   # allow_failure: false
   cache:
-    key: "whitesource-go1.18"
+    key: "whitesource-go1.18.1"
     paths:
       - /usr/local/go
       - /go/pkg/mod
@@ -58,8 +58,8 @@ whitesource:
       set -e
       if [ ! -d /usr/local/go ]; then
         pushd /usr/local
-        wget https://golang.org/dl/go1.18.linux-amd64.tar.gz
-        tar xzf go1.18.linux-amd64.tar.gz
+        wget https://golang.org/dl/go1.18.1.linux-amd64.tar.gz
+        tar xzf go1.18.1.linux-amd64.tar.gz
         popd
       fi
     - export GOROOT=/usr/local/go
@@ -91,7 +91,7 @@ whitesource:
       fi
 
 .go-cache:
-  image: '${DOCKER_HUB_REPO}/golang:1.18'
+  image: '${DOCKER_HUB_REPO}/golang:1.18.1'
   variables:
     GOPATH: "$CI_PROJECT_DIR/.go"
   before_script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbfee20527b..3644b4345ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### 💡 Enhancements 💡
+
+- Upgrade to Go 1.18.1 (#1464)
+
 ## v0.48.0
 
 This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.48.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.48.0) and the [opentelemetry-collector-contrib v0.48.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.48.0) releases.
diff --git a/examples/prometheus-federation/prom-counter/Dockerfile b/examples/prometheus-federation/prom-counter/Dockerfile
index edc01b35c8d..ab24b48d812 100644
--- a/examples/prometheus-federation/prom-counter/Dockerfile
+++ b/examples/prometheus-federation/prom-counter/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18.0-stretch
+FROM golang:1.18.1-stretch
 
 WORKDIR /go/src/app
 
diff --git a/examples/splunk-hec-traces/tracing/Dockerfile b/examples/splunk-hec-traces/tracing/Dockerfile
index ac4a40134c4..ab24b48d812 100644
--- a/examples/splunk-hec-traces/tracing/Dockerfile
+++ b/examples/splunk-hec-traces/tracing/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18-stretch
+FROM golang:1.18.1-stretch
 
 WORKDIR /go/src/app
 
diff --git a/examples/splunk-hec/logging/Dockerfile b/examples/splunk-hec/logging/Dockerfile
index edc01b35c8d..ab24b48d812 100644
--- a/examples/splunk-hec/logging/Dockerfile
+++ b/examples/splunk-hec/logging/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18.0-stretch
+FROM golang:1.18.1-stretch
 
 WORKDIR /go/src/app