diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml index db5b4a9d38..2c7eba5fde 100644 --- a/.github/workflows/dev_builds.yml +++ b/.github/workflows/dev_builds.yml @@ -21,7 +21,7 @@ jobs: - name: Setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' # As described in # https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds @@ -74,7 +74,7 @@ jobs: - name: Setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' # As described in # https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 9a8912abe6..e948794d0c 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -124,7 +124,7 @@ jobs: if: steps.changed-files.outputs.any_changed == 'true' uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' # As described in # https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds @@ -232,7 +232,7 @@ jobs: if: steps.changed-files.outputs.any_changed == 'true' uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' # As described in # https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds @@ -306,7 +306,7 @@ jobs: if: steps.changed-files.outputs.any_changed == 'true' uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' # As described in # https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds diff --git a/.github/workflows/release_builds.yml b/.github/workflows/release_builds.yml index 66efd9fd1b..ed56b4632a 100644 --- a/.github/workflows/release_builds.yml +++ b/.github/workflows/release_builds.yml @@ -34,7 +34,7 @@ jobs: - name: Setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' # As described in # https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds @@ -106,7 +106,7 @@ jobs: - name: Setup go uses: actions/setup-go@v3 with: - go-version: '1.18' + go-version: '1.19' # As described in # https://github.com/mvdan/github-actions-golang#how-do-i-set-up-caching-between-builds diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d2e745946..ec4c960751 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ This release introduces the following breaking changes: - fix(sumologicexporter): do not crash if server returns unknown length response [#718] - fix(k8sprocessor): fix metadata enrichment [#724] - fix(k8sprocessor): keep pod's services information up to date [#710] +- chore(deps): bump golang from 1.18.4 to 1.19.2 [#745] - chore(deps): bump go-boringcrypto to 1.18.7b7 [#746] - chore: upgrade OpenTelemetry Contrib Core to v0.62.0 [#769] @@ -43,6 +44,7 @@ This release introduces the following breaking changes: [#713]: https://github.com/SumoLogic/sumologic-otel-collector/pull/713 [#718]: https://github.com/SumoLogic/sumologic-otel-collector/pull/718 [#724]: https://github.com/SumoLogic/sumologic-otel-collector/pull/724 +[#745]: https://github.com/SumoLogic/sumologic-otel-collector/pull/745 [#746]: https://github.com/SumoLogic/sumologic-otel-collector/pull/746 [#769]: https://github.com/SumoLogic/sumologic-otel-collector/pull/769 [#693]: https://github.com/SumoLogic/sumologic-otel-collector/pull/693 diff --git a/Dockerfile_dev b/Dockerfile_dev index fa3e779189..41cd83c836 100644 --- a/Dockerfile_dev +++ b/Dockerfile_dev @@ -16,7 +16,7 @@ RUN apt update && apt install -y systemd # h stands for dereference of symbolic links RUN tar czhf journalctl.tar.gz /bin/journalctl $(ldd /bin/journalctl | grep -oP "\/.*? ") -FROM golang:1.18.4 +FROM golang:1.19.2 ARG BUILD_TAG=latest ENV TAG $BUILD_TAG ARG USER_UID=10001 diff --git a/Dockerfile_local b/Dockerfile_local index e6305a952e..20a147d246 100644 --- a/Dockerfile_local +++ b/Dockerfile_local @@ -1,4 +1,4 @@ -FROM golang:1.18.4-alpine as builder +FROM golang:1.19.2-alpine as builder ADD . /src WORKDIR /src/otelcolbuilder/ ENV CGO_ENABLED=0 diff --git a/pkg/scripts_test/config.go b/pkg/scripts_test/config.go index 68e3aea253..9575183f95 100644 --- a/pkg/scripts_test/config.go +++ b/pkg/scripts_test/config.go @@ -1,7 +1,6 @@ package sumologic_scripts_tests import ( - "io/ioutil" "os" "gopkg.in/yaml.v2" @@ -24,7 +23,7 @@ type sumologicExtension struct { func getConfig(path string) (config, error) { var conf config - yamlFile, err := ioutil.ReadFile(path) + yamlFile, err := os.ReadFile(path) if err != nil { return config{}, err } @@ -43,7 +42,7 @@ func saveConfig(path string, conf config) error { return err } - err = ioutil.WriteFile(path, out, os.ModePerm) + err = os.WriteFile(path, out, os.ModePerm) if err != nil { return err } diff --git a/pkg/test/timestamp_test.go b/pkg/test/timestamp_test.go index b5c14196ea..54f81b357a 100644 --- a/pkg/test/timestamp_test.go +++ b/pkg/test/timestamp_test.go @@ -1,5 +1,5 @@ -//go:build go1.18 -// +build go1.18 +//go:build go1.19 +// +build go1.19 package sumologic_tests