From bff5f5bb1641891cd0858a670c2b3adb126a761b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 May 2025 11:14:42 +0200 Subject: [PATCH 1/8] [Automation] Bump Golang version to 1.24.3 (#44270) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * chore: Update NATS module Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Auditbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Packetbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update .go-version Made with ❤️️ by updatecli * chore: Update from vsphere Dockerfile Made with ❤️️ by updatecli * chore: Update HTTP module Dockerfile Made with ❤️️ by updatecli * chore: Update version.asciidoc Made with ❤️️ by updatecli * chore: Update Heartbeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update Metricbeat Dockerfile Made with ❤️️ by updatecli * chore: Update Heartbeat Dockerfile Made with ❤️️ by updatecli * chore: Update stan Dockerfile Made with ❤️️ by updatecli * chore: Update Filebeat debug Dockerfile Made with ❤️️ by updatecli * chore: Update go.mod Made with ❤️️ by updatecli * Update changelog. * Switch go.mod to 1.24.0 as beats is imported. * Switch go.mod to go 1.24.3 to ensure CVE fixes present. * Remove whitespace. * fix: bump ebitengine/purego to v0.9.0-alpha.3.0.20250507171635-5047c08daa38 * fix: update NOTICE.txt --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Denis Co-authored-by: Craig MacKenzie Co-authored-by: Panos Koutsovasilis (cherry picked from commit 9f2953ed70a8f94a3cde2b4bed6996be2ed59120) # Conflicts: # NOTICE.txt # go.mod # go.sum # libbeat/docs/version.asciidoc # packetbeat/Dockerfile --- .go-version | 2 +- CHANGELOG.next.asciidoc | 2 ++ NOTICE.txt | 8 ++++++++ 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 | 9 ++++++++- go.sum | 5 +++++ heartbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 6 ++++++ metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- metricbeat/module/vsphere/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 4 ++++ x-pack/metricbeat/module/stan/_meta/Dockerfile | 2 +- 16 files changed, 43 insertions(+), 11 deletions(-) diff --git a/.go-version b/.go-version index f9e8384bb6c7..ae96cc7310aa 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.24.1 +1.24.3 diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 7bba26cf3334..1dc9086ebf9d 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -188,6 +188,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Enable early event encoding in the Elasticsearch output, improving cpu and memory use {pull}38572[38572] - The environment variable `BEATS_ADD_CLOUD_METADATA_PROVIDERS` overrides configured/default `add_cloud_metadata` providers {pull}38669[38669] - 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.24.3. {pull}44270[44270] - Replace Ubuntu 20.04 with 24.04 for Docker base images {issue}40743[40743] {pull}40942[40942] - Replace `compress/gzip` with https://github.com/klauspost/compress/gzip library for gzip compression {pull}41584[41584] - Add regex pattern matching to add_kubernetes_metadata processor {pull}41903[41903] diff --git a/NOTICE.txt b/NOTICE.txt index b65b010c6f89..2ea9a03b3000 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -40367,11 +40367,19 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/ebitengine/purego +<<<<<<< HEAD Version: v0.8.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.8.1/LICENSE: +======= +Version: v0.9.0-alpha.3.0.20250507171635-5047c08daa38 +Licence type (autodetected): Apache-2.0 +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.9.0-alpha.3.0.20250507171635-5047c08daa38/LICENSE: +>>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) Apache License Version 2.0, January 2004 diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 1d553c51ab1c..ac3c263dd20c 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.1 +FROM golang:1.24.3 RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index 0ae247cf551b..2c95209e98ed 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.24.1 as builder +FROM golang:1.24.3 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 0ff8a19aa587..95063866731e 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.24.1 as builder +FROM golang:1.24.3 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 431046288d27..bf32e67e5820 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.24.1 as builder +FROM golang:1.24.3 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 45af93ca00d0..85fee13b6e6b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/beats/v7 -go 1.24.1 +go 1.24.3 require ( cloud.google.com/go/bigquery v1.62.0 @@ -285,10 +285,17 @@ require ( github.com/docker/go-metrics v0.0.1 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect +<<<<<<< HEAD github.com/ebitengine/purego v0.8.1 // indirect github.com/elastic/elastic-transport-go/v8 v8.6.0 // indirect github.com/elastic/go-docappender/v2 v2.3.0 // indirect github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect +======= + github.com/ebitengine/purego v0.9.0-alpha.3.0.20250507171635-5047c08daa38 // indirect + github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect + github.com/elastic/go-docappender/v2 v2.6.0 // indirect + github.com/elastic/go-freelru v0.16.0 // indirect +>>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) github.com/elastic/go-windows v1.0.2 // indirect github.com/elastic/pkcs8 v1.0.0 // indirect github.com/elazarl/goproxy v0.0.0-20240909085733-6741dbfc16a1 // indirect diff --git a/go.sum b/go.sum index eeccdad0707f..76bc5e60b67b 100644 --- a/go.sum +++ b/go.sum @@ -318,8 +318,13 @@ github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4A github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +<<<<<<< HEAD github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE= github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +======= +github.com/ebitengine/purego v0.9.0-alpha.3.0.20250507171635-5047c08daa38 h1:61WY14WhyU89bEJCjegpt6b8wDNsU+Z1416JGwfEKwI= +github.com/ebitengine/purego v0.9.0-alpha.3.0.20250507171635-5047c08daa38/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= +>>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) github.com/eclipse/paho.mqtt.golang v1.3.5 h1:sWtmgNxYM9P2sP+xEItMozsR3w0cqZFlqnNN1bdl41Y= github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc= github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic h1:fxOiGmMPr1dVDAKRGOkp9MV2amPmaZrWPtWJygFxcG0= diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index c77582966743..1108e89f967e 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.1 +FROM golang:1.24.3 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 9e61cdf1cfeb..539bc6e035c3 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,12 @@ +<<<<<<< HEAD :stack-version: 8.18.1 :doc-branch: 8.18 :go-version: 1.24.1 +======= +:stack-version: 9.1.0 +:doc-branch: main +:go-version: 1.24.3 +>>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 9814d3a34f87..61f909ea83d2 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.1 +FROM golang:1.24.3 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 67faf28d1eaa..50825d4c5a7f 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.1 +FROM golang:1.24.3 COPY test/main.go main.go diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index 2312c30dd060..a92b114d8ec6 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -FROM golang:1.24.1 +FROM golang:1.24.3 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 f69a44fad789..8af606f2a7aa 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.23.8 +======= +FROM golang:1.24.3 +>>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 9c7407153ac0..754ec24c85ca 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.24.1 AS build-env +FROM golang:1.24.3 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 5ec89d47d509ca711df68161cd9318e7c87d0d87 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Wed, 21 May 2025 14:57:56 +0200 Subject: [PATCH 2/8] Update CHANGELOG.next.asciidoc --- CHANGELOG.next.asciidoc | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 1dc9086ebf9d..b320bb5d9418 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -188,12 +188,10 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Enable early event encoding in the Elasticsearch output, improving cpu and memory use {pull}38572[38572] - The environment variable `BEATS_ADD_CLOUD_METADATA_PROVIDERS` overrides configured/default `add_cloud_metadata` providers {pull}38669[38669] - 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.24.3. {pull}44270[44270] - Replace Ubuntu 20.04 with 24.04 for Docker base images {issue}40743[40743] {pull}40942[40942] - Replace `compress/gzip` with https://github.com/klauspost/compress/gzip library for gzip compression {pull}41584[41584] - Add regex pattern matching to add_kubernetes_metadata processor {pull}41903[41903] -- Update to Go 1.23.8. {pull}43396[43396] *Auditbeat* From c896d785a61ea6be371398fd1ec1f74ba5045a26 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Wed, 21 May 2025 14:59:25 +0200 Subject: [PATCH 3/8] Update Dockerfile --- packetbeat/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 8af606f2a7aa..0a8b0db0be14 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,8 +1,5 @@ -<<<<<<< HEAD -FROM golang:1.23.8 -======= -FROM golang:1.24.3 ->>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) + +ROM golang:1.24.3 RUN \ apt-get update \ From 5f9ce2f8a4487749caa40af58daf906267320913 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Wed, 21 May 2025 14:59:48 +0200 Subject: [PATCH 4/8] Update Dockerfile --- packetbeat/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 0a8b0db0be14..92149ecac8b7 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,5 +1,4 @@ - -ROM golang:1.24.3 +FROM golang:1.24.3 RUN \ apt-get update \ From 8f00f3528190c067e28e36685a11b82d6cd16ddb Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Wed, 21 May 2025 15:00:14 +0200 Subject: [PATCH 5/8] Update version.asciidoc --- libbeat/docs/version.asciidoc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 539bc6e035c3..e6793cbe5b07 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,12 +1,6 @@ -<<<<<<< HEAD :stack-version: 8.18.1 :doc-branch: 8.18 -:go-version: 1.24.1 -======= -:stack-version: 9.1.0 -:doc-branch: main :go-version: 1.24.3 ->>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) :release-state: unreleased :python: 3.7 :docker: 1.12 From a125df75b0de6bc2cf6dd06b9eeeac20159c33e1 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Wed, 21 May 2025 15:27:25 +0200 Subject: [PATCH 6/8] Update go.sum --- go.sum | 5 ----- 1 file changed, 5 deletions(-) diff --git a/go.sum b/go.sum index 76bc5e60b67b..a1dcec5c105f 100644 --- a/go.sum +++ b/go.sum @@ -318,13 +318,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 h1:Oy0F4A github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -<<<<<<< HEAD -github.com/ebitengine/purego v0.8.1 h1:sdRKd6plj7KYW33EH5As6YKfe8m9zbN9JMrOjNVF/BE= -github.com/ebitengine/purego v0.8.1/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= -======= github.com/ebitengine/purego v0.9.0-alpha.3.0.20250507171635-5047c08daa38 h1:61WY14WhyU89bEJCjegpt6b8wDNsU+Z1416JGwfEKwI= github.com/ebitengine/purego v0.9.0-alpha.3.0.20250507171635-5047c08daa38/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ= ->>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) github.com/eclipse/paho.mqtt.golang v1.3.5 h1:sWtmgNxYM9P2sP+xEItMozsR3w0cqZFlqnNN1bdl41Y= github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc= github.com/elastic/azure-sdk-for-go/sdk/resourcemanager/consumption/armconsumption v1.1.0-elastic h1:fxOiGmMPr1dVDAKRGOkp9MV2amPmaZrWPtWJygFxcG0= From c9291806929c70c7a93830f839df3b74dbb3c8a3 Mon Sep 17 00:00:00 2001 From: Pierre HILBERT Date: Wed, 21 May 2025 15:27:58 +0200 Subject: [PATCH 7/8] Update go.mod --- go.mod | 7 ------- 1 file changed, 7 deletions(-) diff --git a/go.mod b/go.mod index 85fee13b6e6b..0c219da3a52f 100644 --- a/go.mod +++ b/go.mod @@ -285,17 +285,10 @@ require ( github.com/docker/go-metrics v0.0.1 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect github.com/eapache/queue v1.1.0 // indirect -<<<<<<< HEAD - github.com/ebitengine/purego v0.8.1 // indirect - github.com/elastic/elastic-transport-go/v8 v8.6.0 // indirect - github.com/elastic/go-docappender/v2 v2.3.0 // indirect - github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect -======= github.com/ebitengine/purego v0.9.0-alpha.3.0.20250507171635-5047c08daa38 // indirect github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect github.com/elastic/go-docappender/v2 v2.6.0 // indirect github.com/elastic/go-freelru v0.16.0 // indirect ->>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) github.com/elastic/go-windows v1.0.2 // indirect github.com/elastic/pkcs8 v1.0.0 // indirect github.com/elazarl/goproxy v0.0.0-20240909085733-6741dbfc16a1 // indirect From 62afeecc9f34d753de756fd8768e1601c77aa7e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Wed, 21 May 2025 17:13:11 +0200 Subject: [PATCH 8/8] Fix go.mod and notice --- NOTICE.txt | 36 ++++++++++++++---------------------- go.mod | 12 ++++++------ go.sum | 28 ++++++++++++++-------------- 3 files changed, 34 insertions(+), 42 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 2ea9a03b3000..2ab10b48db2d 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -23507,11 +23507,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmelasticsearch/v2 -Version: v2.6.0 +Version: v2.6.3 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasticsearch/v2@v2.6.3/LICENSE: Apache License Version 2.0, January 2004 @@ -23718,11 +23718,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmelasti -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmhttp/v2 -Version: v2.6.0 +Version: v2.6.3 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v2@v2.6.3/LICENSE: Apache License Version 2.0, January 2004 @@ -23929,11 +23929,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmhttp/v -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/v2 -Version: v2.6.0 +Version: v2.6.3 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/v2@v2.6.3/LICENSE: Apache License Version 2.0, January 2004 @@ -40367,19 +40367,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/ebitengine/purego -<<<<<<< HEAD -Version: v0.8.1 -Licence type (autodetected): Apache-2.0 --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.8.1/LICENSE: -======= Version: v0.9.0-alpha.3.0.20250507171635-5047c08daa38 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.9.0-alpha.3.0.20250507171635-5047c08daa38/LICENSE: ->>>>>>> 9f2953ed7 ([Automation] Bump Golang version to 1.24.3 (#44270)) Apache License Version 2.0, January 2004 @@ -40586,11 +40578,11 @@ Contents of probable licence file $GOMODCACHE/github.com/ebitengine/purego@v0.9. -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-transport-go/v8 -Version: v8.6.0 +Version: v8.6.1 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.6.1/LICENSE: Apache License Version 2.0, January 2004 @@ -40797,11 +40789,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transpo -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-docappender/v2 -Version: v2.3.0 +Version: v2.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.3.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender/v2@v2.6.0/LICENSE: Apache License Version 2.0, January 2004 @@ -56770,11 +56762,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : go.elastic.co/apm/module/apmzap/v2 -Version: v2.6.0 +Version: v2.6.3 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2@v2.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2@v2.6.3/LICENSE: Apache License Version 2.0, January 2004 @@ -56981,11 +56973,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2 -------------------------------------------------------------------------------- Dependency : go.elastic.co/fastjson -Version: v1.3.0 +Version: v1.4.0 Licence type (autodetected): MIT -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/go.elastic.co/fastjson@v1.3.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.elastic.co/fastjson@v1.4.0/LICENSE: Copyright 2018 Elasticsearch BV diff --git a/go.mod b/go.mod index 0c219da3a52f..9ed2a916d35b 100644 --- a/go.mod +++ b/go.mod @@ -213,9 +213,9 @@ require ( github.com/tsg/go-daemon v0.0.0-20200207173439-e704b93fd89b github.com/xdg-go/scram v1.1.2 github.com/zyedidia/generic v1.2.1 - go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 - go.elastic.co/apm/module/apmhttp/v2 v2.6.0 - go.elastic.co/apm/v2 v2.6.0 + go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3 + go.elastic.co/apm/module/apmhttp/v2 v2.6.3 + go.elastic.co/apm/v2 v2.6.3 go.mongodb.org/mongo-driver v1.14.0 go.opentelemetry.io/collector/component v0.114.0 go.opentelemetry.io/collector/config/configtls v1.20.0 @@ -288,7 +288,7 @@ require ( github.com/ebitengine/purego v0.9.0-alpha.3.0.20250507171635-5047c08daa38 // indirect github.com/elastic/elastic-transport-go/v8 v8.6.1 // indirect github.com/elastic/go-docappender/v2 v2.6.0 // indirect - github.com/elastic/go-freelru v0.16.0 // indirect + github.com/elastic/go-elasticsearch/v7 v7.17.10 // indirect github.com/elastic/go-windows v1.0.2 // indirect github.com/elastic/pkcs8 v1.0.0 // indirect github.com/elazarl/goproxy v0.0.0-20240909085733-6741dbfc16a1 // indirect @@ -389,8 +389,8 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect - go.elastic.co/apm/module/apmzap/v2 v2.6.0 // indirect - go.elastic.co/fastjson v1.3.0 // indirect + go.elastic.co/apm/module/apmzap/v2 v2.6.3 // indirect + go.elastic.co/fastjson v1.4.0 // indirect go.opencensus.io v0.24.0 // indirect go.opentelemetry.io/collector/client v1.20.0 // indirect go.opentelemetry.io/collector/component/componentstatus v0.114.0 // indirect diff --git a/go.sum b/go.sum index a1dcec5c105f..c18f2fb2564f 100644 --- a/go.sum +++ b/go.sum @@ -338,16 +338,16 @@ github.com/elastic/elastic-agent-libs v0.19.0 h1:xqDkX6kjz3rBH02QQWk3kFsn8M0uv/5 github.com/elastic/elastic-agent-libs v0.19.0/go.mod h1:koK4coWhHibGMT3Ujni8tuLyGw8k9ttsO+AlX4ypHkI= github.com/elastic/elastic-agent-system-metrics v0.11.11 h1:Qjh3Zef23PfGlG91AF+9ciNLNQf/8cDJ4CalnLZtV3g= github.com/elastic/elastic-agent-system-metrics v0.11.11/go.mod h1:GNqmKfvOt8PwORjbS6GllNdMfkLpOWyTa7P8oQq4E5o= -github.com/elastic/elastic-transport-go/v8 v8.6.0 h1:Y2S/FBjx1LlCv5m6pWAF2kDJAHoSjSRSJCApolgfthA= -github.com/elastic/elastic-transport-go/v8 v8.6.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= +github.com/elastic/elastic-transport-go/v8 v8.6.1 h1:h2jQRqH6eLGiBSN4eZbQnJLtL4bC5b4lfVFRjw2R4e4= +github.com/elastic/elastic-transport-go/v8 v8.6.1/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270 h1:cWPqxlPtir4RoQVCpGSRXmLqjEHpJKbR60rxh1nQZY4= github.com/elastic/fsevents v0.0.0-20181029231046-e1d381a4d270/go.mod h1:Msl1pdboCbArMF/nSCDUXgQuWTeoMmE/z8607X+k7ng= github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3 h1:UyNbxdkQiSfyipwsOCWAlO+ju3xXC61Z4prx/HBTtFk= github.com/elastic/fsnotify v1.6.1-0.20240920222514-49f82bdbc9e3/go.mod h1:DAsKqylc/16NDcfdk8dN5axVtSOsQwgP2kV+NV5xPDE= github.com/elastic/go-concert v0.3.0 h1:Y66JFn3ENndpHErOhTASu8/Fz1SSsLZicPufCmvQD60= github.com/elastic/go-concert v0.3.0/go.mod h1:UWt1MB5HxxZ85hKynLaYl/AaLIKFx0WiBP2uJSRfduA= -github.com/elastic/go-docappender/v2 v2.3.0 h1:Vr+l36jM+sE/LHp0JFxSIbHlWTSk8CpBblYWZZ/I1KA= -github.com/elastic/go-docappender/v2 v2.3.0/go.mod h1:VNWgXUE9HX1G6W6ON8dOs/KdH8aCxXir/fxxcfrnov4= +github.com/elastic/go-docappender/v2 v2.6.0 h1:VxFla3ctXsbv612aMYg0GH8KE/dONs/rNHmt6ExpWM0= +github.com/elastic/go-docappender/v2 v2.6.0/go.mod h1:ymIoSDEiGm8fG/Vdfk4ytsX+qG20cLFtQkX6fZ7NfTs= github.com/elastic/go-elasticsearch/v7 v7.17.10 h1:TCQ8i4PmIJuBunvBS6bwT2ybzVFxxUhhltAs3Gyu1yo= github.com/elastic/go-elasticsearch/v7 v7.17.10/go.mod h1:OJ4wdbtDNk5g503kvlHLyErCgQwwzmDtaFC4XyOxXA4= github.com/elastic/go-elasticsearch/v8 v8.17.0 h1:e9cWksE/Fr7urDRmGPGp47Nsp4/mvNOrU8As1l2HQQ0= @@ -941,18 +941,18 @@ github.com/zyedidia/generic v1.2.1 h1:Zv5KS/N2m0XZZiuLS82qheRG4X1o5gsWreGb0hR7XD github.com/zyedidia/generic v1.2.1/go.mod h1:ly2RBz4mnz1yeuVbQA/VFwGjK3mnHGRj1JuoG336Bis= go.einride.tech/aip v0.67.1 h1:d/4TW92OxXBngkSOwWS2CH5rez869KpKMaN44mdxkFI= go.einride.tech/aip v0.67.1/go.mod h1:ZGX4/zKw8dcgzdLsrvpOOGxfxI2QSk12SlP7d6c0/XI= -go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0 h1:ukMcwyMaDXsS1dRK2qRYXT2AsfwaUy74TOOYCqkWJow= -go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.0/go.mod h1:YpfiTTrqX5LB/CKBwX89oDCBAxuLJTFv40gcfxJyehM= -go.elastic.co/apm/module/apmhttp/v2 v2.6.0 h1:s8UeNFQmVBCNd4eoz7KDD9rEFhQC0HeUFXz3z9gpAmQ= -go.elastic.co/apm/module/apmhttp/v2 v2.6.0/go.mod h1:D0GLppLuI0Ddwvtl595GUxRgn6Z8L5KaDFVMv2H3GK0= -go.elastic.co/apm/module/apmzap/v2 v2.6.0 h1:R/iVORzGu3F9uM43iEVHD0nwiRo59O0bIXdayKsgayQ= -go.elastic.co/apm/module/apmzap/v2 v2.6.0/go.mod h1:B3i/8xRkqLgi6zNuV+Bp7Pt4cutaOObvrVSa7wUTAPw= -go.elastic.co/apm/v2 v2.6.0 h1:VieBMLQFtXua2YxpYxaSdYGnmmxhLT46gosI5yErJgY= -go.elastic.co/apm/v2 v2.6.0/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo= +go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3 h1:5CuemBg1oZnXI6jz+jkLqM95Np1XHasdy0CCelX62Ec= +go.elastic.co/apm/module/apmelasticsearch/v2 v2.6.3/go.mod h1:MVK2TIrvMGQaL7bnO4dbnJ+jpDNqmkj+BukDRBYTI60= +go.elastic.co/apm/module/apmhttp/v2 v2.6.3 h1:jwFovJZkccySKCyy2oE9ZKvUry/a4gdQHF/MtZUQVtE= +go.elastic.co/apm/module/apmhttp/v2 v2.6.3/go.mod h1:w94Gkk6uzI/K+eJYKDLB66tvWC5uK0fSHyWcyX2jPlQ= +go.elastic.co/apm/module/apmzap/v2 v2.6.3 h1:QxszhmFs2qD42sHSd6qnZUv5xMPV7cVSIt1qU/o4nwA= +go.elastic.co/apm/module/apmzap/v2 v2.6.3/go.mod h1:gOs+EJgXDCyg1pK4pcxN6fL9hKNC+s/Hj20e9RvGeJg= +go.elastic.co/apm/v2 v2.6.3 h1:yVKFPLnmHOxpzLMGd3aexcik20ziXmRHqgcn9NZn/VU= +go.elastic.co/apm/v2 v2.6.3/go.mod h1:33rOXgtHwbgZcDgi6I/GtCSMZQqgxkHC0IQT3gudKvo= go.elastic.co/ecszap v1.0.2 h1:iW5OGx8IiokiUzx/shD4AJCPFMC9uUtr7ycaiEIU++I= go.elastic.co/ecszap v1.0.2/go.mod h1:dJkSlK3BTiwG/qXhCwe50Mz/jwu854vSip8sIeQhNZg= -go.elastic.co/fastjson v1.3.0 h1:hJO3OsYIhiqiT4Fgu0ZxAECnKASbwgiS+LMW5oCopKs= -go.elastic.co/fastjson v1.3.0/go.mod h1:K9vDh7O0ODsVKV2B5e2XYLY277QZaCbB3tS1SnARvko= +go.elastic.co/fastjson v1.4.0 h1:a4BXUKXZHAzjVOPrqtEx2FDsIRBCMek01vCnrtyutWs= +go.elastic.co/fastjson v1.4.0/go.mod h1:ZD5um63l0/8TIdddZbL2znD83FAr2IckYa3KR7VcdNA= go.elastic.co/go-licence-detector v0.7.0 h1:qC31sfyfNcNx/zMYcLABU0ac3MbGHZgksCAb5lMDUMg= go.elastic.co/go-licence-detector v0.7.0/go.mod h1:f5ty8pjynzQD8BcS+s0qtlOGKc35/HKQxCVi8SHhV5k= go.etcd.io/bbolt v1.3.10 h1:+BqfJTcCzTItrop8mq/lbzL8wSGtj94UO/3U31shqG0=