diff --git a/.github/workflows/check-default.yml b/.github/workflows/check-default.yml index f394815356c..9edcf7c2654 100644 --- a/.github/workflows/check-default.yml +++ b/.github/workflows/check-default.yml @@ -20,6 +20,11 @@ jobs: - uses: actions/setup-go@v5 with: go-version-file: .go-version + #  when using ubuntu-latest, python 3.10 is not the default version. + - name: Fix Code is not compatible with Python 3.12 + uses: actions/setup-python@v4 + with: + python-version: '3.10' - name: Run check-default run: | go install github.com/magefile/mage diff --git a/.github/workflows/check-docs.yml b/.github/workflows/check-docs.yml index a2f26979ec4..50ef425ae33 100644 --- a/.github/workflows/check-docs.yml +++ b/.github/workflows/check-docs.yml @@ -28,6 +28,11 @@ jobs: run: sudo apt-get install -y libsystemd-dev - name: Install librpm-dev run: sudo apt-get install -y librpm-dev + #  when using ubuntu-latest, python 3.10 is not the default version. + - name: Fix Code is not compatible with Python 3.12 + uses: actions/setup-python@v4 + with: + python-version: '3.10' - name: Run check run: | make check diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 44f6d672740..86e0a3a3caf 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -112,6 +112,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] - Fix streaming input handling of invalid or empty websocket messages. {pull}42036[42036] - Fix awss3 document ID construction when using the CSV decoder. {pull}42019[42019] - Fix Netflow Template Sharing configuration handling. {pull}42080[42080] +- Updated websocket retry error code list to allow more scenarios to be retried which could have been missed previously. {pull}42218[42218] *Heartbeat* diff --git a/NOTICE.txt b/NOTICE.txt index 7c23e33fd13..aab631487da 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -25635,11 +25635,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- Dependency : golang.org/x/net -Version: v0.29.0 +Version: v0.33.0 Licence type (autodetected): BSD-3-Clause -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.29.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.33.0/LICENSE: Copyright 2009 The Go Authors. diff --git a/go.mod b/go.mod index 3f2aad26dba..8b7ad895572 100644 --- a/go.mod +++ b/go.mod @@ -136,7 +136,7 @@ require ( go.uber.org/zap v1.27.0 golang.org/x/crypto v0.31.0 golang.org/x/mod v0.21.0 - golang.org/x/net v0.29.0 + golang.org/x/net v0.33.0 golang.org/x/oauth2 v0.22.0 golang.org/x/sync v0.10.0 golang.org/x/sys v0.28.0 diff --git a/go.sum b/go.sum index b37d21855d2..87a826cecf2 100644 --- a/go.sum +++ b/go.sum @@ -1056,8 +1056,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= diff --git a/x-pack/filebeat/input/streaming/websocket.go b/x-pack/filebeat/input/streaming/websocket.go index 225bc76e8d9..d21eb9c21b4 100644 --- a/x-pack/filebeat/input/streaming/websocket.go +++ b/x-pack/filebeat/input/streaming/websocket.go @@ -176,6 +176,9 @@ func isRetryableError(err error) bool { websocket.CloseInternalServerErr, websocket.CloseTryAgainLater, websocket.CloseServiceRestart, + websocket.CloseAbnormalClosure, + websocket.CloseMessageTooBig, + websocket.CloseNoStatusReceived, websocket.CloseTLSHandshake: return true }