From 985aa1500a012859cec44855e187eacf46eda7c8 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 16 Jul 2024 15:43:18 -0700 Subject: [PATCH] Update to Arrow v17 (#231) Remove a pre-v17 hack that was fixed by https://github.com/apache/arrow/pull/41989. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/34114. --- .../connector/validationconnector/go.mod | 6 +-- .../connector/validationconnector/go.sum | 12 +++--- collector/test/e2e_test.go | 7 ++-- collector/test/go.mod | 11 ++--- collector/test/go.sum | 22 +++++----- go.mod | 20 +++++----- go.sum | 40 +++++++++---------- pkg/arrow/from_array.go | 4 +- pkg/arrow/from_record.go | 4 +- pkg/arrow/from_schema.go | 2 +- pkg/arrow/from_sparseunion.go | 2 +- pkg/arrow/from_struct.go | 4 +- pkg/arrow/list_structs.go | 4 +- pkg/arrow/record.go | 4 +- pkg/arrow/schema.go | 2 +- pkg/benchmark/profileable/arrow/logs.go | 2 +- pkg/benchmark/profileable/arrow/metrics.go | 2 +- pkg/benchmark/profileable/arrow/traces.go | 2 +- pkg/config/config.go | 2 +- pkg/otel/arrow_record/consumer.go | 16 ++------ pkg/otel/arrow_record/logs_dict_test.go | 2 +- pkg/otel/arrow_record/metrics_dict_test.go | 2 +- pkg/otel/arrow_record/producer.go | 6 +-- .../arrow_record/producer_consumer_test.go | 2 +- pkg/otel/arrow_record/traces_dict_test.go | 2 +- pkg/otel/common/arrow/all_test.go | 4 +- pkg/otel/common/arrow/allocator.go | 34 +++------------- pkg/otel/common/arrow/allocator_test.go | 4 +- pkg/otel/common/arrow/any_value.go | 4 +- pkg/otel/common/arrow/attributes.go | 4 +- pkg/otel/common/arrow/attributes_16.go | 2 +- pkg/otel/common/arrow/attributes_32.go | 2 +- pkg/otel/common/arrow/builder.go | 2 +- pkg/otel/common/arrow/dyn_attrs.go | 6 +-- pkg/otel/common/arrow/dyn_attrs_test.go | 6 +-- pkg/otel/common/arrow/related_data.go | 2 +- pkg/otel/common/arrow/resource.go | 4 +- pkg/otel/common/arrow/scope.go | 4 +- pkg/otel/common/arrow/tmo/dyn_attrs_sorted.go | 6 +-- pkg/otel/common/arrow_test/schema_test.go | 4 +- pkg/otel/common/otlp/any_value.go | 2 +- pkg/otel/common/otlp/any_value_test.go | 6 +-- pkg/otel/common/otlp/attributes.go | 2 +- pkg/otel/common/otlp/dyn_attrs.go | 2 +- pkg/otel/common/otlp/dyn_attrs_test.go | 2 +- pkg/otel/common/otlp/resource.go | 2 +- pkg/otel/common/otlp/scope.go | 2 +- pkg/otel/common/schema/builder/binary.go | 2 +- pkg/otel/common/schema/builder/bool.go | 2 +- pkg/otel/common/schema/builder/duration.go | 4 +- pkg/otel/common/schema/builder/float.go | 2 +- pkg/otel/common/schema/builder/int.go | 2 +- pkg/otel/common/schema/builder/list.go | 4 +- pkg/otel/common/schema/builder/map.go | 4 +- pkg/otel/common/schema/builder/record.go | 6 +-- .../common/schema/builder/sparse_union.go | 4 +- pkg/otel/common/schema/builder/string.go | 2 +- pkg/otel/common/schema/builder/struct.go | 4 +- pkg/otel/common/schema/builder/timestamp.go | 4 +- pkg/otel/common/schema/builder/uint.go | 2 +- pkg/otel/common/schema/schema.go | 2 +- .../common/schema/transform/dictionary.go | 2 +- .../schema/transform/dictionary_test.go | 2 +- pkg/otel/common/schema/transform/identity.go | 2 +- pkg/otel/common/schema/transform/no_field.go | 2 +- pkg/otel/common/schema/transform_node.go | 2 +- .../schema/update/schema_update_request.go | 2 +- pkg/otel/common/test_utils.go | 2 +- pkg/otel/logs/arrow/all_test.go | 4 +- pkg/otel/logs/arrow/logs.go | 2 +- pkg/otel/logs/otlp/logs.go | 2 +- pkg/otel/logs/validation_test.go | 4 +- pkg/otel/metrics/arrow/ehistogram_dp.go | 2 +- pkg/otel/metrics/arrow/ehistogram_dpb.go | 4 +- pkg/otel/metrics/arrow/exemplar.go | 2 +- pkg/otel/metrics/arrow/histogram_dp.go | 2 +- pkg/otel/metrics/arrow/metrics.go | 2 +- pkg/otel/metrics/arrow/number_data_point.go | 2 +- pkg/otel/metrics/arrow/quantile_value.go | 4 +- pkg/otel/metrics/arrow/summary_dp.go | 2 +- pkg/otel/metrics/otlp/ehistogram.go | 2 +- pkg/otel/metrics/otlp/ehistogram_dpb.go | 4 +- pkg/otel/metrics/otlp/exemplar.go | 2 +- pkg/otel/metrics/otlp/histogram.go | 4 +- pkg/otel/metrics/otlp/metrics.go | 2 +- pkg/otel/metrics/otlp/number_data_point.go | 2 +- pkg/otel/metrics/otlp/quantile_value.go | 2 +- pkg/otel/metrics/otlp/summary.go | 2 +- pkg/otel/metrics/validation_test.go | 4 +- pkg/otel/observer/producer_observer.go | 2 +- pkg/otel/traces/arrow/all_test.go | 4 +- pkg/otel/traces/arrow/empty_trace_test.go | 4 +- pkg/otel/traces/arrow/event.go | 2 +- pkg/otel/traces/arrow/link.go | 2 +- pkg/otel/traces/arrow/status.go | 4 +- pkg/otel/traces/arrow/traces.go | 2 +- pkg/otel/traces/otlp/event.go | 2 +- pkg/otel/traces/otlp/link.go | 2 +- pkg/otel/traces/otlp/traces.go | 2 +- pkg/otel/traces/validation_test.go | 4 +- pkg/record_message/arrow_record.go | 4 +- tools/data_model_gen/main.go | 2 +- tools/mem_benchmark/main.go | 4 +- tools/trace_producer_simu/main.go | 4 +- 104 files changed, 210 insertions(+), 236 deletions(-) diff --git a/collector/connector/validationconnector/go.mod b/collector/connector/validationconnector/go.mod index 7a66bb83..29c89820 100644 --- a/collector/connector/validationconnector/go.mod +++ b/collector/connector/validationconnector/go.mod @@ -34,9 +34,9 @@ require ( go.opentelemetry.io/otel/metric v1.27.0 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/net v0.26.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/grpc v1.64.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/collector/connector/validationconnector/go.sum b/collector/connector/validationconnector/go.sum index 161abb25..7bbb2f5f 100644 --- a/collector/connector/validationconnector/go.sum +++ b/collector/connector/validationconnector/go.sum @@ -102,20 +102,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/collector/test/e2e_test.go b/collector/test/e2e_test.go index 672e366b..59940385 100644 --- a/collector/test/e2e_test.go +++ b/collector/test/e2e_test.go @@ -6,9 +6,9 @@ package test import ( "context" "encoding/json" - "errors" "fmt" "math/rand" + "regexp" "strings" "sync" "testing" @@ -19,7 +19,6 @@ import ( "github.com/open-telemetry/otel-arrow/collector/testutil" "github.com/open-telemetry/otel-arrow/pkg/datagen" "github.com/open-telemetry/otel-arrow/pkg/otel/assert" - "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" @@ -300,9 +299,11 @@ func logSigs(obs *observer.ObservedLogs) (map[string]int, []string) { return counts, msgs } +var limitRegexp = regexp.MustCompile(`memory limit exceeded`) + func countMemoryLimitErrors(msgs []string) (cnt int) { for _, msg := range msgs { - if _, ok := arrow.NewLimitErrorFromError(errors.New(msg)); ok { + if limitRegexp.MatchString(msg) { cnt++ } } diff --git a/collector/test/go.mod b/collector/test/go.mod index e68aca1b..8a15ddd9 100644 --- a/collector/test/go.mod +++ b/collector/test/go.mod @@ -20,6 +20,7 @@ require ( require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect github.com/apache/arrow/go/v16 v16.1.0 // indirect + github.com/apache/arrow/go/v17 v17.0.0 // indirect github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc // indirect github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -34,15 +35,15 @@ require ( github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/flatbuffers v24.3.25+incompatible // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.7.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.8 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect github.com/knadh/koanf/v2 v2.1.1 // indirect @@ -84,12 +85,12 @@ require ( go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/mod v0.17.0 // indirect + golang.org/x/mod v0.18.0 // indirect golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.21.0 // indirect golang.org/x/text v0.16.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect + golang.org/x/tools v0.22.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/collector/test/go.sum b/collector/test/go.sum index bb78b4ce..bd7444cf 100644 --- a/collector/test/go.sum +++ b/collector/test/go.sum @@ -5,6 +5,8 @@ github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXY github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/apache/arrow/go/v16 v16.1.0 h1:dwgfOya6s03CzH9JrjCBx6bkVb4yPD4ma3haj9p7FXI= github.com/apache/arrow/go/v16 v16.1.0/go.mod h1:9wnc9mn6vEDTRIm4+27pEjQpRKuTvBaessPoEXQzxWA= +github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN5+F54= +github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc= github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc h1:Keo7wQ7UODUaHcEi7ltENhbAK2VgZjfat6mLy03tQzo= github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc/go.mod h1:k08r+Yj1PRAmuayFiRK6MYuR5Ve4IuZtTfxErMIh0+c= github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk= @@ -38,8 +40,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsMBaUOKXq6HSv655U1c= github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= @@ -61,10 +63,10 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs= github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI= github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU= @@ -206,8 +208,8 @@ golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCc golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -237,8 +239,8 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/go.mod b/go.mod index 995c995d..e7f3569b 100644 --- a/go.mod +++ b/go.mod @@ -6,12 +6,12 @@ toolchain go1.22.2 require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 - github.com/apache/arrow/go/v16 v16.1.0 + github.com/apache/arrow/go/v17 v17.0.0 github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc github.com/brianvoe/gofakeit/v6 v6.17.0 github.com/dustin/go-humanize v1.0.1 github.com/fxamacker/cbor/v2 v2.4.0 - github.com/klauspost/compress v1.17.8 + github.com/klauspost/compress v1.17.9 github.com/olekukonko/tablewriter v0.0.5 github.com/pierrec/lz4 v2.0.5+incompatible github.com/stretchr/testify v1.9.0 @@ -23,7 +23,7 @@ require ( go.uber.org/mock v0.4.0 golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 google.golang.org/grpc v1.64.0 - google.golang.org/protobuf v1.34.1 + google.golang.org/protobuf v1.34.2 ) require ( @@ -31,11 +31,11 @@ require ( github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/goccy/go-json v0.10.2 // indirect + github.com/goccy/go-json v0.10.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/flatbuffers v24.3.25+incompatible // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/cpuid/v2 v2.2.7 // indirect + github.com/klauspost/cpuid/v2 v2.2.8 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -46,12 +46,12 @@ require ( github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel/trace v1.27.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.25.0 // indirect + golang.org/x/mod v0.18.0 // indirect + golang.org/x/net v0.26.0 // indirect golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect - golang.org/x/tools v0.21.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.16.0 // indirect + golang.org/x/tools v0.22.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 8c952579..8303c992 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/apache/arrow/go/v16 v16.1.0 h1:dwgfOya6s03CzH9JrjCBx6bkVb4yPD4ma3haj9p7FXI= -github.com/apache/arrow/go/v16 v16.1.0/go.mod h1:9wnc9mn6vEDTRIm4+27pEjQpRKuTvBaessPoEXQzxWA= +github.com/apache/arrow/go/v17 v17.0.0 h1:RRR2bdqKcdbss9Gxy2NS/hK8i4LDMh23L6BbkN5+F54= +github.com/apache/arrow/go/v17 v17.0.0/go.mod h1:jR7QHkODl15PfYyjM2nU+yTLScZ/qfj7OSUZmJ8putc= github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc h1:Keo7wQ7UODUaHcEi7ltENhbAK2VgZjfat6mLy03tQzo= github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc/go.mod h1:k08r+Yj1PRAmuayFiRK6MYuR5Ve4IuZtTfxErMIh0+c= github.com/brianvoe/gofakeit/v6 v6.17.0 h1:obbQTJeHfktJtiZzq0Q1bEpsNUs+yHrYlPVWt7BtmJ4= @@ -26,8 +26,8 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= -github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= +github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= @@ -44,10 +44,10 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= -github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= -github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM= +github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -119,14 +119,14 @@ golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCc golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -137,12 +137,12 @@ golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -150,8 +150,8 @@ golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= -golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -168,8 +168,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 h1: google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= -google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/pkg/arrow/from_array.go b/pkg/arrow/from_array.go index 3d5afb2d..45fe88b5 100644 --- a/pkg/arrow/from_array.go +++ b/pkg/arrow/from_array.go @@ -20,8 +20,8 @@ package arrow // Utility functions to extract values from Arrow arrays. import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/werror" ) diff --git a/pkg/arrow/from_record.go b/pkg/arrow/from_record.go index b1b22a7b..40c7529a 100644 --- a/pkg/arrow/from_record.go +++ b/pkg/arrow/from_record.go @@ -20,8 +20,8 @@ package arrow // Utility functions to extract values from Arrow Records. import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common" "github.com/open-telemetry/otel-arrow/pkg/werror" diff --git a/pkg/arrow/from_schema.go b/pkg/arrow/from_schema.go index fed27132..d3ced9ea 100644 --- a/pkg/arrow/from_schema.go +++ b/pkg/arrow/from_schema.go @@ -20,7 +20,7 @@ package arrow // Utility functions to extract ids from Arrow schemas. import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "github.com/open-telemetry/otel-arrow/pkg/werror" ) diff --git a/pkg/arrow/from_sparseunion.go b/pkg/arrow/from_sparseunion.go index 34239993..2bc83bf5 100644 --- a/pkg/arrow/from_sparseunion.go +++ b/pkg/arrow/from_sparseunion.go @@ -18,7 +18,7 @@ package arrow import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" ) func StructFromSparseUnion(dt *arrow.SparseUnionType, code int8) *arrow.StructType { diff --git a/pkg/arrow/from_struct.go b/pkg/arrow/from_struct.go index bc5dbccc..4dc89439 100644 --- a/pkg/arrow/from_struct.go +++ b/pkg/arrow/from_struct.go @@ -21,8 +21,8 @@ package arrow // Arrow arrays. import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/werror" ) diff --git a/pkg/arrow/list_structs.go b/pkg/arrow/list_structs.go index 35abd282..d83f3d79 100644 --- a/pkg/arrow/list_structs.go +++ b/pkg/arrow/list_structs.go @@ -20,8 +20,8 @@ package arrow // Wrapper around an Arrow list of structs used to expose utility functions. import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pcommon" "github.com/open-telemetry/otel-arrow/pkg/werror" diff --git a/pkg/arrow/record.go b/pkg/arrow/record.go index adec8467..13ea19e9 100644 --- a/pkg/arrow/record.go +++ b/pkg/arrow/record.go @@ -25,8 +25,8 @@ import ( "math" "strings" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/constants" "github.com/open-telemetry/otel-arrow/pkg/werror" diff --git a/pkg/arrow/schema.go b/pkg/arrow/schema.go index 283a0a04..c3df0a5b 100644 --- a/pkg/arrow/schema.go +++ b/pkg/arrow/schema.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" ) // Constants used to create schema id signature. diff --git a/pkg/benchmark/profileable/arrow/logs.go b/pkg/benchmark/profileable/arrow/logs.go index f4a3960c..055ac9e7 100644 --- a/pkg/benchmark/profileable/arrow/logs.go +++ b/pkg/benchmark/profileable/arrow/logs.go @@ -17,7 +17,7 @@ package arrow import ( "io" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "google.golang.org/protobuf/proto" "go.opentelemetry.io/collector/pdata/plog" diff --git a/pkg/benchmark/profileable/arrow/metrics.go b/pkg/benchmark/profileable/arrow/metrics.go index 95115b15..69c73cf9 100644 --- a/pkg/benchmark/profileable/arrow/metrics.go +++ b/pkg/benchmark/profileable/arrow/metrics.go @@ -17,7 +17,7 @@ package arrow import ( "io" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "google.golang.org/protobuf/proto" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/pkg/benchmark/profileable/arrow/traces.go b/pkg/benchmark/profileable/arrow/traces.go index 68a4d122..84c7eff4 100644 --- a/pkg/benchmark/profileable/arrow/traces.go +++ b/pkg/benchmark/profileable/arrow/traces.go @@ -17,7 +17,7 @@ package arrow import ( "io" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "google.golang.org/protobuf/proto" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/config/config.go b/pkg/config/config.go index 3a69767e..c7853e4c 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -22,7 +22,7 @@ package config import ( "math" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/open-telemetry/otel-arrow/pkg/otel/observer" ) diff --git a/pkg/otel/arrow_record/consumer.go b/pkg/otel/arrow_record/consumer.go index dd00561e..99f63eb4 100644 --- a/pkg/otel/arrow_record/consumer.go +++ b/pkg/otel/arrow_record/consumer.go @@ -22,8 +22,8 @@ import ( "log" "math/rand" - "github.com/apache/arrow/go/v16/arrow/ipc" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/ipc" + "github.com/apache/arrow/go/v17/arrow/memory" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -363,7 +363,7 @@ func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) (ibes []*record_mess ipc.WithZstd(), ) if err != nil { - return ibes, werror.Wrap(distinguishMemoryError(err)) + return ibes, werror.Wrap(err) } sc.ipcReader = ipcReader } @@ -378,7 +378,7 @@ func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) (ibes []*record_mess } if err := sc.ipcReader.Err(); err != nil { - return ibes, werror.Wrap(distinguishMemoryError(err)) + return ibes, werror.Wrap(err) } } @@ -389,14 +389,6 @@ func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) (ibes []*record_mess return ibes, nil } -func distinguishMemoryError(err error) error { - limErr, ok := common.NewLimitErrorFromError(err) - if ok { - return limErr - } - return err -} - type runtimeChecker struct{} var _ memory.TestingT = &runtimeChecker{} diff --git a/pkg/otel/arrow_record/logs_dict_test.go b/pkg/otel/arrow_record/logs_dict_test.go index dfcfdd9e..8e5f1fd8 100644 --- a/pkg/otel/arrow_record/logs_dict_test.go +++ b/pkg/otel/arrow_record/logs_dict_test.go @@ -20,7 +20,7 @@ import ( "math" "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/plog/plogotlp" diff --git a/pkg/otel/arrow_record/metrics_dict_test.go b/pkg/otel/arrow_record/metrics_dict_test.go index 8f748503..79ba490a 100644 --- a/pkg/otel/arrow_record/metrics_dict_test.go +++ b/pkg/otel/arrow_record/metrics_dict_test.go @@ -20,7 +20,7 @@ import ( "math" "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" diff --git a/pkg/otel/arrow_record/producer.go b/pkg/otel/arrow_record/producer.go index 35f98be3..a68c005b 100644 --- a/pkg/otel/arrow_record/producer.go +++ b/pkg/otel/arrow_record/producer.go @@ -22,9 +22,9 @@ import ( "time" "github.com/HdrHistogram/hdrhistogram-go" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/ipc" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/ipc" + "github.com/apache/arrow/go/v17/arrow/memory" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/arrow_record/producer_consumer_test.go b/pkg/otel/arrow_record/producer_consumer_test.go index 5df26093..0e773f3d 100644 --- a/pkg/otel/arrow_record/producer_consumer_test.go +++ b/pkg/otel/arrow_record/producer_consumer_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/plog/plogotlp" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" diff --git a/pkg/otel/arrow_record/traces_dict_test.go b/pkg/otel/arrow_record/traces_dict_test.go index 51a40703..6a056670 100644 --- a/pkg/otel/arrow_record/traces_dict_test.go +++ b/pkg/otel/arrow_record/traces_dict_test.go @@ -20,7 +20,7 @@ import ( "math" "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" diff --git a/pkg/otel/common/arrow/all_test.go b/pkg/otel/common/arrow/all_test.go index a2f9c645..b9702e39 100644 --- a/pkg/otel/common/arrow/all_test.go +++ b/pkg/otel/common/arrow/all_test.go @@ -18,8 +18,8 @@ import ( "math" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/otel/common/arrow/allocator.go b/pkg/otel/common/arrow/allocator.go index 64f8b336..2dc6b038 100644 --- a/pkg/otel/common/arrow/allocator.go +++ b/pkg/otel/common/arrow/allocator.go @@ -15,11 +15,10 @@ package arrow import ( + "errors" "fmt" - "regexp" - "strconv" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" ) type LimitedAllocator struct { @@ -45,34 +44,13 @@ type LimitError struct { var _ error = LimitError{} -var limitRegexp = regexp.MustCompile(`memory limit exceeded: requested (\d+) out of (\d+) \(in-use=(\d+)\)`) - // NewLimitErrorFromError extracts a formatted limit error. -// -// Note: the arrow/go package (as of v16) has a panic recovery -// mechanism which formats the error object raised through panic in -// the code below. The formatting uses a "%v" which means we lose the -// error wrapping facility that would let us easily extract the -// object. Therefore, we use a regexp to unpack memory limit errors. -// -// TODO: https://github.com/apache/arrow/pull/41989 has fixed the -// upstream Arrow library, when Arrow v17 is released we can simplify -// this function to unwrap an error vs parse the message. func NewLimitErrorFromError(err error) (error, bool) { - matches := limitRegexp.FindStringSubmatch(err.Error()) - if len(matches) != 4 { - return err, false + var lerr LimitError + if errors.As(err, &lerr) { + return lerr, true } - - req, _ := strconv.ParseUint(matches[1], 10, 64) - lim, _ := strconv.ParseUint(matches[2], 10, 64) - inuse, _ := strconv.ParseUint(matches[3], 10, 64) - - return LimitError{ - Request: req, - Inuse: inuse, - Limit: lim, - }, true + return err, false } func (le LimitError) Error() string { diff --git a/pkg/otel/common/arrow/allocator_test.go b/pkg/otel/common/arrow/allocator_test.go index 5b0fcb8d..2a482c9c 100644 --- a/pkg/otel/common/arrow/allocator_test.go +++ b/pkg/otel/common/arrow/allocator_test.go @@ -19,7 +19,7 @@ import ( "fmt" "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" ) @@ -64,7 +64,7 @@ func TestLimitedAllocatorFormatted(t *testing.T) { Limit: 10000, } - unwrap, ok := NewLimitErrorFromError(fmt.Errorf("some sort of prefix %v some sort of suffix", expect)) + unwrap, ok := NewLimitErrorFromError(fmt.Errorf("some sort of prefix %w some sort of suffix", expect)) require.Error(t, unwrap) require.True(t, ok) require.Equal(t, expect, unwrap) diff --git a/pkg/otel/common/arrow/any_value.go b/pkg/otel/common/arrow/any_value.go index 01f482a5..0fed79e5 100644 --- a/pkg/otel/common/arrow/any_value.go +++ b/pkg/otel/common/arrow/any_value.go @@ -18,8 +18,8 @@ package arrow import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pcommon" "github.com/open-telemetry/otel-arrow/pkg/otel/common" diff --git a/pkg/otel/common/arrow/attributes.go b/pkg/otel/common/arrow/attributes.go index 9c7a3099..8a83e6cd 100644 --- a/pkg/otel/common/arrow/attributes.go +++ b/pkg/otel/common/arrow/attributes.go @@ -22,8 +22,8 @@ import ( "math" "unsafe" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pcommon" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" diff --git a/pkg/otel/common/arrow/attributes_16.go b/pkg/otel/common/arrow/attributes_16.go index 612f124b..78e0abdc 100644 --- a/pkg/otel/common/arrow/attributes_16.go +++ b/pkg/otel/common/arrow/attributes_16.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "github.com/open-telemetry/otel-arrow/pkg/config" diff --git a/pkg/otel/common/arrow/attributes_32.go b/pkg/otel/common/arrow/attributes_32.go index 8f9c7e1a..f46e95f2 100644 --- a/pkg/otel/common/arrow/attributes_32.go +++ b/pkg/otel/common/arrow/attributes_32.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "github.com/open-telemetry/otel-arrow/pkg/config" diff --git a/pkg/otel/common/arrow/builder.go b/pkg/otel/common/arrow/builder.go index fe5b5d98..5edc8ac8 100644 --- a/pkg/otel/common/arrow/builder.go +++ b/pkg/otel/common/arrow/builder.go @@ -15,7 +15,7 @@ package arrow import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/common/arrow/dyn_attrs.go b/pkg/otel/common/arrow/dyn_attrs.go index e1bc0015..81fb52ee 100644 --- a/pkg/otel/common/arrow/dyn_attrs.go +++ b/pkg/otel/common/arrow/dyn_attrs.go @@ -22,9 +22,9 @@ import ( "sort" "strings" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" "go.opentelemetry.io/collector/pdata/pcommon" "github.com/open-telemetry/otel-arrow/pkg/otel/constants" diff --git a/pkg/otel/common/arrow/dyn_attrs_test.go b/pkg/otel/common/arrow/dyn_attrs_test.go index a50fb310..ff51ec11 100644 --- a/pkg/otel/common/arrow/dyn_attrs_test.go +++ b/pkg/otel/common/arrow/dyn_attrs_test.go @@ -20,9 +20,9 @@ package arrow import ( "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/pkg/otel/common/arrow/related_data.go b/pkg/otel/common/arrow/related_data.go index 36f073a8..62fb43f8 100644 --- a/pkg/otel/common/arrow/related_data.go +++ b/pkg/otel/common/arrow/related_data.go @@ -21,7 +21,7 @@ package arrow // For example, `attributes` are related to `resource`, `span`, ... import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" colarspb "github.com/open-telemetry/otel-arrow/api/experimental/arrow/v1" cfg "github.com/open-telemetry/otel-arrow/pkg/config" diff --git a/pkg/otel/common/arrow/resource.go b/pkg/otel/common/arrow/resource.go index 036bfbcc..31a0763d 100644 --- a/pkg/otel/common/arrow/resource.go +++ b/pkg/otel/common/arrow/resource.go @@ -18,8 +18,8 @@ package arrow import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pcommon" schema "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" diff --git a/pkg/otel/common/arrow/scope.go b/pkg/otel/common/arrow/scope.go index f4a9d947..d45d6484 100644 --- a/pkg/otel/common/arrow/scope.go +++ b/pkg/otel/common/arrow/scope.go @@ -18,8 +18,8 @@ package arrow import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pcommon" acommon "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" diff --git a/pkg/otel/common/arrow/tmo/dyn_attrs_sorted.go b/pkg/otel/common/arrow/tmo/dyn_attrs_sorted.go index 2a38d82a..88ba70d3 100644 --- a/pkg/otel/common/arrow/tmo/dyn_attrs_sorted.go +++ b/pkg/otel/common/arrow/tmo/dyn_attrs_sorted.go @@ -22,9 +22,9 @@ import ( "sort" "strings" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/axiomhq/hyperloglog" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/pkg/otel/common/arrow_test/schema_test.go b/pkg/otel/common/arrow_test/schema_test.go index 8313bfc0..13f2b616 100644 --- a/pkg/otel/common/arrow_test/schema_test.go +++ b/pkg/otel/common/arrow_test/schema_test.go @@ -22,8 +22,8 @@ import ( "strconv" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/assert" acommon "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" diff --git a/pkg/otel/common/otlp/any_value.go b/pkg/otel/common/otlp/any_value.go index 0e4e9cbe..2a879d54 100644 --- a/pkg/otel/common/otlp/any_value.go +++ b/pkg/otel/common/otlp/any_value.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pcommon" arrowutils "github.com/open-telemetry/otel-arrow/pkg/arrow" diff --git a/pkg/otel/common/otlp/any_value_test.go b/pkg/otel/common/otlp/any_value_test.go index 62f91a3a..a2dbccc3 100644 --- a/pkg/otel/common/otlp/any_value_test.go +++ b/pkg/otel/common/otlp/any_value_test.go @@ -21,9 +21,9 @@ import ( "math" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/pkg/otel/common/otlp/attributes.go b/pkg/otel/common/otlp/attributes.go index 7ecfc82c..990a3013 100644 --- a/pkg/otel/common/otlp/attributes.go +++ b/pkg/otel/common/otlp/attributes.go @@ -18,7 +18,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" arrowutils "github.com/open-telemetry/otel-arrow/pkg/arrow" diff --git a/pkg/otel/common/otlp/dyn_attrs.go b/pkg/otel/common/otlp/dyn_attrs.go index 61f37540..4fc99671 100644 --- a/pkg/otel/common/otlp/dyn_attrs.go +++ b/pkg/otel/common/otlp/dyn_attrs.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" arrowutils "github.com/open-telemetry/otel-arrow/pkg/arrow" diff --git a/pkg/otel/common/otlp/dyn_attrs_test.go b/pkg/otel/common/otlp/dyn_attrs_test.go index d3c5968e..75e6374e 100644 --- a/pkg/otel/common/otlp/dyn_attrs_test.go +++ b/pkg/otel/common/otlp/dyn_attrs_test.go @@ -20,7 +20,7 @@ package otlp import ( "testing" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pcommon" diff --git a/pkg/otel/common/otlp/resource.go b/pkg/otel/common/otlp/resource.go index 1eccaaef..7069224b 100644 --- a/pkg/otel/common/otlp/resource.go +++ b/pkg/otel/common/otlp/resource.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" arrowutils "github.com/open-telemetry/otel-arrow/pkg/arrow" diff --git a/pkg/otel/common/otlp/scope.go b/pkg/otel/common/otlp/scope.go index 5a1503e3..7f7afb5a 100644 --- a/pkg/otel/common/otlp/scope.go +++ b/pkg/otel/common/otlp/scope.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" arrowutils "github.com/open-telemetry/otel-arrow/pkg/arrow" diff --git a/pkg/otel/common/schema/builder/binary.go b/pkg/otel/common/schema/builder/binary.go index 927b92f9..fee8def1 100644 --- a/pkg/otel/common/schema/builder/binary.go +++ b/pkg/otel/common/schema/builder/binary.go @@ -18,7 +18,7 @@ package builder import ( - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/bool.go b/pkg/otel/common/schema/builder/bool.go index 9f80aeb9..35e401c5 100644 --- a/pkg/otel/common/schema/builder/bool.go +++ b/pkg/otel/common/schema/builder/bool.go @@ -18,7 +18,7 @@ package builder import ( - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/duration.go b/pkg/otel/common/schema/builder/duration.go index d419945d..ae2f271e 100644 --- a/pkg/otel/common/schema/builder/duration.go +++ b/pkg/otel/common/schema/builder/duration.go @@ -20,8 +20,8 @@ package builder // Support of Arrow duration data type. import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/float.go b/pkg/otel/common/schema/builder/float.go index 11d0f016..c3245702 100644 --- a/pkg/otel/common/schema/builder/float.go +++ b/pkg/otel/common/schema/builder/float.go @@ -18,7 +18,7 @@ package builder import ( - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/int.go b/pkg/otel/common/schema/builder/int.go index d75ed495..d02d9fd4 100644 --- a/pkg/otel/common/schema/builder/int.go +++ b/pkg/otel/common/schema/builder/int.go @@ -18,7 +18,7 @@ package builder import ( - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/list.go b/pkg/otel/common/schema/builder/list.go index 2123f15a..cda55deb 100644 --- a/pkg/otel/common/schema/builder/list.go +++ b/pkg/otel/common/schema/builder/list.go @@ -18,8 +18,8 @@ package builder import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/map.go b/pkg/otel/common/schema/builder/map.go index 64454628..f8e087e1 100644 --- a/pkg/otel/common/schema/builder/map.go +++ b/pkg/otel/common/schema/builder/map.go @@ -18,8 +18,8 @@ package builder import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/record.go b/pkg/otel/common/schema/builder/record.go index 33e3de78..af2d9cc2 100644 --- a/pkg/otel/common/schema/builder/record.go +++ b/pkg/otel/common/schema/builder/record.go @@ -20,9 +20,9 @@ package builder import ( "fmt" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" + "github.com/apache/arrow/go/v17/arrow/memory" carrow "github.com/open-telemetry/otel-arrow/pkg/arrow" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" diff --git a/pkg/otel/common/schema/builder/sparse_union.go b/pkg/otel/common/schema/builder/sparse_union.go index 2786e2d9..16172f46 100644 --- a/pkg/otel/common/schema/builder/sparse_union.go +++ b/pkg/otel/common/schema/builder/sparse_union.go @@ -20,8 +20,8 @@ package builder import ( "fmt" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/string.go b/pkg/otel/common/schema/builder/string.go index 64917aa4..49734484 100644 --- a/pkg/otel/common/schema/builder/string.go +++ b/pkg/otel/common/schema/builder/string.go @@ -18,7 +18,7 @@ package builder import ( - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/struct.go b/pkg/otel/common/schema/builder/struct.go index 2340f041..8fc290ba 100644 --- a/pkg/otel/common/schema/builder/struct.go +++ b/pkg/otel/common/schema/builder/struct.go @@ -20,8 +20,8 @@ package builder import ( "fmt" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/timestamp.go b/pkg/otel/common/schema/builder/timestamp.go index 5513412a..9c0c3b93 100644 --- a/pkg/otel/common/schema/builder/timestamp.go +++ b/pkg/otel/common/schema/builder/timestamp.go @@ -18,8 +18,8 @@ package builder import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/builder/uint.go b/pkg/otel/common/schema/builder/uint.go index 4061a1d7..c6667625 100644 --- a/pkg/otel/common/schema/builder/uint.go +++ b/pkg/otel/common/schema/builder/uint.go @@ -20,7 +20,7 @@ package builder import ( "math" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow/array" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/update" diff --git a/pkg/otel/common/schema/schema.go b/pkg/otel/common/schema/schema.go index 2538be77..728e88b1 100644 --- a/pkg/otel/common/schema/schema.go +++ b/pkg/otel/common/schema/schema.go @@ -20,7 +20,7 @@ package schema import ( "errors" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" ) // Metadata constants used to mark fields as optional or dictionary. diff --git a/pkg/otel/common/schema/transform/dictionary.go b/pkg/otel/common/schema/transform/dictionary.go index afa867d1..951dccef 100644 --- a/pkg/otel/common/schema/transform/dictionary.go +++ b/pkg/otel/common/schema/transform/dictionary.go @@ -20,7 +20,7 @@ package transform import ( "math" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" cfg "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/config" events "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/events" diff --git a/pkg/otel/common/schema/transform/dictionary_test.go b/pkg/otel/common/schema/transform/dictionary_test.go index f7beceb0..22b7cfe7 100644 --- a/pkg/otel/common/schema/transform/dictionary_test.go +++ b/pkg/otel/common/schema/transform/dictionary_test.go @@ -21,7 +21,7 @@ import ( "math" "testing" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "github.com/stretchr/testify/assert" cfg "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/config" diff --git a/pkg/otel/common/schema/transform/identity.go b/pkg/otel/common/schema/transform/identity.go index b2d8126b..e020d8f7 100644 --- a/pkg/otel/common/schema/transform/identity.go +++ b/pkg/otel/common/schema/transform/identity.go @@ -17,7 +17,7 @@ package transform -import "github.com/apache/arrow/go/v16/arrow" +import "github.com/apache/arrow/go/v17/arrow" // IdentityField is a FieldTransform that returns a copy of the field. type IdentityField struct { diff --git a/pkg/otel/common/schema/transform/no_field.go b/pkg/otel/common/schema/transform/no_field.go index 56abfe6f..f32e9298 100644 --- a/pkg/otel/common/schema/transform/no_field.go +++ b/pkg/otel/common/schema/transform/no_field.go @@ -17,7 +17,7 @@ package transform -import "github.com/apache/arrow/go/v16/arrow" +import "github.com/apache/arrow/go/v17/arrow" // NoField is a FieldTransform that returns nil, so in practice it removes the // field. diff --git a/pkg/otel/common/schema/transform_node.go b/pkg/otel/common/schema/transform_node.go index 40ddf622..18c1ad1a 100644 --- a/pkg/otel/common/schema/transform_node.go +++ b/pkg/otel/common/schema/transform_node.go @@ -21,7 +21,7 @@ import ( "math" "strconv" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" cfg "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/config" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/events" diff --git a/pkg/otel/common/schema/update/schema_update_request.go b/pkg/otel/common/schema/update/schema_update_request.go index 455cedf9..289ba885 100644 --- a/pkg/otel/common/schema/update/schema_update_request.go +++ b/pkg/otel/common/schema/update/schema_update_request.go @@ -18,7 +18,7 @@ package update import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "github.com/open-telemetry/otel-arrow/pkg/otel/observer" ) diff --git a/pkg/otel/common/test_utils.go b/pkg/otel/common/test_utils.go index b4b6843e..a396911f 100644 --- a/pkg/otel/common/test_utils.go +++ b/pkg/otel/common/test_utils.go @@ -20,7 +20,7 @@ package common import ( "math/rand" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "github.com/open-telemetry/otel-arrow/pkg/record_message" ) diff --git a/pkg/otel/logs/arrow/all_test.go b/pkg/otel/logs/arrow/all_test.go index 92fb3677..5d9f3d26 100644 --- a/pkg/otel/logs/arrow/all_test.go +++ b/pkg/otel/logs/arrow/all_test.go @@ -22,8 +22,8 @@ import ( "math" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/plog" diff --git a/pkg/otel/logs/arrow/logs.go b/pkg/otel/logs/arrow/logs.go index 86aa2ba9..d9446440 100644 --- a/pkg/otel/logs/arrow/logs.go +++ b/pkg/otel/logs/arrow/logs.go @@ -20,7 +20,7 @@ package arrow import ( "math" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" diff --git a/pkg/otel/logs/otlp/logs.go b/pkg/otel/logs/otlp/logs.go index a5a427a9..d8df5593 100644 --- a/pkg/otel/logs/otlp/logs.go +++ b/pkg/otel/logs/otlp/logs.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" diff --git a/pkg/otel/logs/validation_test.go b/pkg/otel/logs/validation_test.go index 733ef83c..9fbe9546 100644 --- a/pkg/otel/logs/validation_test.go +++ b/pkg/otel/logs/validation_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/plog/plogotlp" diff --git a/pkg/otel/metrics/arrow/ehistogram_dp.go b/pkg/otel/metrics/arrow/ehistogram_dp.go index 9301078d..2a112991 100644 --- a/pkg/otel/metrics/arrow/ehistogram_dp.go +++ b/pkg/otel/metrics/arrow/ehistogram_dp.go @@ -30,7 +30,7 @@ import ( "math" "sort" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pmetric" carrow "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/metrics/arrow/ehistogram_dpb.go b/pkg/otel/metrics/arrow/ehistogram_dpb.go index a8ba5d02..6374b49b 100644 --- a/pkg/otel/metrics/arrow/ehistogram_dpb.go +++ b/pkg/otel/metrics/arrow/ehistogram_dpb.go @@ -15,8 +15,8 @@ package arrow import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pmetric" acommon "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/metrics/arrow/exemplar.go b/pkg/otel/metrics/arrow/exemplar.go index 9d094225..382d7680 100644 --- a/pkg/otel/metrics/arrow/exemplar.go +++ b/pkg/otel/metrics/arrow/exemplar.go @@ -21,7 +21,7 @@ import ( "math" "sort" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pmetric" carrow "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/metrics/arrow/histogram_dp.go b/pkg/otel/metrics/arrow/histogram_dp.go index bf960472..9bb65c3f 100644 --- a/pkg/otel/metrics/arrow/histogram_dp.go +++ b/pkg/otel/metrics/arrow/histogram_dp.go @@ -28,7 +28,7 @@ package arrow import ( "sort" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "errors" "math" diff --git a/pkg/otel/metrics/arrow/metrics.go b/pkg/otel/metrics/arrow/metrics.go index 58433481..c191072d 100644 --- a/pkg/otel/metrics/arrow/metrics.go +++ b/pkg/otel/metrics/arrow/metrics.go @@ -17,7 +17,7 @@ package arrow import ( "math" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pmetric" carrow "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/metrics/arrow/number_data_point.go b/pkg/otel/metrics/arrow/number_data_point.go index 723dd550..f4e62ecd 100644 --- a/pkg/otel/metrics/arrow/number_data_point.go +++ b/pkg/otel/metrics/arrow/number_data_point.go @@ -20,7 +20,7 @@ import ( "errors" "sort" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pmetric" carrow "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/metrics/arrow/quantile_value.go b/pkg/otel/metrics/arrow/quantile_value.go index a317b77f..df0a82db 100644 --- a/pkg/otel/metrics/arrow/quantile_value.go +++ b/pkg/otel/metrics/arrow/quantile_value.go @@ -15,8 +15,8 @@ package arrow import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pmetric" carrow "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/metrics/arrow/summary_dp.go b/pkg/otel/metrics/arrow/summary_dp.go index 3d1038b7..aee3a288 100644 --- a/pkg/otel/metrics/arrow/summary_dp.go +++ b/pkg/otel/metrics/arrow/summary_dp.go @@ -19,7 +19,7 @@ import ( "math" "sort" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pmetric" carrow "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/metrics/otlp/ehistogram.go b/pkg/otel/metrics/otlp/ehistogram.go index 028612a7..ca770068 100644 --- a/pkg/otel/metrics/otlp/ehistogram.go +++ b/pkg/otel/metrics/otlp/ehistogram.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/pkg/otel/metrics/otlp/ehistogram_dpb.go b/pkg/otel/metrics/otlp/ehistogram_dpb.go index 61d9c8ed..59281cb3 100644 --- a/pkg/otel/metrics/otlp/ehistogram_dpb.go +++ b/pkg/otel/metrics/otlp/ehistogram_dpb.go @@ -15,8 +15,8 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pmetric" arrowutils "github.com/open-telemetry/otel-arrow/pkg/arrow" diff --git a/pkg/otel/metrics/otlp/exemplar.go b/pkg/otel/metrics/otlp/exemplar.go index 614168e9..8de11211 100644 --- a/pkg/otel/metrics/otlp/exemplar.go +++ b/pkg/otel/metrics/otlp/exemplar.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/pkg/otel/metrics/otlp/histogram.go b/pkg/otel/metrics/otlp/histogram.go index d462e1c6..437b7192 100644 --- a/pkg/otel/metrics/otlp/histogram.go +++ b/pkg/otel/metrics/otlp/histogram.go @@ -15,8 +15,8 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/pkg/otel/metrics/otlp/metrics.go b/pkg/otel/metrics/otlp/metrics.go index e66bc6c7..cc988224 100644 --- a/pkg/otel/metrics/otlp/metrics.go +++ b/pkg/otel/metrics/otlp/metrics.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pmetric" arrowutils "github.com/open-telemetry/otel-arrow/pkg/arrow" diff --git a/pkg/otel/metrics/otlp/number_data_point.go b/pkg/otel/metrics/otlp/number_data_point.go index 2bdc71ca..97a80b20 100644 --- a/pkg/otel/metrics/otlp/number_data_point.go +++ b/pkg/otel/metrics/otlp/number_data_point.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/pkg/otel/metrics/otlp/quantile_value.go b/pkg/otel/metrics/otlp/quantile_value.go index 82c739c2..745a316e 100644 --- a/pkg/otel/metrics/otlp/quantile_value.go +++ b/pkg/otel/metrics/otlp/quantile_value.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pmetric" arrowutils "github.com/open-telemetry/otel-arrow/pkg/arrow" diff --git a/pkg/otel/metrics/otlp/summary.go b/pkg/otel/metrics/otlp/summary.go index 4f9e4a7b..21320402 100644 --- a/pkg/otel/metrics/otlp/summary.go +++ b/pkg/otel/metrics/otlp/summary.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/pkg/otel/metrics/validation_test.go b/pkg/otel/metrics/validation_test.go index 64e2de30..3b77235e 100644 --- a/pkg/otel/metrics/validation_test.go +++ b/pkg/otel/metrics/validation_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" diff --git a/pkg/otel/observer/producer_observer.go b/pkg/otel/observer/producer_observer.go index 6b0d7b01..57d6865f 100644 --- a/pkg/otel/observer/producer_observer.go +++ b/pkg/otel/observer/producer_observer.go @@ -1,7 +1,7 @@ package observer import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "github.com/open-telemetry/otel-arrow/pkg/record_message" ) diff --git a/pkg/otel/traces/arrow/all_test.go b/pkg/otel/traces/arrow/all_test.go index 24882e95..d200f6fe 100644 --- a/pkg/otel/traces/arrow/all_test.go +++ b/pkg/otel/traces/arrow/all_test.go @@ -22,8 +22,8 @@ import ( "math" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/traces/arrow/empty_trace_test.go b/pkg/otel/traces/arrow/empty_trace_test.go index 5bffbb20..c04555ec 100644 --- a/pkg/otel/traces/arrow/empty_trace_test.go +++ b/pkg/otel/traces/arrow/empty_trace_test.go @@ -17,8 +17,8 @@ package arrow import ( "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/traces/arrow/event.go b/pkg/otel/traces/arrow/event.go index e18ccd1b..c2d2baf0 100644 --- a/pkg/otel/traces/arrow/event.go +++ b/pkg/otel/traces/arrow/event.go @@ -30,7 +30,7 @@ import ( "sort" "strings" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/traces/arrow/link.go b/pkg/otel/traces/arrow/link.go index d30080c2..21ed29fa 100644 --- a/pkg/otel/traces/arrow/link.go +++ b/pkg/otel/traces/arrow/link.go @@ -31,7 +31,7 @@ import ( "sort" "strings" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/traces/arrow/status.go b/pkg/otel/traces/arrow/status.go index e3e40e23..14171afc 100644 --- a/pkg/otel/traces/arrow/status.go +++ b/pkg/otel/traces/arrow/status.go @@ -18,8 +18,8 @@ package arrow import ( - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" "go.opentelemetry.io/collector/pdata/ptrace" acommon "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/traces/arrow/traces.go b/pkg/otel/traces/arrow/traces.go index e1dec852..89814218 100644 --- a/pkg/otel/traces/arrow/traces.go +++ b/pkg/otel/traces/arrow/traces.go @@ -20,7 +20,7 @@ package arrow import ( "math" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/ptrace" acommon "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" diff --git a/pkg/otel/traces/otlp/event.go b/pkg/otel/traces/otlp/event.go index b1d0e36f..673989f3 100644 --- a/pkg/otel/traces/otlp/event.go +++ b/pkg/otel/traces/otlp/event.go @@ -15,7 +15,7 @@ package otlp import ( - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/traces/otlp/link.go b/pkg/otel/traces/otlp/link.go index e9f94002..d656b194 100644 --- a/pkg/otel/traces/otlp/link.go +++ b/pkg/otel/traces/otlp/link.go @@ -17,7 +17,7 @@ package otlp import ( "bytes" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/traces/otlp/traces.go b/pkg/otel/traces/otlp/traces.go index d0846bc8..f7c7cb85 100644 --- a/pkg/otel/traces/otlp/traces.go +++ b/pkg/otel/traces/otlp/traces.go @@ -17,7 +17,7 @@ package otlp import ( "time" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/ptrace" diff --git a/pkg/otel/traces/validation_test.go b/pkg/otel/traces/validation_test.go index 02cbc39c..ba7aa8d7 100644 --- a/pkg/otel/traces/validation_test.go +++ b/pkg/otel/traces/validation_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" diff --git a/pkg/record_message/arrow_record.go b/pkg/record_message/arrow_record.go index 8c213efa..1ce9e3f0 100644 --- a/pkg/record_message/arrow_record.go +++ b/pkg/record_message/arrow_record.go @@ -20,8 +20,8 @@ package record_message import ( "fmt" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/array" v1 "github.com/open-telemetry/otel-arrow/api/experimental/arrow/v1" ) diff --git a/tools/data_model_gen/main.go b/tools/data_model_gen/main.go index 917be13e..b4c0fa77 100644 --- a/tools/data_model_gen/main.go +++ b/tools/data_model_gen/main.go @@ -23,7 +23,7 @@ import ( "strings" "text/template" - "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v17/arrow" carrow "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema" diff --git a/tools/mem_benchmark/main.go b/tools/mem_benchmark/main.go index 6a2fea3b..6cacffc5 100644 --- a/tools/mem_benchmark/main.go +++ b/tools/mem_benchmark/main.go @@ -22,8 +22,8 @@ import ( "math" "runtime" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" "github.com/dustin/go-humanize" "github.com/open-telemetry/otel-arrow/pkg/otel/common/schema/builder" diff --git a/tools/trace_producer_simu/main.go b/tools/trace_producer_simu/main.go index 2569f04a..8f4fa953 100644 --- a/tools/trace_producer_simu/main.go +++ b/tools/trace_producer_simu/main.go @@ -23,8 +23,8 @@ import ( "strings" "testing" - "github.com/apache/arrow/go/v16/arrow" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v17/arrow" + "github.com/apache/arrow/go/v17/arrow/memory" arrowpb "github.com/open-telemetry/otel-arrow/api/experimental/arrow/v1" "github.com/open-telemetry/otel-arrow/pkg/benchmark"