From c28c8ada2ba6123d14b13f8b181881448d1c80dd Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Wed, 2 Oct 2024 17:30:18 -0400 Subject: [PATCH 01/11] Update to go 1.23.2. --- .devcontainer/devcontainer.json | 2 +- .go-version | 2 +- .golangci.yml | 8 ++++---- CHANGELOG.next.asciidoc | 1 + auditbeat/Dockerfile | 2 +- dev-tools/kubernetes/filebeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/heartbeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 2 +- go.mod | 4 ++-- heartbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- metricbeat/module/nats/_meta/Dockerfile | 2 +- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/metricbeat/module/stan/_meta/Dockerfile | 2 +- 18 files changed, 22 insertions(+), 21 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 537bb58a2fe..db732203d49 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ { "name": "Beats Development Container", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/go:1-1.22-bullseye", + "image": "mcr.microsoft.com/devcontainers/go:1-1.23-bullseye", // Features to add to the dev container. More info: https://containers.dev/features. "features": { "ghcr.io/devcontainers/features/node:1": {}, diff --git a/.go-version b/.go-version index 87b26e8b1aa..14bee92c9e7 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.7 +1.23.2 diff --git a/.golangci.yml b/.golangci.yml index 074f985f479..029eebe97cc 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -149,7 +149,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.22.7" + go: "1.23.2" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -167,19 +167,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.22.7" + go: "1.23.2" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.22.7" + go: "1.23.2" # Disabled: # ST1005: error strings should not be capitalized checks: ["all", "-ST1005"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.22.7" + go: "1.23.2" gosec: excludes: diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 0c0d1feb0ca..0a439f1e94c 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -228,6 +228,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - When running under Elastic-Agent Kafka output allows dynamic topic in `topic` field {pull}40415[40415] - The script processor has a new configuration option that only uses the cached javascript sessions and prevents the creation of new javascript sessions. - Update to Go 1.22.7. {pull}41018[41018] +- Update to Go 1.23.2. *Auditbeat* diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 0545f350da6..aceeeb3c000 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 +FROM golang:1.23.2 RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index 5532006d79c..f5bb8b3e711 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.22.7 as builder +FROM golang:1.23.2 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug index 0802bb16783..0e3385bfb8e 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.22.6 as builder +FROM golang:1.23.2 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index 7fa75c27b96..30ea0c485e4 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.22.7 as builder +FROM golang:1.23.2 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/go.mod b/go.mod index 0cc96844c85..846d4743563 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/elastic/beats/v7 -go 1.22.0 +go 1.23.0 -toolchain go1.22.7 +toolchain go1.23.2 require ( cloud.google.com/go/bigquery v1.62.0 diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 3eab83d42d5..a3096d916fe 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 +FROM golang:1.23.2 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 38bad88776c..dffffb85886 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 9.0.0 :doc-branch: main -:go-version: 1.22.7 +:go-version: 1.23.2 :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index b42c67c98d1..d89d1ef8749 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 +FROM golang:1.23.2 COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/ RUN \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index e9be272e4c8..8a190bb1e8e 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 +FROM golang:1.23.2 COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index 79ee1edab0e..9993a6097a3 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage -FROM golang:1.22.7 AS build-env +FROM golang:1.23.2 AS build-env RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/nats.go.git /nats-go RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build . diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index 837e772303f..0c44dbc4be3 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:1.22.7 +FROM golang:1.23.2 RUN apt-get install curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 30d9bdaf3fc..961ec5361ce 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 +FROM golang:1.23.2 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index bd9bf8972e6..462f5ca20ba 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.7 +FROM golang:1.23.2 RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 0cf5f65b3b5..e06dbb31210 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage -FROM golang:1.22.7 AS build-env +FROM golang:1.23.2 AS build-env RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/stan.go.git /stan-go RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build . From 7e664f28433e3f7c03b8d3e4d54d9db970e427d6 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Wed, 2 Oct 2024 17:31:55 -0400 Subject: [PATCH 02/11] Reference PR. --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 0a439f1e94c..ca790dc4bda 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -228,7 +228,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - When running under Elastic-Agent Kafka output allows dynamic topic in `topic` field {pull}40415[40415] - The script processor has a new configuration option that only uses the cached javascript sessions and prevents the creation of new javascript sessions. - Update to Go 1.22.7. {pull}41018[41018] -- Update to Go 1.23.2. +- Update to Go 1.23.2. {pull}41087[41087] *Auditbeat* From 4d8ca5c17f8115580693c1b8503701bbd24dd8ff Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Sun, 6 Oct 2024 02:14:28 +0530 Subject: [PATCH 03/11] try 1.22.8 --- .devcontainer/devcontainer.json | 2 +- .go-version | 2 +- .golangci.yml | 8 ++++---- CHANGELOG.next.asciidoc | 2 +- auditbeat/Dockerfile | 2 +- dev-tools/kubernetes/filebeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/heartbeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 2 +- go.mod | 4 ++-- heartbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- metricbeat/module/nats/_meta/Dockerfile | 2 +- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/metricbeat/module/stan/_meta/Dockerfile | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index db732203d49..537bb58a2fe 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ { "name": "Beats Development Container", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/go:1-1.23-bullseye", + "image": "mcr.microsoft.com/devcontainers/go:1-1.22-bullseye", // Features to add to the dev container. More info: https://containers.dev/features. "features": { "ghcr.io/devcontainers/features/node:1": {}, diff --git a/.go-version b/.go-version index 14bee92c9e7..229a27c6f20 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23.2 +1.22.8 diff --git a/.golangci.yml b/.golangci.yml index 029eebe97cc..52c4fb79720 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -149,7 +149,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.23.2" + go: "1.22.8" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -167,19 +167,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.23.2" + go: "1.22.8" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.23.2" + go: "1.22.8" # Disabled: # ST1005: error strings should not be capitalized checks: ["all", "-ST1005"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.23.2" + go: "1.22.8" gosec: excludes: diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index ca790dc4bda..5ae46d38d61 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -228,7 +228,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - When running under Elastic-Agent Kafka output allows dynamic topic in `topic` field {pull}40415[40415] - The script processor has a new configuration option that only uses the cached javascript sessions and prevents the creation of new javascript sessions. - Update to Go 1.22.7. {pull}41018[41018] -- Update to Go 1.23.2. {pull}41087[41087] +- Update to Go 1.22.8. {pull}41087[41087] *Auditbeat* diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index aceeeb3c000..2241aa16ad1 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 +FROM golang:1.22.8 RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index f5bb8b3e711..dd5b128caca 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.23.2 as builder +FROM golang:1.22.8 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug index 0e3385bfb8e..193516f058a 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.23.2 as builder +FROM golang:1.22.8 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index 30ea0c485e4..a8c567b9da9 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.23.2 as builder +FROM golang:1.22.8 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/go.mod b/go.mod index 846d4743563..d2c9df07066 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/elastic/beats/v7 -go 1.23.0 +go 1.22.0 -toolchain go1.23.2 +toolchain go1.22.8 require ( cloud.google.com/go/bigquery v1.62.0 diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index a3096d916fe..a30644dd04a 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 +FROM golang:1.22.8 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index dffffb85886..468ad95c9ce 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 9.0.0 :doc-branch: main -:go-version: 1.23.2 +:go-version: 1.22.8 :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index d89d1ef8749..d163510a06e 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 +FROM golang:1.22.8 COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/ RUN \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 8a190bb1e8e..324b026ef9d 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 +FROM golang:1.22.8 COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index 9993a6097a3..4dd2715b4ae 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage -FROM golang:1.23.2 AS build-env +FROM golang:1.22.8 AS build-env RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/nats.go.git /nats-go RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build . diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index 0c44dbc4be3..374f02453f9 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:1.23.2 +FROM golang:1.22.8 RUN apt-get install curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 961ec5361ce..e739ac9efd1 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 +FROM golang:1.22.8 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 462f5ca20ba..f5a96493923 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.2 +FROM golang:1.22.8 RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index e06dbb31210..8150094a78b 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage -FROM golang:1.23.2 AS build-env +FROM golang:1.22.8 AS build-env RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/stan.go.git /stan-go RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build . From c7a189731807c70084c4e5154afab8fcba6b4539 Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Sun, 6 Oct 2024 20:27:16 +0530 Subject: [PATCH 04/11] Revert "try 1.22.8" This reverts commit 4d8ca5c17f8115580693c1b8503701bbd24dd8ff. --- .devcontainer/devcontainer.json | 2 +- .go-version | 2 +- .golangci.yml | 8 ++++---- CHANGELOG.next.asciidoc | 2 +- auditbeat/Dockerfile | 2 +- dev-tools/kubernetes/filebeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/heartbeat/Dockerfile.debug | 2 +- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 2 +- go.mod | 4 ++-- heartbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- metricbeat/module/nats/_meta/Dockerfile | 2 +- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/metricbeat/module/stan/_meta/Dockerfile | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 537bb58a2fe..db732203d49 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ { "name": "Beats Development Container", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/go:1-1.22-bullseye", + "image": "mcr.microsoft.com/devcontainers/go:1-1.23-bullseye", // Features to add to the dev container. More info: https://containers.dev/features. "features": { "ghcr.io/devcontainers/features/node:1": {}, diff --git a/.go-version b/.go-version index 229a27c6f20..14bee92c9e7 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.8 +1.23.2 diff --git a/.golangci.yml b/.golangci.yml index 52c4fb79720..029eebe97cc 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -149,7 +149,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. - go: "1.22.8" + go: "1.23.2" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -167,19 +167,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. - go: "1.22.8" + go: "1.23.2" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. - go: "1.22.8" + go: "1.23.2" # Disabled: # ST1005: error strings should not be capitalized checks: ["all", "-ST1005"] unused: # Select the Go version to target. The default is '1.13'. - go: "1.22.8" + go: "1.23.2" gosec: excludes: diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 5ae46d38d61..ca790dc4bda 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -228,7 +228,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - When running under Elastic-Agent Kafka output allows dynamic topic in `topic` field {pull}40415[40415] - The script processor has a new configuration option that only uses the cached javascript sessions and prevents the creation of new javascript sessions. - Update to Go 1.22.7. {pull}41018[41018] -- Update to Go 1.22.8. {pull}41087[41087] +- Update to Go 1.23.2. {pull}41087[41087] *Auditbeat* diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 2241aa16ad1..aceeeb3c000 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.8 +FROM golang:1.23.2 RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index dd5b128caca..f5bb8b3e711 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.22.8 as builder +FROM golang:1.23.2 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug index 193516f058a..0e3385bfb8e 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.22.8 as builder +FROM golang:1.23.2 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index a8c567b9da9..30ea0c485e4 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.22.8 as builder +FROM golang:1.23.2 as builder ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/go.mod b/go.mod index d2c9df07066..846d4743563 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/elastic/beats/v7 -go 1.22.0 +go 1.23.0 -toolchain go1.22.8 +toolchain go1.23.2 require ( cloud.google.com/go/bigquery v1.62.0 diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index a30644dd04a..a3096d916fe 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.8 +FROM golang:1.23.2 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 468ad95c9ce..dffffb85886 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 9.0.0 :doc-branch: main -:go-version: 1.22.8 +:go-version: 1.23.2 :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index d163510a06e..d89d1ef8749 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.8 +FROM golang:1.23.2 COPY --from=docker:26.0.0-alpine3.19 /usr/local/bin/docker /usr/local/bin/ RUN \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 324b026ef9d..8a190bb1e8e 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.8 +FROM golang:1.23.2 COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index 4dd2715b4ae..9993a6097a3 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage -FROM golang:1.22.8 AS build-env +FROM golang:1.23.2 AS build-env RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/nats.go.git /nats-go RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build . diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index 374f02453f9..0c44dbc4be3 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:1.22.8 +FROM golang:1.23.2 RUN apt-get install curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index e739ac9efd1..961ec5361ce 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.8 +FROM golang:1.23.2 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index f5a96493923..462f5ca20ba 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.8 +FROM golang:1.23.2 RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 8150094a78b..e06dbb31210 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage -FROM golang:1.22.8 AS build-env +FROM golang:1.23.2 AS build-env RUN apt-get install git mercurial gcc RUN git clone https://github.com/nats-io/stan.go.git /stan-go RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build . From ee1d10311b2b238d72f8a9bd6e64cb269a68d815 Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Sun, 6 Oct 2024 20:28:07 +0530 Subject: [PATCH 05/11] debug --- .buildkite/metricbeat/pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 3ec9af58bf6..94eb2c8dc67 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -350,8 +350,9 @@ steps: PLATFORMS: "linux/arm64" PACKAGES: "docker" command: | + echo $PLATFORMS cd metricbeat - mage package + mage -v package retry: automatic: - limit: 1 From 253d7a1ec1dac5a1cbd2e64eab49e9fd1fcd05f6 Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Sun, 6 Oct 2024 23:56:12 +0530 Subject: [PATCH 06/11] debug --- .buildkite/metricbeat/pipeline.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 94eb2c8dc67..31c895a06a4 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -328,8 +328,9 @@ steps: env: PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" command: | + echo $$PLATFORMS cd metricbeat - mage package + PLATFORMS=$$PLATFORMS mage -v package retry: automatic: - limit: 1 @@ -350,9 +351,9 @@ steps: PLATFORMS: "linux/arm64" PACKAGES: "docker" command: | - echo $PLATFORMS + echo $$PLATFORMS cd metricbeat - mage -v package + PLATFORMS=$$PLATFORMS PLATmage -v package retry: automatic: - limit: 1 From f908c822a833bff9ce86fae60049454cfdc924ca Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Mon, 7 Oct 2024 00:53:27 +0530 Subject: [PATCH 07/11] debug --- .buildkite/metricbeat/pipeline.yml | 34 +++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 31c895a06a4..79d3457bea2 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -79,8 +79,8 @@ steps: - label: ":ubuntu: Metricbeat: Ubuntu x86_64 Unit Tests" key: "mandatory-linux-unit-test" command: | - cd metricbeat - mage build unitTest + # cd metricbeat + # mage build unitTest retry: automatic: - limit: 1 @@ -101,8 +101,8 @@ steps: set -euo pipefail echo "~~~ Running tests" export KUBECONFIG="$$PWD/kubecfg" - cd metricbeat - mage goIntegTest + # cd metricbeat + # mage goIntegTest retry: automatic: - limit: 1 @@ -123,8 +123,8 @@ steps: set -euo pipefail echo "~~~ Running tests" export KUBECONFIG="$$PWD/kubecfg" - cd metricbeat - mage pythonIntegTest + # cd metricbeat + # mage pythonIntegTest retry: automatic: - limit: 1 @@ -159,7 +159,7 @@ steps: - label: ":windows: Metricbeat: Win 2016 Unit Tests" command: | Set-Location -Path metricbeat - mage build unitTest + # mage build unitTest key: "mandatory-win-2016-unit-tests" retry: automatic: @@ -206,7 +206,7 @@ steps: - label: ":windows: Metricbeat: Win 10 Unit Tests" command: | Set-Location -Path metricbeat - mage build unitTest + # mage build unitTest key: "extended-win-10-unit-tests" retry: automatic: @@ -227,7 +227,7 @@ steps: - label: ":windows: Metricbeat: Win 11 Unit Tests" command: | Set-Location -Path metricbeat - mage build unitTest + # mage build unitTest key: "extended-win-11-unit-tests" retry: automatic: @@ -248,7 +248,7 @@ steps: - label: ":windows: Metricbeat: Win 2019 Unit Tests" command: | Set-Location -Path metricbeat - mage build unitTest + # mage build unitTest key: "extended-win-2019-unit-tests" retry: automatic: @@ -276,8 +276,8 @@ steps: command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh - cd metricbeat - mage build unitTest + # cd metricbeat + # mage build unitTest retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -298,8 +298,8 @@ steps: command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh - cd metricbeat - mage build unitTest + # cd metricbeat + # mage build unitTest retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -323,10 +323,10 @@ steps: - group: "Packaging" key: "metricbeat-packaging" steps: - - label: ":ubuntu: Metricbeat: Packaging Linux" + - label: ":ubuntu: Metricbeat: Packaging {Linux,Windows}(amd64), darwin({arm,amd}64)" key: "packaging-linux" env: - PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" + PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64" command: | echo $$PLATFORMS cd metricbeat @@ -353,7 +353,7 @@ steps: command: | echo $$PLATFORMS cd metricbeat - PLATFORMS=$$PLATFORMS PLATmage -v package + PLATFORMS=$$PLATFORMS mage -v package retry: automatic: - limit: 1 From a832425c9b69f00ff04d573e36817f3c2cc1bdf3 Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Mon, 7 Oct 2024 00:54:33 +0530 Subject: [PATCH 08/11] debug --- .buildkite/metricbeat/pipeline.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 79d3457bea2..3e53469f480 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -141,7 +141,7 @@ steps: - label: ":ubuntu: Metricbeat: Crosscompile" key: "mandatory-cross-compile" - command: "make -C metricbeat crosscompile" + command: "#make -C metricbeat crosscompile" retry: automatic: - limit: 1 @@ -180,7 +180,7 @@ steps: - label: ":windows: Metricbeat: Win 2022 Unit Tests" command: | Set-Location -Path metricbeat - mage build unitTest + #mage build unitTest key: "mandatory-win-2022-unit-tests" retry: automatic: @@ -351,6 +351,7 @@ steps: PLATFORMS: "linux/arm64" PACKAGES: "docker" command: | + echo $PLATFORMS-xx echo $$PLATFORMS cd metricbeat PLATFORMS=$$PLATFORMS mage -v package From 80b8685dc4ec2ba4eca6867853f9c74a0e07014e Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Mon, 7 Oct 2024 01:31:07 +0530 Subject: [PATCH 09/11] debug --- .buildkite/metricbeat/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 3e53469f480..4dcb8a2e7e9 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -323,10 +323,10 @@ steps: - group: "Packaging" key: "metricbeat-packaging" steps: - - label: ":ubuntu: Metricbeat: Packaging {Linux,Windows}(amd64), darwin({arm,amd}64)" + - label: ":ubuntu: Metricbeat: Packaging {linux,darwin}/{arm,amd}64 and windows/amd64" key: "packaging-linux" env: - PLATFORMS: "+all linux/amd64 windows/amd64 darwin/amd64 darwin/arm64" + PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" command: | echo $$PLATFORMS cd metricbeat From 90c5867e7e01e3a13ca33ce879779be9d503972c Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Mon, 7 Oct 2024 01:32:56 +0530 Subject: [PATCH 10/11] debug --- .buildkite/metricbeat/pipeline.yml | 35 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 4dcb8a2e7e9..6cf341e68f0 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -79,8 +79,8 @@ steps: - label: ":ubuntu: Metricbeat: Ubuntu x86_64 Unit Tests" key: "mandatory-linux-unit-test" command: | - # cd metricbeat - # mage build unitTest + cd metricbeat + mage build unitTest retry: automatic: - limit: 1 @@ -101,8 +101,8 @@ steps: set -euo pipefail echo "~~~ Running tests" export KUBECONFIG="$$PWD/kubecfg" - # cd metricbeat - # mage goIntegTest + cd metricbeat + mage goIntegTest retry: automatic: - limit: 1 @@ -123,8 +123,8 @@ steps: set -euo pipefail echo "~~~ Running tests" export KUBECONFIG="$$PWD/kubecfg" - # cd metricbeat - # mage pythonIntegTest + cd metricbeat + mage pythonIntegTest retry: automatic: - limit: 1 @@ -141,7 +141,7 @@ steps: - label: ":ubuntu: Metricbeat: Crosscompile" key: "mandatory-cross-compile" - command: "#make -C metricbeat crosscompile" + command: "make -C metricbeat crosscompile" retry: automatic: - limit: 1 @@ -159,7 +159,7 @@ steps: - label: ":windows: Metricbeat: Win 2016 Unit Tests" command: | Set-Location -Path metricbeat - # mage build unitTest + mage build unitTest key: "mandatory-win-2016-unit-tests" retry: automatic: @@ -180,7 +180,7 @@ steps: - label: ":windows: Metricbeat: Win 2022 Unit Tests" command: | Set-Location -Path metricbeat - #mage build unitTest + mage build unitTest key: "mandatory-win-2022-unit-tests" retry: automatic: @@ -206,7 +206,7 @@ steps: - label: ":windows: Metricbeat: Win 10 Unit Tests" command: | Set-Location -Path metricbeat - # mage build unitTest + mage build unitTest key: "extended-win-10-unit-tests" retry: automatic: @@ -227,7 +227,7 @@ steps: - label: ":windows: Metricbeat: Win 11 Unit Tests" command: | Set-Location -Path metricbeat - # mage build unitTest + mage build unitTest key: "extended-win-11-unit-tests" retry: automatic: @@ -248,7 +248,7 @@ steps: - label: ":windows: Metricbeat: Win 2019 Unit Tests" command: | Set-Location -Path metricbeat - # mage build unitTest + mage build unitTest key: "extended-win-2019-unit-tests" retry: automatic: @@ -276,8 +276,8 @@ steps: command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh - # cd metricbeat - # mage build unitTest + cd metricbeat + mage build unitTest retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -298,8 +298,8 @@ steps: command: | set -euo pipefail source .buildkite/scripts/install_macos_tools.sh - # cd metricbeat - # mage build unitTest + cd metricbeat + mage build unitTest retry: automatic: - limit: 3 # using higher retries for now due to lack of custom vm images and vendor instability @@ -328,6 +328,7 @@ steps: env: PLATFORMS: "+all linux/amd64 linux/arm64 windows/amd64 darwin/amd64 darwin/arm64" command: | + echo $PLATFORMS-xx echo $$PLATFORMS cd metricbeat PLATFORMS=$$PLATFORMS mage -v package @@ -365,4 +366,4 @@ steps: instanceType: "${AWS_ARM_INSTANCE_TYPE}" notify: - github_commit_status: - context: "metricbeat: Packaging Linux arm64" + context: "metricbeat: Packaging Linux arm64" \ No newline at end of file From 075b6d05b9d7b8e6cf4040f2dab16139660534e8 Mon Sep 17 00:00:00 2001 From: subham sarkar Date: Tue, 8 Oct 2024 02:08:09 +0530 Subject: [PATCH 11/11] remove verbose flag --- .buildkite/metricbeat/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/metricbeat/pipeline.yml b/.buildkite/metricbeat/pipeline.yml index 6cf341e68f0..67d81fe1c1e 100644 --- a/.buildkite/metricbeat/pipeline.yml +++ b/.buildkite/metricbeat/pipeline.yml @@ -331,7 +331,7 @@ steps: echo $PLATFORMS-xx echo $$PLATFORMS cd metricbeat - PLATFORMS=$$PLATFORMS mage -v package + PLATFORMS=$$PLATFORMS mage package retry: automatic: - limit: 1 @@ -355,7 +355,7 @@ steps: echo $PLATFORMS-xx echo $$PLATFORMS cd metricbeat - PLATFORMS=$$PLATFORMS mage -v package + PLATFORMS=$$PLATFORMS mage package retry: automatic: - limit: 1