Skip to content

Commit 0fc0100

Browse files
mergify[bot]ShourieGkhushijain21
authored
[9.1](backport #45574) [libbeat][chore]: Updated "apache/arrow" library used in parquet reader to v18 (#47087)
* [libbeat][chore]: Updated "apache/arrow" library used in parquet reader to v18 (#45574) Updated "apache/arrow" library used in parquet reader to v18 and fixed gcs tests as a byproduct of errors introduced with newer storage library versions. (cherry picked from commit b7c5a85) # Conflicts: # NOTICE.txt # go.mod # go.sum * fix conflicts --------- Co-authored-by: Shourie Ganguly <[email protected]> Co-authored-by: Khushi Jain <[email protected]>
1 parent 903bc35 commit 0fc0100

File tree

7 files changed

+67
-1609
lines changed

7 files changed

+67
-1609
lines changed

CHANGELOG-developer.next.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,10 @@ unregister input metrics without relaying on the global 'dataset' namespace.{pul
239239
- Improved Filebeat Websocket input exponential backoff logic to produce a smoother backoff curve. {pull}44069[44069]
240240
- Added `autoops_es` module to x-pack/metricbeat. {pull}44565[44565]
241241
- Make `x-pack/libbeat/management.BeatV2Manager.UpdateStatus` a no-op if there is no change in state. {pull}44716[44716]
242+
- Remove usages of `inputmon.NewInputRegistry` on filebeat v2 inputs. {pull}43862[43862] {issue}43860[43860]
243+
- Filebeat filebeat/testing/integration test framework ExpectEOF accounts for closed files and allows to choose to pretty print or not the output. {pull}45023[45023]
244+
- Updated apache/arrow library used in `x-pack/libbeat/reader/parquet` to v18 {issue}45573[45573] {pull}45574[45574]
245+
- Update `dependabot.yml` to include dependencies for Meraki, Haproxy, Salesforce, Vsphere, Redis, Panw, mongodb. {pull}46348[46348]
242246

243247
==== Deprecated
244248

NOTICE.txt

Lines changed: 32 additions & 1574 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ require (
148148
)
149149

150150
require (
151-
cloud.google.com/go v0.120.0
151+
cloud.google.com/go v0.121.0
152152
cloud.google.com/go/compute v1.37.0
153153
cloud.google.com/go/redis v1.18.2
154154
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
@@ -235,7 +235,7 @@ require (
235235
)
236236

237237
require (
238-
github.com/apache/arrow/go/v17 v17.0.0
238+
github.com/apache/arrow-go/v18 v18.4.1
239239
github.com/cilium/ebpf v0.19.0
240240
github.com/otiai10/copy v1.14.1
241241
go.opentelemetry.io/collector/client v1.41.0
@@ -276,13 +276,12 @@ require (
276276
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
277277
github.com/BurntSushi/toml v1.4.0 // indirect
278278
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
279-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 // indirect
280-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 // indirect
281-
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
279+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 // indirect
280+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 // indirect
282281
github.com/andybalholm/brotli v1.2.0 // indirect
283282
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
284283
github.com/apache/arrow/go/v15 v15.0.2 // indirect
285-
github.com/apache/thrift v0.20.0 // indirect
284+
github.com/apache/thrift v0.22.0 // indirect
286285
github.com/armon/go-radix v1.0.0 // indirect
287286
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
288287
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.1 // indirect
@@ -512,7 +511,7 @@ require (
512511
)
513512

514513
require (
515-
cloud.google.com/go/storage v1.50.0
514+
cloud.google.com/go/storage v1.52.0
516515
github.com/PaloAltoNetworks/pango v0.10.2
517516
github.com/dlclark/regexp2 v1.4.0 // indirect
518517
github.com/google/gofuzz v1.2.0 // indirect

go.sum

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
66
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
77
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
88
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
9-
cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA=
10-
cloud.google.com/go v0.120.0/go.mod h1:/beW32s8/pGRuj4IILWQNd4uuebeT4dkOhKmkfit64Q=
9+
cloud.google.com/go v0.121.0 h1:pgfwva8nGw7vivjZiRfrmglGWiCJBP+0OmDpenG/Fwg=
10+
cloud.google.com/go v0.121.0/go.mod h1:rS7Kytwheu/y9buoDmu5EIpMMCI4Mb8ND4aeN4Vwj7Q=
1111
cloud.google.com/go/auth v0.16.2 h1:QvBAGFPLrDeoiNjyfVunhQ10HKNYuOwZ5noee0M5df4=
1212
cloud.google.com/go/auth v0.16.2/go.mod h1:sRBas2Y1fB1vZTdurouM0AzuYQBMZinrUYL8EufhtEA=
1313
cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
@@ -34,8 +34,8 @@ cloud.google.com/go/pubsub v1.49.0 h1:5054IkbslnrMCgA2MAEPcsN3Ky+AyMpEZcii/DoySP
3434
cloud.google.com/go/pubsub v1.49.0/go.mod h1:K1FswTWP+C1tI/nfi3HQecoVeFvL4HUOB1tdaNXKhUY=
3535
cloud.google.com/go/redis v1.18.2 h1:JlHLceAOILEmbn+NIS7l+vmUKkFuobLToCWTxL7NGcQ=
3636
cloud.google.com/go/redis v1.18.2/go.mod h1:q6mPRhLiR2uLf584Lcl4tsiRn0xiFlu6fnJLwCORMtY=
37-
cloud.google.com/go/storage v1.50.0 h1:3TbVkzTooBvnZsk7WaAQfOsNrdoM8QHusXA1cpk6QJs=
38-
cloud.google.com/go/storage v1.50.0/go.mod h1:l7XeiD//vx5lfqE3RavfmU9yvk5Pp0Zhcv482poyafY=
37+
cloud.google.com/go/storage v1.52.0 h1:ROpzMW/IwipKtatA69ikxibdzQSiXJrY9f6IgBa9AlA=
38+
cloud.google.com/go/storage v1.52.0/go.mod h1:4wrBAbAYUvYkbrf19ahGm4I5kDQhESSqN3CGEkMGvOY=
3939
cloud.google.com/go/trace v1.11.6 h1:2O2zjPzqPYAHrn3OKl029qlqG6W8ZdYaOWRyr8NgMT4=
4040
cloud.google.com/go/trace v1.11.6/go.mod h1:GA855OeDEBiBMzcckLPE2kDunIpC72N+Pq8WFieFjnI=
4141
code.cloudfoundry.org/go-diodes v0.0.0-20190809170250-f77fb823c7ee h1:iAAPf9s7/+BIiGf+RjgcXLm3NoZaLIJsBXJuUa63Lx8=
@@ -132,14 +132,12 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0
132132
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
133133
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 h1:UQUsRi8WTzhZntp5313l+CHIAT95ojUI2lpP/ExlZa4=
134134
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0/go.mod h1:Cz6ft6Dkn3Et6l2v2a9/RpN7epQ1GtDlO6lj8bEcOvw=
135-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0 h1:5IT7xOdq17MtcdtL/vtl6mGfzhaq4m4vpollPRmlsBQ=
136-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.50.0/go.mod h1:ZV4VOm0/eHR06JLrXWe09068dHpr3TRpY9Uo7T+anuA=
137-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0 h1:nNMpRpnkWDAaqcpxMJvxa/Ud98gjbYwayJY4/9bdjiU=
138-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.50.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
139-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0 h1:ig/FpDD2JofP/NExKQUbn7uOSZzJAQqogfqluZK4ed4=
140-
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.50.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
141-
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c h1:RGWPOewvKIROun94nF7v2cua9qP+thov/7M50KEoeSU=
142-
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
135+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0 h1:fYE9p3esPxA/C0rQ0AHhP0drtPXDRhaWiwg1DPqO7IU=
136+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.51.0/go.mod h1:BnBReJLvVYx2CS/UHOgVz2BXKXD9wsQPxZug20nZhd0=
137+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0 h1:OqVGm6Ei3x5+yZmSJG1Mh2NwHvpVmZ08CB5qJhT9Nuk=
138+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/cloudmock v0.51.0/go.mod h1:SZiPHWGOOk3bl8tkevxkoiwPgsIl6CwrWcbwjfHZpdM=
139+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0 h1:6/0iUd0xrnX7qt+mLNRwg5c0PGv8wpE8K90ryANQwMI=
140+
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.51.0/go.mod h1:otE2jQekW/PqXk1Awf5lmfokJx4uwuqcj1ab5SpGeW0=
143141
github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
144142
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
145143
github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
@@ -169,12 +167,12 @@ github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwTo
169167
github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
170168
github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
171169
github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
170+
github.com/apache/arrow-go/v18 v18.4.1 h1:q/jVkBWCJOB9reDgaIZIdruLQUb1kbkvOnOFezVH1C4=
171+
github.com/apache/arrow-go/v18 v18.4.1/go.mod h1:tLyFubsAl17bvFdUAy24bsSvA/6ww95Iqi67fTpGu3E=
172172
github.com/apache/arrow/go/v15 v15.0.2 h1:60IliRbiyTWCWjERBCkO1W4Qun9svcYoZrSLcyOsMLE=
173173
github.com/apache/arrow/go/v15 v15.0.2/go.mod h1:DGXsR3ajT524njufqf95822i+KTh+yea1jass9YXgjA=
174-
github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN5+F54=
175-
github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc=
176-
github.com/apache/thrift v0.20.0 h1:631+KvYbsBZxmuJjYwhezVsrfc/TbqtZV4QcxOX1fOI=
177-
github.com/apache/thrift v0.20.0/go.mod h1:hOk1BQqcp2OLzGsyVXdfMk7YFlMxK3aoEVhjD06QhB8=
174+
github.com/apache/thrift v0.22.0 h1:r7mTJdj51TMDe6RtcmNdQxgn9XcyfGDOzegMDRg47uc=
175+
github.com/apache/thrift v0.22.0/go.mod h1:1e7J/O1Ae6ZQMTYdy9xa3w9k+XHWPfRvdPyJeynQ+/g=
178176
github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI=
179177
github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
180178
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=

x-pack/filebeat/input/gcs/input_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ func Test_StorageClient(t *testing.T) {
159159
},
160160
mockHandler: mock.GCSServer,
161161
expected: map[string]bool{},
162-
isError: errors.New("storage: bucket doesn't exist"),
162+
isError: errors.New("storage: bucket doesn't exist: googleapi: got HTTP response code 404 with body: "),
163163
},
164164
{
165165
name: "SingleBucketWithoutPoll_InvalidBucketErr",
@@ -177,7 +177,7 @@ func Test_StorageClient(t *testing.T) {
177177
},
178178
mockHandler: mock.GCSServer,
179179
expected: map[string]bool{},
180-
isError: errors.New("storage: bucket doesn't exist"),
180+
isError: errors.New("storage: bucket doesn't exist: googleapi: got HTTP response code 404 with body: "),
181181
},
182182
{
183183
name: "TwoBucketsWithPoll_InvalidBucketErr",
@@ -198,7 +198,7 @@ func Test_StorageClient(t *testing.T) {
198198
},
199199
mockHandler: mock.GCSServer,
200200
expected: map[string]bool{},
201-
isError: errors.New("storage: bucket doesn't exist"),
201+
isError: errors.New("storage: bucket doesn't exist: googleapi: got HTTP response code 404 with body: "),
202202
},
203203
{
204204
name: "SingleBucketWithPoll_InvalidConfigValue",

x-pack/libbeat/reader/parquet/parquet.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"fmt"
1111
"io"
1212

13-
"github.com/apache/arrow/go/v17/arrow/memory"
14-
"github.com/apache/arrow/go/v17/parquet"
15-
"github.com/apache/arrow/go/v17/parquet/file"
16-
"github.com/apache/arrow/go/v17/parquet/pqarrow"
13+
"github.com/apache/arrow-go/v18/arrow/memory"
14+
"github.com/apache/arrow-go/v18/parquet"
15+
"github.com/apache/arrow-go/v18/parquet/file"
16+
"github.com/apache/arrow-go/v18/parquet/pqarrow"
1717

1818
"github.com/elastic/elastic-agent-libs/logp"
1919
)

x-pack/libbeat/reader/parquet/parquet_test.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"path/filepath"
1515
"testing"
1616

17-
"github.com/apache/arrow/go/v17/arrow"
18-
"github.com/apache/arrow/go/v17/arrow/array"
19-
"github.com/apache/arrow/go/v17/arrow/memory"
20-
"github.com/apache/arrow/go/v17/parquet/pqarrow"
17+
"github.com/apache/arrow-go/v18/arrow"
18+
"github.com/apache/arrow-go/v18/arrow/array"
19+
"github.com/apache/arrow-go/v18/arrow/memory"
20+
"github.com/apache/arrow-go/v18/parquet/pqarrow"
2121
"github.com/stretchr/testify/assert"
2222

2323
"github.com/elastic/elastic-agent-libs/logp"
@@ -197,7 +197,6 @@ func TestParquetWithFiles(t *testing.T) {
197197
for _, tc := range testCases {
198198
name := fmt.Sprintf("Test parquet files with source file=%s, and target comparison file=%s", tc.parquetFile, tc.jsonFile)
199199
t.Run(name, func(t *testing.T) {
200-
201200
parquetFile, err := os.Open(filepath.Join(testDataPath, tc.parquetFile))
202201
if err != nil {
203202
t.Fatalf("Failed to open parquet test file: %v", err)

0 commit comments

Comments
 (0)