From 0c3f03dcb67d7a26dd917db89b183c74fa7a61eb Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Mon, 3 Jun 2024 09:59:20 -0700 Subject: [PATCH 01/15] simple refactor --- collector/test/e2e_test.go | 89 +++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/collector/test/e2e_test.go b/collector/test/e2e_test.go index 7492b00b47..10df40f822 100644 --- a/collector/test/e2e_test.go +++ b/collector/test/e2e_test.go @@ -44,11 +44,8 @@ func (tc *testConsumer) ConsumeTraces(ctx context.Context, td ptrace.Traces) err return tc.sink.ConsumeTraces(ctx, td) } -func TestIntegrationSimpleTraces(t *testing.T) { - const ( - threadCount = 10 - requestCount = 100 - ) +func basicTestConfig(t *testing.T, cfgF func(*otelarrowexporter.Config, *otelarrowreceiver.Config)) (*testConsumer, exporter.Traces, receiver.Traces) { + ctx := context.Background() efact := otelarrowexporter.NewFactory() rfact := otelarrowreceiver.NewFactory() @@ -70,14 +67,13 @@ func TestIntegrationSimpleTraces(t *testing.T) { exporterCfg.RetryConfig.Enabled = false exporterCfg.Arrow.NumStreams = 1 - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() + if cfgF != nil { + cfgF(exporterCfg, receiverCfg) + } tset := componenttest.NewNopTelemetrySettings() tset.Logger, _ = zap.NewDevelopment() - host := componenttest.NewNopHost() - testCon := &testConsumer{} receiver, err := rfact.CreateTracesReceiver(ctx, receiver.CreateSettings{ @@ -92,6 +88,54 @@ func TestIntegrationSimpleTraces(t *testing.T) { }, exporterCfg) require.NoError(t, err) + return testCon, exporter, receiver + +} + +func makeTestTraces(i int) ptrace.Traces { + td := ptrace.NewTraces() + td.ResourceSpans().AppendEmpty().Resource().Attributes().PutStr("resource-attr", fmt.Sprint("resource-attr-val-", i)) + + ss := td.ResourceSpans().At(0).ScopeSpans().AppendEmpty().Spans() + span := ss.AppendEmpty() + + span.SetName("operationA") + span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) + span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now())) + + span.SetTraceID(testutil.UInt64ToTraceID(rand.Uint64(), rand.Uint64())) + span.SetSpanID(testutil.UInt64ToSpanID(rand.Uint64())) + evs := span.Events() + ev0 := evs.AppendEmpty() + ev0.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + ev0.SetName("event-with-attr") + ev0.Attributes().PutStr("span-event-attr", "span-event-attr-val") + ev0.SetDroppedAttributesCount(2) + ev1 := evs.AppendEmpty() + ev1.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + ev1.SetName("event") + ev1.SetDroppedAttributesCount(2) + span.SetDroppedEventsCount(1) + status := span.Status() + status.SetCode(ptrace.StatusCodeError) + status.SetMessage("status-cancelled") + + return td +} + +func TestIntegrationSimpleTraces(t *testing.T) { + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + host := componenttest.NewNopHost() + + testCon, exporter, receiver := basicTestConfig(t, nil) + + const ( + threadCount = 10 + requestCount = 100 + ) + var startWG sync.WaitGroup var exporterShutdownWG sync.WaitGroup var startExporterShutdownWG sync.WaitGroup @@ -130,32 +174,7 @@ func TestIntegrationSimpleTraces(t *testing.T) { go func() { defer clientDoneWG.Done() for i := 0; i < requestCount; i++ { - td := ptrace.NewTraces() - td.ResourceSpans().AppendEmpty().Resource().Attributes().PutStr("resource-attr", fmt.Sprint("resource-attr-val-", i)) - - ss := td.ResourceSpans().At(0).ScopeSpans().AppendEmpty().Spans() - span := ss.AppendEmpty() - - span.SetName("operationA") - span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) - span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now())) - - span.SetTraceID(testutil.UInt64ToTraceID(rand.Uint64(), rand.Uint64())) - span.SetSpanID(testutil.UInt64ToSpanID(rand.Uint64())) - evs := span.Events() - ev0 := evs.AppendEmpty() - ev0.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) - ev0.SetName("event-with-attr") - ev0.Attributes().PutStr("span-event-attr", "span-event-attr-val") - ev0.SetDroppedAttributesCount(2) - ev1 := evs.AppendEmpty() - ev1.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) - ev1.SetName("event") - ev1.SetDroppedAttributesCount(2) - span.SetDroppedEventsCount(1) - status := span.Status() - status.SetCode(ptrace.StatusCodeError) - status.SetMessage("status-cancelled") + td := makeTestTraces(i) require.NoError(t, exporter.ConsumeTraces(ctx, td)) expect[num] = append(expect[num], td) From 1a05525a39490ea22cc3ae04c4907d79a86ddceb Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Mon, 3 Jun 2024 10:04:04 -0700 Subject: [PATCH 02/15] test w/ more streams --- collector/test/e2e_test.go | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/collector/test/e2e_test.go b/collector/test/e2e_test.go index 10df40f822..4c5a39df9d 100644 --- a/collector/test/e2e_test.go +++ b/collector/test/e2e_test.go @@ -33,6 +33,9 @@ type testConsumer struct { sink consumertest.TracesSink } +type ExpConfig = otelarrowexporter.Config +type RecvConfig = otelarrowreceiver.Config + var _ consumer.Traces = &testConsumer{} func (*testConsumer) Capabilities() consumer.Capabilities { @@ -44,7 +47,7 @@ func (tc *testConsumer) ConsumeTraces(ctx context.Context, td ptrace.Traces) err return tc.sink.ConsumeTraces(ctx, td) } -func basicTestConfig(t *testing.T, cfgF func(*otelarrowexporter.Config, *otelarrowreceiver.Config)) (*testConsumer, exporter.Traces, receiver.Traces) { +func basicTestConfig(t *testing.T, cfgF func(*ExpConfig, *RecvConfig)) (*testConsumer, exporter.Traces, receiver.Traces) { ctx := context.Background() efact := otelarrowexporter.NewFactory() @@ -53,8 +56,8 @@ func basicTestConfig(t *testing.T, cfgF func(*otelarrowexporter.Config, *otelarr ecfg := efact.CreateDefaultConfig() rcfg := rfact.CreateDefaultConfig() - receiverCfg := rcfg.(*otelarrowreceiver.Config) - exporterCfg := ecfg.(*otelarrowexporter.Config) + receiverCfg := rcfg.(*RecvConfig) + exporterCfg := ecfg.(*ExpConfig) addr := testutil.GetAvailableLocalAddress(t) @@ -124,12 +127,22 @@ func makeTestTraces(i int) ptrace.Traces { } func TestIntegrationSimpleTraces(t *testing.T) { + for _, n := range []int{1, 2, 4, 8} { + t.Run(fmt.Sprint(n), func(t *testing.T) { + testIntegrationSimpleTraces(t, n) + }) + } +} + +func testIntegrationSimpleTraces(t *testing.T, n int) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() host := componenttest.NewNopHost() - testCon, exporter, receiver := basicTestConfig(t, nil) + testCon, exporter, receiver := basicTestConfig(t, func(ecfg *ExpConfig, rcfg *RecvConfig) { + ecfg.Arrow.NumStreams = n + }) const ( threadCount = 10 From c9d7adce5658373e599f085dd95d1932898f1fe6 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Mon, 3 Jun 2024 11:57:19 -0700 Subject: [PATCH 03/15] handle reader error --- pkg/otel/arrow_record/consumer.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/otel/arrow_record/consumer.go b/pkg/otel/arrow_record/consumer.go index 8bb67172f0..d27e362f1a 100644 --- a/pkg/otel/arrow_record/consumer.go +++ b/pkg/otel/arrow_record/consumer.go @@ -370,6 +370,10 @@ func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) ([]*record_message.R rec.Retain() ibes = append(ibes, record_message.NewRecordMessage(bar.BatchId, payload.GetType(), rec)) } + + if err := sc.ipcReader.Err(); err != nil { + return nil, werror.Wrap(err) + } } if len(ibes) < len(bar.ArrowPayloads) { From ffe57580d7e6f3e08bb6d24f8097aae59067fb60 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Mon, 3 Jun 2024 11:57:33 -0700 Subject: [PATCH 04/15] refactor for reuse --- collector/test/e2e_test.go | 43 +++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/collector/test/e2e_test.go b/collector/test/e2e_test.go index 4c5a39df9d..f095f9f219 100644 --- a/collector/test/e2e_test.go +++ b/collector/test/e2e_test.go @@ -15,6 +15,7 @@ import ( "github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter" "github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver" "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/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -35,6 +36,9 @@ type testConsumer struct { type ExpConfig = otelarrowexporter.Config type RecvConfig = otelarrowreceiver.Config +type CfgFunc func(*ExpConfig, *RecvConfig) +type GenFunc func(int) ptrace.Traces +type MkGen func() GenFunc var _ consumer.Traces = &testConsumer{} @@ -47,7 +51,7 @@ func (tc *testConsumer) ConsumeTraces(ctx context.Context, td ptrace.Traces) err return tc.sink.ConsumeTraces(ctx, td) } -func basicTestConfig(t *testing.T, cfgF func(*ExpConfig, *RecvConfig)) (*testConsumer, exporter.Traces, receiver.Traces) { +func basicTestConfig(t *testing.T, cfgF CfgFunc) (*testConsumer, exporter.Traces, receiver.Traces) { ctx := context.Background() efact := otelarrowexporter.NewFactory() @@ -126,23 +130,23 @@ func makeTestTraces(i int) ptrace.Traces { return td } -func TestIntegrationSimpleTraces(t *testing.T) { +func TestIntegrationTracesSimple(t *testing.T) { for _, n := range []int{1, 2, 4, 8} { t.Run(fmt.Sprint(n), func(t *testing.T) { - testIntegrationSimpleTraces(t, n) + testIntegrationTraces(t, func(ecfg *ExpConfig, rcfg *RecvConfig) { + ecfg.Arrow.NumStreams = n + }, func() GenFunc { return makeTestTraces }) }) } } -func testIntegrationSimpleTraces(t *testing.T, n int) { +func testIntegrationTraces(t *testing.T, cfgf CfgFunc, mkgen MkGen) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() host := componenttest.NewNopHost() - testCon, exporter, receiver := basicTestConfig(t, func(ecfg *ExpConfig, rcfg *RecvConfig) { - ecfg.Arrow.NumStreams = n - }) + testCon, exporter, receiver := basicTestConfig(t, cfgf) const ( threadCount = 10 @@ -186,8 +190,9 @@ func testIntegrationSimpleTraces(t *testing.T, n int) { clientDoneWG.Add(1) go func() { defer clientDoneWG.Done() + generator := mkgen() for i := 0; i < requestCount; i++ { - td := makeTestTraces(i) + td := generator(i) require.NoError(t, exporter.ConsumeTraces(ctx, td)) expect[num] = append(expect[num], td) @@ -221,3 +226,25 @@ func testIntegrationSimpleTraces(t *testing.T, n int) { asserter := assert.NewStdUnitTest(t) assert.Equiv(asserter, expectJSON, receivedJSON) } + +func bulkyGenFunc() MkGen { + return func() GenFunc { + entropy := datagen.NewTestEntropy(int64(rand.Uint64())) //nolint:gosec // only used for testing + + tracesGen := datagen.NewTracesGenerator( + entropy, + entropy.NewStandardResourceAttributes(), + entropy.NewStandardInstrumentationScopes(), + ) + return func(_ int) ptrace.Traces { + return tracesGen.Generate(1000, time.Minute) + } + } + +} + +func TestIntegrationTracesLimited(t *testing.T) { + testIntegrationTraces(t, func(ecfg *ExpConfig, rcfg *RecvConfig) { + rcfg.Arrow.MemoryLimitMiB = 1 + }, bulkyGenFunc()) +} From f0bdffb2f79b53497f18c8e6b1f3c4260588261b Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Mon, 3 Jun 2024 12:08:45 -0700 Subject: [PATCH 05/15] missing release --- pkg/otel/arrow_record/consumer.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/otel/arrow_record/consumer.go b/pkg/otel/arrow_record/consumer.go index d27e362f1a..d3fb20dd9a 100644 --- a/pkg/otel/arrow_record/consumer.go +++ b/pkg/otel/arrow_record/consumer.go @@ -21,8 +21,8 @@ import ( "log" "math/rand" - "github.com/apache/arrow/go/v14/arrow/ipc" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow/ipc" + "github.com/apache/arrow/go/v16/arrow/memory" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -372,6 +372,7 @@ func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) ([]*record_message.R } if err := sc.ipcReader.Err(); err != nil { + releaseRecords(ibes) return nil, werror.Wrap(err) } } From 2d7c1a2fd5d02ae6003f93d89a91653319f1f49f Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Mon, 3 Jun 2024 12:08:53 -0700 Subject: [PATCH 06/15] arrow v16 --- collector/cmd/otelarrowcol/go.mod | 11 ------- collector/cmd/otelarrowcol/go.sum | 20 +++++++++++++ .../connector/validationconnector/go.mod | 11 ------- .../connector/validationconnector/go.sum | 2 ++ collector/examples/printer/go.mod | 11 ------- collector/exporter/fileexporter/go.mod | 11 ------- collector/exporter/fileexporter/go.sum | 2 ++ collector/exporter/otelarrowexporter/go.mod | 27 ++++++----------- collector/exporter/otelarrowexporter/go.sum | 30 +++++++++++-------- .../exporter/otelarrowexporter/otelarrow.go | 2 +- collector/go.mod | 13 +------- .../processor/concurrentbatchprocessor/go.mod | 11 ------- .../processor/experimentprocessor/go.mod | 11 ------- .../processor/obfuscationprocessor/go.mod | 11 ------- collector/receiver/filereceiver/go.mod | 11 ------- collector/receiver/otelarrowreceiver/go.mod | 12 +------- collector/receiver/otelarrowreceiver/go.sum | 4 +++ collector/test/go.mod | 29 +++++++++++++----- go.mod | 15 +++++----- go.sum | 28 ++++++++--------- 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/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 | 2 +- pkg/otel/common/arrow/allocator_test.go | 2 +- 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 +-- 116 files changed, 239 insertions(+), 311 deletions(-) diff --git a/collector/cmd/otelarrowcol/go.mod b/collector/cmd/otelarrowcol/go.mod index ccc2cb80c9..0eeb10cbec 100644 --- a/collector/cmd/otelarrowcol/go.mod +++ b/collector/cmd/otelarrowcol/go.mod @@ -168,14 +168,3 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/cmd/otelarrowcol/go.sum b/collector/cmd/otelarrowcol/go.sum index c5ecf1ee8b..0c0bb942a2 100644 --- a/collector/cmd/otelarrowcol/go.sum +++ b/collector/cmd/otelarrowcol/go.sum @@ -798,6 +798,26 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextensi github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.98.0/go.mod h1:b5y3WDWK6mqTL6U6eGqDqK2F3O9GncmvtsWmQ03UoVk= github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.98.0 h1:rbfZJ4YA82WSC9HW2jgmY1UZEsOYte8VTjrBFU6dv5Y= github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.98.0/go.mod h1:KOTp7iN8sWTmqk/SxbMqvM2KXUdgXRWb6hI84E5arLY= +github.com/open-telemetry/otel-arrow v0.23.0 h1:Vx4q3GR36l9O+S7ZOOITNL1TPp+X1WxkXbeXQA146k0= +github.com/open-telemetry/otel-arrow v0.23.0/go.mod h1:F50XFaiNfkfB0MYftZIUKFULm6pxfGqjbgQzevi+65M= +github.com/open-telemetry/otel-arrow/collector v0.23.0 h1:ztmq1ipJBhm4xWjHDbmKOtgP3Nl/ZDoLX+3ThhzFs6k= +github.com/open-telemetry/otel-arrow/collector v0.23.0/go.mod h1:SLgLEhhcfR9MjG1taK8RPuwiuIoAPW7IpCjFBobwIUM= +github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.23.0 h1:z+8TgIHKEl+N07cvT1iBtRyHIEt5PV7qIoHkj/1SyzA= +github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.23.0/go.mod h1:ENs2Gvs5UE4FfNCGhSo8W2uPR6biUw+Kfvcb1TFcMEE= +github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.23.0 h1:lJTLqiUMoi3k9XtJwXGYEuNWJuketsWBgeKESCyEaaM= +github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.23.0/go.mod h1:v5G4bALC/t97jLfBdAOGAtG853MJSzg0Kq3ghKIZJm0= +github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.23.0 h1:uAWR1ZIiXXHIxUnPQhbWJvs2eHvZMEhcEnZvyQKsLq4= +github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.23.0/go.mod h1:69lDwg/ju5fsX0K+XYMg6w0EPgZmp28riVwhmpxfiY8= +github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.23.0 h1:bZJ/IjfcuBzOCpnBXIG2+im0wR2dNZD0bfxZy2H5TM0= +github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.23.0/go.mod h1:qrE3SCE5c/8CMWdwB6ixCUkMVl9sLxZGuHMvUKU7cYo= +github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.23.0 h1:FH4JrI5FPeM84X8RBGXzW/5hejClnYtBZRLoO/5ZOSg= +github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.23.0/go.mod h1:JZ6xq9onjfAV1jFyWtLY24hu0JEFxwao6PHZRylo4nE= +github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.23.0 h1:v1XNOqWdy3ZU4oyblQqmYXFxJXFCjOYJ7uujkW3YxhQ= +github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.23.0/go.mod h1:qyl1H6sgNa/F5slhp0KOONKrO7XLUB9g2wRPsaWmlgI= +github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.23.0 h1:N517+uXF1bMMnEfGXQMCaflqI3m5W+1OLg/EY8hd5vw= +github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.23.0/go.mod h1:H3tNxUt4HDPDYkvXWebetQckS66OQSjWvSLmKQwBVdQ= +github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.23.0 h1:HTjZetc7n+PHVZ+ih6BZV4omd9rbufmdSQdzjwuPxuU= +github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.23.0/go.mod h1:x7vy8cEz76eZirkkPe2dbtKAwZdokmq2wq3c/u9+k8A= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= diff --git a/collector/connector/validationconnector/go.mod b/collector/connector/validationconnector/go.mod index 089bb209cf..a6b1a87099 100644 --- a/collector/connector/validationconnector/go.mod +++ b/collector/connector/validationconnector/go.mod @@ -42,14 +42,3 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/connector/validationconnector/go.sum b/collector/connector/validationconnector/go.sum index 213e7ed929..2fa618847a 100644 --- a/collector/connector/validationconnector/go.sum +++ b/collector/connector/validationconnector/go.sum @@ -39,6 +39,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/open-telemetry/otel-arrow v0.23.0 h1:Vx4q3GR36l9O+S7ZOOITNL1TPp+X1WxkXbeXQA146k0= +github.com/open-telemetry/otel-arrow v0.23.0/go.mod h1:F50XFaiNfkfB0MYftZIUKFULm6pxfGqjbgQzevi+65M= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= diff --git a/collector/examples/printer/go.mod b/collector/examples/printer/go.mod index 7c2247ce33..d059ddad17 100644 --- a/collector/examples/printer/go.mod +++ b/collector/examples/printer/go.mod @@ -19,14 +19,3 @@ require ( google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.33.0 // indirect ) - - - - - - - - - - - diff --git a/collector/exporter/fileexporter/go.mod b/collector/exporter/fileexporter/go.mod index 2d24c157a7..897e4ab3e1 100644 --- a/collector/exporter/fileexporter/go.mod +++ b/collector/exporter/fileexporter/go.mod @@ -60,14 +60,3 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/exporter/fileexporter/go.sum b/collector/exporter/fileexporter/go.sum index fa1292d876..d6ce3185fc 100644 --- a/collector/exporter/fileexporter/go.sum +++ b/collector/exporter/fileexporter/go.sum @@ -46,6 +46,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/open-telemetry/otel-arrow/collector v0.23.0 h1:ztmq1ipJBhm4xWjHDbmKOtgP3Nl/ZDoLX+3ThhzFs6k= +github.com/open-telemetry/otel-arrow/collector v0.23.0/go.mod h1:SLgLEhhcfR9MjG1taK8RPuwiuIoAPW7IpCjFBobwIUM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= diff --git a/collector/exporter/otelarrowexporter/go.mod b/collector/exporter/otelarrowexporter/go.mod index 944519fa3f..ae4db40444 100644 --- a/collector/exporter/otelarrowexporter/go.mod +++ b/collector/exporter/otelarrowexporter/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.4 require ( - github.com/apache/arrow/go/v14 v14.0.2 + github.com/apache/arrow/go/v16 v16.1.0 github.com/open-telemetry/otel-arrow v0.23.0 github.com/open-telemetry/otel-arrow/collector v0.23.0 github.com/stretchr/testify v1.9.0 @@ -24,7 +24,6 @@ require ( go.opentelemetry.io/collector/extension/auth v0.98.0 go.opentelemetry.io/collector/pdata v1.5.0 go.opentelemetry.io/otel v1.25.0 - go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/mock v0.4.0 go.uber.org/multierr v1.11.0 @@ -37,6 +36,7 @@ require ( require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect + github.com/apache/arrow/go/v14 v14.0.2 // indirect github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect @@ -51,12 +51,12 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect - github.com/google/flatbuffers v23.5.26+incompatible // indirect + github.com/google/flatbuffers v24.3.25+incompatible // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.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.5 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // 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 @@ -65,7 +65,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.2 // indirect - github.com/pierrec/lz4/v4 v4.1.18 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect @@ -80,23 +80,14 @@ require ( go.opentelemetry.io/collector/receiver v0.98.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect + go.opentelemetry.io/otel/metric v1.25.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect - golang.org/x/mod v0.14.0 // indirect + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect + golang.org/x/mod v0.16.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.15.0 // indirect + golang.org/x/tools v0.19.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/exporter/otelarrowexporter/go.sum b/collector/exporter/otelarrowexporter/go.sum index 5a63f8645a..b9715985fe 100644 --- a/collector/exporter/otelarrowexporter/go.sum +++ b/collector/exporter/otelarrowexporter/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/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= +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/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/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -41,8 +43,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= -github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI= +github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -58,8 +60,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI 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.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +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/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= @@ -84,8 +86,12 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= -github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/open-telemetry/otel-arrow v0.23.0 h1:Vx4q3GR36l9O+S7ZOOITNL1TPp+X1WxkXbeXQA146k0= +github.com/open-telemetry/otel-arrow v0.23.0/go.mod h1:F50XFaiNfkfB0MYftZIUKFULm6pxfGqjbgQzevi+65M= +github.com/open-telemetry/otel-arrow/collector v0.23.0 h1:ztmq1ipJBhm4xWjHDbmKOtgP3Nl/ZDoLX+3ThhzFs6k= +github.com/open-telemetry/otel-arrow/collector v0.23.0/go.mod h1:SLgLEhhcfR9MjG1taK8RPuwiuIoAPW7IpCjFBobwIUM= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= @@ -182,8 +188,8 @@ golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -191,8 +197,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.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.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= @@ -222,8 +228,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.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= 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/collector/exporter/otelarrowexporter/otelarrow.go b/collector/exporter/otelarrowexporter/otelarrow.go index 783b507b35..627fd52842 100644 --- a/collector/exporter/otelarrowexporter/otelarrow.go +++ b/collector/exporter/otelarrowexporter/otelarrow.go @@ -10,7 +10,7 @@ import ( "runtime" "time" - arrowPkg "github.com/apache/arrow/go/v14/arrow" + arrowPkg "github.com/apache/arrow/go/v16/arrow" "github.com/open-telemetry/otel-arrow/collector/compression/zstd" "github.com/open-telemetry/otel-arrow/collector/netstats" arrowRecord "github.com/open-telemetry/otel-arrow/pkg/otel/arrow_record" diff --git a/collector/go.mod b/collector/go.mod index df4388c115..cfcbfb1b9c 100644 --- a/collector/go.mod +++ b/collector/go.mod @@ -12,6 +12,7 @@ require ( go.opentelemetry.io/collector/component v0.98.0 go.opentelemetry.io/collector/config/configtelemetry v0.98.0 go.opentelemetry.io/collector/exporter v0.98.0 + go.opentelemetry.io/collector/pdata v1.5.0 go.opentelemetry.io/collector/receiver v0.98.0 go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/metric v1.25.0 @@ -49,7 +50,6 @@ require ( github.com/rogpeppe/go-internal v1.11.0 // indirect go.opentelemetry.io/collector/confmap v0.98.0 // indirect go.opentelemetry.io/collector/consumer v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/net v0.24.0 // indirect @@ -59,14 +59,3 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/processor/concurrentbatchprocessor/go.mod b/collector/processor/concurrentbatchprocessor/go.mod index 5fec170161..16c42d9307 100644 --- a/collector/processor/concurrentbatchprocessor/go.mod +++ b/collector/processor/concurrentbatchprocessor/go.mod @@ -60,14 +60,3 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/processor/experimentprocessor/go.mod b/collector/processor/experimentprocessor/go.mod index 18794ee903..b240a73130 100644 --- a/collector/processor/experimentprocessor/go.mod +++ b/collector/processor/experimentprocessor/go.mod @@ -53,14 +53,3 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/processor/obfuscationprocessor/go.mod b/collector/processor/obfuscationprocessor/go.mod index 43b6c85f76..23f80b2f18 100644 --- a/collector/processor/obfuscationprocessor/go.mod +++ b/collector/processor/obfuscationprocessor/go.mod @@ -57,14 +57,3 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/receiver/filereceiver/go.mod b/collector/receiver/filereceiver/go.mod index a9035080b6..90c8c4a39d 100644 --- a/collector/receiver/filereceiver/go.mod +++ b/collector/receiver/filereceiver/go.mod @@ -54,14 +54,3 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/receiver/otelarrowreceiver/go.mod b/collector/receiver/otelarrowreceiver/go.mod index 3f2870fb48..8ed634f4c9 100644 --- a/collector/receiver/otelarrowreceiver/go.mod +++ b/collector/receiver/otelarrowreceiver/go.mod @@ -23,6 +23,7 @@ require ( go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 + go.uber.org/goleak v1.3.0 go.uber.org/mock v0.4.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -91,14 +92,3 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - - - - - - - - - - - diff --git a/collector/receiver/otelarrowreceiver/go.sum b/collector/receiver/otelarrowreceiver/go.sum index 294f452171..acaccc5a60 100644 --- a/collector/receiver/otelarrowreceiver/go.sum +++ b/collector/receiver/otelarrowreceiver/go.sum @@ -89,6 +89,10 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI= github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/open-telemetry/otel-arrow v0.23.0 h1:Vx4q3GR36l9O+S7ZOOITNL1TPp+X1WxkXbeXQA146k0= +github.com/open-telemetry/otel-arrow v0.23.0/go.mod h1:F50XFaiNfkfB0MYftZIUKFULm6pxfGqjbgQzevi+65M= +github.com/open-telemetry/otel-arrow/collector v0.23.0 h1:ztmq1ipJBhm4xWjHDbmKOtgP3Nl/ZDoLX+3ThhzFs6k= +github.com/open-telemetry/otel-arrow/collector v0.23.0/go.mod h1:SLgLEhhcfR9MjG1taK8RPuwiuIoAPW7IpCjFBobwIUM= github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/collector/test/go.mod b/collector/test/go.mod index b3d71ba358..eca4f38b2f 100644 --- a/collector/test/go.mod +++ b/collector/test/go.mod @@ -3,8 +3,17 @@ module github.com/open-telemetry/otel-arrow/collector/test go 1.22.2 require ( + github.com/open-telemetry/otel-arrow v0.23.0 + github.com/open-telemetry/otel-arrow/collector v0.23.0 github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.23.0 github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.23.0 + github.com/stretchr/testify v1.9.0 + go.opentelemetry.io/collector/component v0.98.0 + go.opentelemetry.io/collector/consumer v0.98.0 + go.opentelemetry.io/collector/exporter v0.98.0 + go.opentelemetry.io/collector/pdata v1.5.0 + go.opentelemetry.io/collector/receiver v0.98.0 + go.uber.org/zap v1.27.0 ) require ( @@ -12,8 +21,12 @@ require ( github.com/apache/arrow/go/v14 v14.0.2 // 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 + github.com/brianvoe/gofakeit/v6 v6.17.0 // indirect github.com/buger/jsonparser v1.1.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-metro v0.0.0-20180109044635-280f6062b5bc // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.4.0 // indirect @@ -38,14 +51,16 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.2 // indirect - github.com/open-telemetry/otel-arrow v0.23.0 // indirect - github.com/open-telemetry/otel-arrow/collector v0.23.0 // indirect github.com/pierrec/lz4/v4 v4.1.18 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.19.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.48.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/collector v0.98.0 // indirect - go.opentelemetry.io/collector/component v0.98.0 // indirect go.opentelemetry.io/collector/config/configauth v0.98.0 // indirect go.opentelemetry.io/collector/config/configcompression v1.5.0 // indirect go.opentelemetry.io/collector/config/configgrpc v0.98.0 // indirect @@ -56,19 +71,17 @@ require ( go.opentelemetry.io/collector/config/configtls v0.98.0 // indirect go.opentelemetry.io/collector/config/internal v0.98.0 // indirect go.opentelemetry.io/collector/confmap v0.98.0 // indirect - go.opentelemetry.io/collector/consumer v0.98.0 // indirect - go.opentelemetry.io/collector/exporter v0.98.0 // indirect go.opentelemetry.io/collector/extension v0.98.0 // indirect go.opentelemetry.io/collector/extension/auth v0.98.0 // indirect go.opentelemetry.io/collector/featuregate v1.5.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect - go.opentelemetry.io/collector/receiver v0.98.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/metric v1.25.0 // indirect + go.opentelemetry.io/otel/sdk v1.25.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect go.opentelemetry.io/otel/trace v1.25.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.27.0 // indirect golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.19.0 // indirect diff --git a/go.mod b/go.mod index fa80a1f8c1..5e1ccc931c 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.4 require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 - github.com/apache/arrow/go/v14 v14.0.2 + github.com/apache/arrow/go/v16 v16.1.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 @@ -21,7 +21,7 @@ require ( go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/metric v1.25.0 go.uber.org/mock v0.4.0 - golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa + golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 google.golang.org/grpc v1.63.2 google.golang.org/protobuf v1.33.0 ) @@ -33,26 +33,25 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/flatbuffers v23.5.26+incompatible // 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.5 // indirect + github.com/klauspost/cpuid/v2 v2.2.7 // 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 - github.com/pierrec/lz4/v4 v4.1.18 // indirect + github.com/pierrec/lz4/v4 v4.1.21 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel/trace v1.25.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/mod v0.14.0 // indirect + golang.org/x/mod v0.16.0 // indirect golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.15.0 // indirect + golang.org/x/tools v0.19.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 65c7830348..0c2ecb947b 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/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= -github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= +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/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= @@ -31,8 +31,8 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG 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= -github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= -github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI= +github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -46,8 +46,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI 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.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= -github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= +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/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= @@ -66,8 +66,8 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= -github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= +github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= @@ -110,8 +110,8 @@ golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= -golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= +golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -119,8 +119,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.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.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= @@ -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.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= 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/pkg/arrow/from_array.go b/pkg/arrow/from_array.go index b94ac18ec0..3d5afb2dd1 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 cce0911d85..b1b22a7bc6 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 71d8d80df2..fed27132ad 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/v14/arrow" + "github.com/apache/arrow/go/v16/arrow" "github.com/open-telemetry/otel-arrow/pkg/werror" ) diff --git a/pkg/arrow/from_sparseunion.go b/pkg/arrow/from_sparseunion.go index a5a5ddf04a..3423999363 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 2f043c1629..bc5dbccc3e 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 b10f781912..35abd2821c 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 c36f0d6424..adec8467c1 100644 --- a/pkg/arrow/record.go +++ b/pkg/arrow/record.go @@ -25,8 +25,8 @@ import ( "math" "strings" - "github.com/apache/arrow/go/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 d6155eeae8..283a0a046b 100644 --- a/pkg/arrow/schema.go +++ b/pkg/arrow/schema.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/apache/arrow/go/v14/arrow" + "github.com/apache/arrow/go/v16/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 5ed9200a40..f4a3960c7e 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/v14/arrow/memory" + "github.com/apache/arrow/go/v16/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 efdcdeb059..95115b1598 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/v14/arrow/memory" + "github.com/apache/arrow/go/v16/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 7dc5e79107..68a4d122ab 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/v14/arrow/memory" + "github.com/apache/arrow/go/v16/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 91b51960b4..3a69767ef0 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -22,7 +22,7 @@ package config import ( "math" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow/memory" "github.com/open-telemetry/otel-arrow/pkg/otel/observer" ) diff --git a/pkg/otel/arrow_record/logs_dict_test.go b/pkg/otel/arrow_record/logs_dict_test.go index 362aa2e0fa..dfcfdd9ebe 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/v14/arrow/memory" + "github.com/apache/arrow/go/v16/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 984db0a7d2..8f7485039c 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/v14/arrow/memory" + "github.com/apache/arrow/go/v16/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 6b6926faac..35f98be3e1 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/ipc" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/arrow/ipc" + "github.com/apache/arrow/go/v16/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 feb4d637c1..5df26093c3 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/v14/arrow/memory" + "github.com/apache/arrow/go/v16/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 af4775872d..51a4070335 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/v14/arrow/memory" + "github.com/apache/arrow/go/v16/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 070966078e..a2f9c64511 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 dac4e71b36..a5bc7c0bc2 100644 --- a/pkg/otel/common/arrow/allocator.go +++ b/pkg/otel/common/arrow/allocator.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow/memory" ) type LimitedAllocator struct { diff --git a/pkg/otel/common/arrow/allocator_test.go b/pkg/otel/common/arrow/allocator_test.go index cc28564f4c..cda0462bf2 100644 --- a/pkg/otel/common/arrow/allocator_test.go +++ b/pkg/otel/common/arrow/allocator_test.go @@ -18,7 +18,7 @@ import ( "errors" "testing" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow/memory" "github.com/stretchr/testify/require" ) diff --git a/pkg/otel/common/arrow/any_value.go b/pkg/otel/common/arrow/any_value.go index f5eaeddd3a..01f482a5d3 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 b61bb1f212..9c7a30994b 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 31ec45d286..612f124b2d 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 a12c302a92..8f9c7e1ac6 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 eb770caabc..fe5b5d9850 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 108a02becf..e1bc0015fe 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v16/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 adc58e83aa..a50fb31033 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" - "github.com/apache/arrow/go/v14/arrow/memory" + "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/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 162b42367f..36f073a8f5 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 db397c2e60..036bfbcce3 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 cff07b55f4..f4a9d9476d 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 8adf7981de..2a38d82afa 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" - "github.com/apache/arrow/go/v14/arrow/memory" + "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/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 a9436542a6..094f18993e 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 a8f318dccc..0e4e9cbea0 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/v14/arrow/array" + "github.com/apache/arrow/go/v16/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 15c68e4691..62f91a3a01 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" - "github.com/apache/arrow/go/v14/arrow/memory" + "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/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 db651be798..7ecfc82c06 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 4e015545f5..61f3754096 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 b63fe08cc7..d3c5968e26 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/v14/arrow/memory" + "github.com/apache/arrow/go/v16/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 1b69e35fba..1eccaaefce 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 95362de294..5a1503e322 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 4ab7d9689f..927b92f907 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/v14/arrow/array" + "github.com/apache/arrow/go/v16/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 a8435ab7d8..9f80aeb99d 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/v14/arrow/array" + "github.com/apache/arrow/go/v16/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 4db36caa9b..d419945d60 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 1767f5e00e..11d0f01638 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/v14/arrow/array" + "github.com/apache/arrow/go/v16/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 4247f493e9..d75ed49573 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/v14/arrow/array" + "github.com/apache/arrow/go/v16/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 1a970ccbd6..2123f15ac3 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 0de1241673..6445462826 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 2dc393e6ea..33e3de78b3 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/arrow/array" + "github.com/apache/arrow/go/v16/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 823b904fff..2786e2d98a 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 9aac2b906c..64917aa4cf 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/v14/arrow/array" + "github.com/apache/arrow/go/v16/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 b34611ebc0..2340f0414c 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 22d16acde0..5513412ab7 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 7c7c2e6891..4061a1d779 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/v14/arrow/array" + "github.com/apache/arrow/go/v16/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 e3ceb8b7f6..2538be779d 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 8958edde3b..afa867d1b4 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 06706f92aa..f7beceb006 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 6d7650c8f4..b2d8126b3c 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/v14/arrow" +import "github.com/apache/arrow/go/v16/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 38e54a0feb..56abfe6fd1 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/v14/arrow" +import "github.com/apache/arrow/go/v16/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 20e6c629ef..40ddf6226f 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 a39c7ff355..455cedf91b 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 3039d16fdb..b4b6843eca 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 c866c95de7..cb65e991b6 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 77cdcde045..86aa2ba99e 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 3260243a7f..a5a427a9a5 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 ed31cb1cde..733ef83cf2 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 d0433ba2e6..9301078dd8 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 f943313015..a8ba5d026b 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 abf78aa633..9d0942254f 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 8f013fff39..bf960472f7 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/v14/arrow" + "github.com/apache/arrow/go/v16/arrow" "errors" "math" diff --git a/pkg/otel/metrics/arrow/metrics.go b/pkg/otel/metrics/arrow/metrics.go index 38b1d41edc..584334815b 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 0f467bfe45..723dd550ba 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 59355197d2..a317b77feb 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 12b137e0b4..3d1038b7b3 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 b7b3e1fd17..028612a7d1 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 f613f8d33b..61d9c8ed61 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 6c9677131b..614168e9fb 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 e077f52ec7..d462e1c688 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 4d44da49cc..e66bc6c7ab 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 0e7c637f74..2bdc71cacf 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 67c8620351..82c739c2f8 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 f363a11c07..4f9e4a7b78 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 3aaeb3d0f6..64e2de301c 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 d05e7e6984..6b0d7b0116 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 7bbef47e27..70848dbcf8 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 71b24adc52..5bffbb2085 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 0f5d085054..e18ccd1b20 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 f551575ffa..d30080c285 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 4e43284383..e3e40e23d8 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 5029b5659e..e1dec85274 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 909d8da960..b1d0e36fdb 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 b193b712fb..e9f94002f1 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 6792834e5b..d0846bc89b 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 aa400e164a..02cbc39c46 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 f4044202cb..8c213efa37 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 b479a96d85..917be13e1c 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/v14/arrow" + "github.com/apache/arrow/go/v16/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 2047c40957..6a2fea3b69 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/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 1a6729d8bd..2569f04a8d 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/v14/arrow" - "github.com/apache/arrow/go/v14/arrow/memory" + "github.com/apache/arrow/go/v16/arrow" + "github.com/apache/arrow/go/v16/arrow/memory" arrowpb "github.com/open-telemetry/otel-arrow/api/experimental/arrow/v1" "github.com/open-telemetry/otel-arrow/pkg/benchmark" From 43efea4b0e83ad0dcdd898142c212e0a1084fa40 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 08:45:56 -0700 Subject: [PATCH 07/15] Error handling in consumer fix -- partial --- collector/test/e2e_test.go | 237 ++++++++++++++++-------- pkg/otel/arrow_record/consumer.go | 38 ++-- pkg/otel/common/arrow/allocator.go | 56 +++++- pkg/otel/common/arrow/allocator_test.go | 23 ++- 4 files changed, 263 insertions(+), 91 deletions(-) diff --git a/collector/test/e2e_test.go b/collector/test/e2e_test.go index f095f9f219..e7b60444e9 100644 --- a/collector/test/e2e_test.go +++ b/collector/test/e2e_test.go @@ -6,8 +6,10 @@ package test import ( "context" "encoding/json" + "errors" "fmt" "math/rand" + "strings" "sync" "testing" "time" @@ -17,10 +19,12 @@ 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" + common "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" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/exporter" "go.opentelemetry.io/collector/pdata/pcommon" @@ -28,19 +32,41 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" + "go.uber.org/zap/zapcore" + "go.uber.org/zap/zaptest" + "go.uber.org/zap/zaptest/observer" ) +type testParams struct { + threadCount int + requestCount int +} + +var normalParams = testParams{ + threadCount: 10, + requestCount: 100, +} + +var memoryLimitParams = testParams{ + threadCount: 10, + requestCount: 10, +} + type testConsumer struct { - sink consumertest.TracesSink + sink consumertest.TracesSink + recvLogs *observer.ObservedLogs + expLogs *observer.ObservedLogs } +var _ consumer.Traces = &testConsumer{} + type ExpConfig = otelarrowexporter.Config type RecvConfig = otelarrowreceiver.Config type CfgFunc func(*ExpConfig, *RecvConfig) type GenFunc func(int) ptrace.Traces type MkGen func() GenFunc - -var _ consumer.Traces = &testConsumer{} +type EndFunc func(t *testing.T, tp testParams, testCon *testConsumer, expect [][]ptrace.Traces) +type ConsumerErrFunc func(t *testing.T, err error) func (*testConsumer) Capabilities() consumer.Capabilities { return consumer.Capabilities{} @@ -51,6 +77,18 @@ func (tc *testConsumer) ConsumeTraces(ctx context.Context, td ptrace.Traces) err return tc.sink.ConsumeTraces(ctx, td) } +func testLoggerSettings(t *testing.T) (component.TelemetrySettings, *observer.ObservedLogs) { + tset := componenttest.NewNopTelemetrySettings() + + core, obslogs := observer.New(zapcore.InfoLevel) + + // Note: if you want to see these logs, use: + tset.Logger = zap.New(zapcore.NewTee(core, zaptest.NewLogger(t).Core())) + //tset.Logger = zap.New(core) + + return tset, obslogs +} + func basicTestConfig(t *testing.T, cfgF CfgFunc) (*testConsumer, exporter.Traces, receiver.Traces) { ctx := context.Background() @@ -78,20 +116,23 @@ func basicTestConfig(t *testing.T, cfgF CfgFunc) (*testConsumer, exporter.Traces cfgF(exporterCfg, receiverCfg) } - tset := componenttest.NewNopTelemetrySettings() - tset.Logger, _ = zap.NewDevelopment() + expTset, expLogs := testLoggerSettings(t) + recvTset, recvLogs := testLoggerSettings(t) - testCon := &testConsumer{} + testCon := &testConsumer{ + recvLogs: recvLogs, + expLogs: expLogs, + } receiver, err := rfact.CreateTracesReceiver(ctx, receiver.CreateSettings{ ID: component.MustNewID("otelarrowreceiver"), - TelemetrySettings: tset, + TelemetrySettings: recvTset, }, receiverCfg, testCon) require.NoError(t, err) exporter, err := efact.CreateTracesExporter(ctx, exporter.CreateSettings{ ID: component.MustNewID("otelarrowexporter"), - TelemetrySettings: tset, + TelemetrySettings: expTset, }, exporterCfg) require.NoError(t, err) @@ -99,60 +140,11 @@ func basicTestConfig(t *testing.T, cfgF CfgFunc) (*testConsumer, exporter.Traces } -func makeTestTraces(i int) ptrace.Traces { - td := ptrace.NewTraces() - td.ResourceSpans().AppendEmpty().Resource().Attributes().PutStr("resource-attr", fmt.Sprint("resource-attr-val-", i)) - - ss := td.ResourceSpans().At(0).ScopeSpans().AppendEmpty().Spans() - span := ss.AppendEmpty() - - span.SetName("operationA") - span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) - span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now())) - - span.SetTraceID(testutil.UInt64ToTraceID(rand.Uint64(), rand.Uint64())) - span.SetSpanID(testutil.UInt64ToSpanID(rand.Uint64())) - evs := span.Events() - ev0 := evs.AppendEmpty() - ev0.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) - ev0.SetName("event-with-attr") - ev0.Attributes().PutStr("span-event-attr", "span-event-attr-val") - ev0.SetDroppedAttributesCount(2) - ev1 := evs.AppendEmpty() - ev1.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) - ev1.SetName("event") - ev1.SetDroppedAttributesCount(2) - span.SetDroppedEventsCount(1) - status := span.Status() - status.SetCode(ptrace.StatusCodeError) - status.SetMessage("status-cancelled") - - return td -} - -func TestIntegrationTracesSimple(t *testing.T) { - for _, n := range []int{1, 2, 4, 8} { - t.Run(fmt.Sprint(n), func(t *testing.T) { - testIntegrationTraces(t, func(ecfg *ExpConfig, rcfg *RecvConfig) { - ecfg.Arrow.NumStreams = n - }, func() GenFunc { return makeTestTraces }) - }) - } -} - -func testIntegrationTraces(t *testing.T, cfgf CfgFunc, mkgen MkGen) { - ctx, cancel := context.WithCancel(context.Background()) - defer cancel() - +func testIntegrationTraces(ctx context.Context, t *testing.T, tp testParams, cfgf CfgFunc, mkgen MkGen, errf ConsumerErrFunc, endf EndFunc) { host := componenttest.NewNopHost() testCon, exporter, receiver := basicTestConfig(t, cfgf) - const ( - threadCount = 10 - requestCount = 100 - ) - var startWG sync.WaitGroup var exporterShutdownWG sync.WaitGroup var startExporterShutdownWG sync.WaitGroup @@ -184,17 +176,17 @@ func testIntegrationTraces(t *testing.T, cfgf CfgFunc, mkgen MkGen) { startWG.Wait() var clientDoneWG sync.WaitGroup // wait for client to finish - var expect [threadCount][]ptrace.Traces + expect := make([][]ptrace.Traces, tp.threadCount) - for num := 0; num < threadCount; num++ { + for num := 0; num < tp.threadCount; num++ { clientDoneWG.Add(1) go func() { defer clientDoneWG.Done() generator := mkgen() - for i := 0; i < requestCount; i++ { + for i := 0; i < tp.requestCount; i++ { td := generator(i) - require.NoError(t, exporter.ConsumeTraces(ctx, td)) + errf(t, exporter.ConsumeTraces(ctx, td)) expect[num] = append(expect[num], td) } }() @@ -209,8 +201,59 @@ func testIntegrationTraces(t *testing.T, cfgf CfgFunc, mkgen MkGen) { // wait for receiver to shut down receiverShutdownWG.Wait() + endf(t, tp, testCon, expect[:]) +} + +func makeTestTraces(i int) ptrace.Traces { + td := ptrace.NewTraces() + td.ResourceSpans().AppendEmpty().Resource().Attributes().PutStr("resource-attr", fmt.Sprint("resource-attr-val-", i)) + + ss := td.ResourceSpans().At(0).ScopeSpans().AppendEmpty().Spans() + span := ss.AppendEmpty() + + span.SetName("operationA") + span.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) + span.SetEndTimestamp(pcommon.NewTimestampFromTime(time.Now())) + + span.SetTraceID(testutil.UInt64ToTraceID(rand.Uint64(), rand.Uint64())) + span.SetSpanID(testutil.UInt64ToSpanID(rand.Uint64())) + evs := span.Events() + ev0 := evs.AppendEmpty() + ev0.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + ev0.SetName("event-with-attr") + ev0.Attributes().PutStr("span-event-attr", "span-event-attr-val") + ev0.SetDroppedAttributesCount(2) + ev1 := evs.AppendEmpty() + ev1.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + ev1.SetName("event") + ev1.SetDroppedAttributesCount(2) + span.SetDroppedEventsCount(1) + status := span.Status() + status.SetCode(ptrace.StatusCodeError) + status.SetMessage("status-cancelled") + + return td +} + +func bulkyGenFunc() MkGen { + return func() GenFunc { + entropy := datagen.NewTestEntropy(int64(rand.Uint64())) //nolint:gosec // only used for testing + + tracesGen := datagen.NewTracesGenerator( + entropy, + entropy.NewStandardResourceAttributes(), + entropy.NewStandardInstrumentationScopes(), + ) + return func(_ int) ptrace.Traces { + return tracesGen.Generate(1000, time.Minute) + } + } + +} + +func standardEnding(t *testing.T, tp testParams, testCon *testConsumer, expect [][]ptrace.Traces) { // Check for matching request count and data - require.Equal(t, requestCount*threadCount, testCon.sink.SpanCount()) + require.Equal(t, tp.requestCount*tp.threadCount, testCon.sink.SpanCount()) var expectJSON []json.Marshaler for _, tdn := range expect { @@ -227,24 +270,66 @@ func testIntegrationTraces(t *testing.T, cfgf CfgFunc, mkgen MkGen) { assert.Equiv(asserter, expectJSON, receivedJSON) } -func bulkyGenFunc() MkGen { - return func() GenFunc { - entropy := datagen.NewTestEntropy(int64(rand.Uint64())) //nolint:gosec // only used for testing +func failureMemoryLimitEnding(t *testing.T, _ testParams, testCon *testConsumer, _ [][]ptrace.Traces) { + require.Equal(t, 0, testCon.sink.SpanCount()) - tracesGen := datagen.NewTracesGenerator( - entropy, - entropy.NewStandardResourceAttributes(), - entropy.NewStandardInstrumentationScopes(), - ) - return func(_ int) ptrace.Traces { - return tracesGen.Generate(1000, time.Minute) + var memErrs int + + // Make sure we've exercised the memory limit. + for _, rl := range testCon.expLogs.All() { + for _, f := range rl.Context { + fmt.Println("EXP", rl.Message, f.String) + if strings.Contains(f.String, common.MemoryErrorStringPrefix) { + memErrs++ + } } } + for _, rl := range testCon.recvLogs.All() { + for _, f := range rl.Context { + fmt.Println("RECV", rl.Message, f.String) + } + } + + require.Less(t, 0, memErrs, "should have seen memory limit errors") } -func TestIntegrationTracesLimited(t *testing.T) { - testIntegrationTraces(t, func(ecfg *ExpConfig, rcfg *RecvConfig) { +func consumerSuccess(t *testing.T, err error) { + require.NoError(t, err) +} + +func consumerFailure(t *testing.T, err error) { + require.Error(t, err) + + // there should be no permanent errors anywhere in this test. + require.True(t, !consumererror.IsPermanent(err), "should not be permanent: %v", err) + require.True(t, + errors.Is(err, context.DeadlineExceeded) || + errors.Is(err, context.Canceled)) +} + +func TestIntegrationTracesSimple(t *testing.T) { + for _, n := range []int{1, 2, 4, 8} { + t.Run(fmt.Sprint(n), func(t *testing.T) { + ctx, cancel := context.WithCancel(context.Background()) + defer cancel() + + testIntegrationTraces(ctx, t, normalParams, func(ecfg *ExpConfig, rcfg *RecvConfig) { + ecfg.Arrow.NumStreams = n + }, func() GenFunc { return makeTestTraces }, consumerSuccess, standardEnding) + }) + } +} + +func TestIntegrationMemoryLimited(t *testing.T) { + ctx, cancel := context.WithCancel(context.Background()) + go func() { + time.Sleep(5 * time.Second) + cancel() + }() + testIntegrationTraces(ctx, t, memoryLimitParams, func(ecfg *ExpConfig, rcfg *RecvConfig) { rcfg.Arrow.MemoryLimitMiB = 1 - }, bulkyGenFunc()) + ecfg.Arrow.NumStreams = 10 + ecfg.TimeoutSettings.Timeout = 5 * time.Second + }, bulkyGenFunc(), consumerFailure, failureMemoryLimitEnding) } diff --git a/pkg/otel/arrow_record/consumer.go b/pkg/otel/arrow_record/consumer.go index d3fb20dd9a..4ac571e553 100644 --- a/pkg/otel/arrow_record/consumer.go +++ b/pkg/otel/arrow_record/consumer.go @@ -17,6 +17,7 @@ package arrow_record import ( "bytes" "context" + "errors" "fmt" "log" "math/rand" @@ -60,9 +61,14 @@ type ConsumerAPI interface { var _ ConsumerAPI = &Consumer{} -var ErrConsumerMemoryLimit = fmt.Errorf( - "The number of decoded records is smaller than the number of received payloads. " + - "Please increase the memory limit of the consumer.") +// ErrConsumerMemoryLimit is used by calling code to check +// errors.Is(err, ErrConsumerMemoryLimit). It is never returned, +// however when memory limit errors are seen, they are replaced +// to match this via Is(). +var ErrConsumerMemoryLimit error = common.MemoryLimitClassifier{} + +var errConsumerInternalError = errors.New( + "internal error: number of decoded records is smaller than the number of received payloads") // Consumer is a BatchArrowRecords consumer. type Consumer struct { @@ -311,12 +317,15 @@ func (c *Consumer) TracesFrom(bar *colarspb.BatchArrowRecords) ([]ptrace.Traces, // Consume takes a BatchArrowRecords protobuf message and returns an array of RecordMessage. // Note: the records wrapped in the RecordMessage must be released after use by the caller. -func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) ([]*record_message.RecordMessage, error) { +func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) (ibes []*record_message.RecordMessage, retErr error) { ctx := context.Background() - var ibes []*record_message.RecordMessage defer func() { c.recordsCounter.Add(ctx, int64(len(ibes)), c.metricOpts()...) + if retErr != nil { + releaseRecords(ibes) + ibes = nil + } }() // Transform each individual OtlpArrowPayload into RecordMessage @@ -356,8 +365,7 @@ func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) ([]*record_message.R ipc.WithZstd(), ) if err != nil { - releaseRecords(ibes) - return nil, werror.Wrap(err) + return ibes, werror.Wrap(distinguishMemoryError(err)) } sc.ipcReader = ipcReader } @@ -372,19 +380,27 @@ func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) ([]*record_message.R } if err := sc.ipcReader.Err(); err != nil { - releaseRecords(ibes) - return nil, werror.Wrap(err) + return ibes, werror.Wrap(distinguishMemoryError(err)) } } if len(ibes) < len(bar.ArrowPayloads) { - releaseRecords(ibes) - return nil, ErrConsumerMemoryLimit + return ibes, werror.Wrap(errConsumerInternalError) } return ibes, nil } +func distinguishMemoryError(err error) error { + limErr, ok := common.NewLimitErrorFromError(err) + fmt.Println("ERRCHECK", ok, err, limErr) + if ok { + fmt.Printf("We return: %T %v\n", limErr, limErr) + return limErr + } + return err +} + type runtimeChecker struct{} var _ memory.TestingT = &runtimeChecker{} diff --git a/pkg/otel/common/arrow/allocator.go b/pkg/otel/common/arrow/allocator.go index a5bc7c0bc2..26e79adf5b 100644 --- a/pkg/otel/common/arrow/allocator.go +++ b/pkg/otel/common/arrow/allocator.go @@ -17,10 +17,22 @@ package arrow import ( "fmt" "os" + "regexp" + "strconv" + "strings" "github.com/apache/arrow/go/v16/arrow/memory" ) +// MemoryErrorStringPrefix is a prefix used to recognize memory limit errors. +// +// 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. +const MemoryErrorStringPrefix = "allocation size exceeds limit" + type LimitedAllocator struct { Allocator memory.Allocator inuse uint64 @@ -44,15 +56,55 @@ type LimitError struct { var _ error = LimitError{} +var limitRegexp = regexp.MustCompile(`requested (\d+) out of (\d+) \(in-use=(\d+)\)`) + +// NewLimitErrorFromError extracts a formatted limit error. See +// MemoryErrorStringPrefix for an explanation. +func NewLimitErrorFromError(err error) (error, bool) { + msg := err.Error() + if !strings.Contains(msg, MemoryErrorStringPrefix) { + fmt.Println("CASE A", err) + return err, false + } + matches := limitRegexp.FindStringSubmatch(msg) + if len(matches) != 4 { + fmt.Println("CASE B", err) + return err, false + } + + req, _ := strconv.ParseUint(matches[1], 10, 64) + lim, _ := strconv.ParseUint(matches[2], 10, 64) + inuse, _ := strconv.ParseUint(matches[3], 10, 64) + + fmt.Println("CASE C") + return LimitError{ + Request: req, + Inuse: inuse, + Limit: lim, + }, true +} + func (le LimitError) Error() string { - return fmt.Sprintf("allocation size %d exceeds limit %d (in-use=%d)", le.Request, le.Limit, le.Inuse) + return fmt.Sprintf("%s: requested %d out of %d (in-use=%d)", MemoryErrorStringPrefix, le.Request, le.Limit, le.Inuse) } func (_ LimitError) Is(tgt error) bool { - _, ok := tgt.(LimitError) + if _, ok := tgt.(LimitError); ok { + return true + } + _, ok := tgt.(MemoryLimitClassifier) return ok } +type MemoryLimitClassifier struct { +} + +var _ error = MemoryLimitClassifier{} + +func (MemoryLimitClassifier) Error() string { + return "error class: memory limit exceeded" +} + func (l *LimitedAllocator) Inuse() uint64 { return l.inuse } diff --git a/pkg/otel/common/arrow/allocator_test.go b/pkg/otel/common/arrow/allocator_test.go index cda0462bf2..05a9c722e5 100644 --- a/pkg/otel/common/arrow/allocator_test.go +++ b/pkg/otel/common/arrow/allocator_test.go @@ -16,13 +16,14 @@ package arrow import ( "errors" + "fmt" "testing" "github.com/apache/arrow/go/v16/arrow/memory" "github.com/stretchr/testify/require" ) -func TestLimitedAllocator(t *testing.T) { +func TestLimitedAllocatorUnformatted(t *testing.T) { const boundary = 1000000 check := memory.NewCheckedAllocator(memory.NewGoAllocator()) limit := NewLimitedAllocator(check, boundary) @@ -47,9 +48,27 @@ func TestLimitedAllocator(t *testing.T) { }() require.NotNil(t, capture) require.True(t, errors.Is(capture.(error), LimitError{})) - require.Equal(t, "allocation size 1 exceeds limit 1000000 (in-use=1000000)", capture.(error).Error()) + require.Equal(t, "allocation size exceeds limit: requested 1 out of 1000000 (in-use=1000000)", capture.(error).Error()) limit.Free(b) check.AssertSize(t, 0) } + +func TestLimitedAllocatorFormatted(t *testing.T) { + // Arrow does not wrap the error, so the consumer sees its + // formatted version. + expect := LimitError{ + Request: 1000, + Inuse: 9900, + Limit: 10000, + } + + unwrap, ok := NewLimitErrorFromError(fmt.Errorf("some sort of prefix %v some sort of suffix", expect)) + require.Error(t, unwrap) + require.True(t, ok) + require.Equal(t, expect, unwrap) + + // @@@ HERE CHECK THE CLASSIFIER + require.True(t, +} From ca384106b3fb38c6372c31d53b0b4b14e7334bd3 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 08:46:01 -0700 Subject: [PATCH 08/15] use more status.Errorf --- .../internal/arrow/bestofn.go | 5 +- .../internal/arrow/exporter.go | 10 ++- .../internal/arrow/stream.go | 35 ++++----- .../otelarrowreceiver/internal/arrow/arrow.go | 76 ++++++++++--------- 4 files changed, 73 insertions(+), 53 deletions(-) diff --git a/collector/exporter/otelarrowexporter/internal/arrow/bestofn.go b/collector/exporter/otelarrowexporter/internal/arrow/bestofn.go index f5ac6034d9..944333149e 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/bestofn.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/bestofn.go @@ -9,6 +9,9 @@ import ( "runtime" "sort" "time" + + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) // bestOfNPrioritizer is a prioritizer that selects a less-loaded stream to write. @@ -114,7 +117,7 @@ func (lp *bestOfNPrioritizer) sendAndWait(ctx context.Context, errCh <-chan erro case <-lp.done: return ErrStreamRestarting case <-ctx.Done(): - return context.Canceled + return status.Errorf(codes.Canceled, "stream canceled") case lp.input <- wri: return waitForWrite(ctx, errCh, lp.done) } diff --git a/collector/exporter/otelarrowexporter/internal/arrow/exporter.go b/collector/exporter/otelarrowexporter/internal/arrow/exporter.go index 3976f9982c..86b549bf64 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/exporter.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/exporter.go @@ -20,7 +20,9 @@ import ( "go.opentelemetry.io/collector/pdata/ptrace" "go.uber.org/zap" "google.golang.org/grpc" + "google.golang.org/grpc/codes" "google.golang.org/grpc/credentials" + "google.golang.org/grpc/status" ) // Exporter is 1:1 with exporter, isolates arrow-specific @@ -255,6 +257,12 @@ func (e *Exporter) runArrowStream(ctx context.Context, dc doneCancel, state *str // // consumer should fall back to standard OTLP, (true, nil) func (e *Exporter) SendAndWait(ctx context.Context, data any) (bool, error) { + select { + case <-ctx.Done(): + return false, status.Errorf(codes.Canceled, "incoming request already canceled") + default: + } + errCh := make(chan error, 1) // Note that if the OTLP exporter's gRPC Headers field was @@ -340,7 +348,7 @@ func waitForWrite(ctx context.Context, errCh <-chan error, down <-chan struct{}) select { case <-ctx.Done(): // This caller's context timed out. - return ctx.Err() + return status.Errorf(codes.Canceled, ctx.Err().Error()) case <-down: return ErrStreamRestarting case err := <-errCh: diff --git a/collector/exporter/otelarrowexporter/internal/arrow/stream.go b/collector/exporter/otelarrowexporter/internal/arrow/stream.go index a5d97e53ee..793c9b4034 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/stream.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/stream.go @@ -7,7 +7,6 @@ import ( "bytes" "context" "errors" - "fmt" "io" "sync" "time" @@ -16,7 +15,6 @@ import ( "github.com/open-telemetry/otel-arrow/collector/netstats" arrowRecord "github.com/open-telemetry/otel-arrow/pkg/otel/arrow_record" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -274,7 +272,7 @@ func (s *Stream) write(ctx context.Context) (retErr error) { return nil case wri = <-s.workState.toWrite: case <-ctx.Done(): - return ctx.Err() + return status.Errorf(codes.Canceled, ctx.Err().Error()) } err := s.encodeAndSend(wri, &hdrsBuf, hdrsEnc) @@ -319,8 +317,8 @@ func (s *Stream) encodeAndSend(wri writeItem, hdrsBuf *bytes.Buffer, hdrsEnc *hp if err != nil { // This is some kind of internal error. We will restart the // stream and mark this record as a permanent one. - err = fmt.Errorf("encode: %w", err) - wri.errCh <- consumererror.NewPermanent(err) + err = status.Errorf(codes.Internal, "encode: %v", err) + wri.errCh <- err return err } @@ -336,8 +334,8 @@ func (s *Stream) encodeAndSend(wri writeItem, hdrsBuf *bytes.Buffer, hdrsEnc *hp // This case is like the encode-failure case // above, we will restart the stream but consider // this a permenent error. - err = fmt.Errorf("hpack: %w", err) - wri.errCh <- consumererror.NewPermanent(err) + err = status.Errorf(codes.Internal, "hpack: %w", err) + wri.errCh <- err return err } } @@ -372,9 +370,12 @@ func (s *Stream) read(_ context.Context) error { // cancel a call to Recv() but the call to processBatchStatus // is non-blocking. for { - // Note: if the client has called CloseSend() and is waiting for a response from the server. - // And if the server fails for some reason, we will wait until some other condition, such as a context - // timeout. TODO: possibly, improve to wait for no outstanding requests and then stop reading. + // Note: if the client has called CloseSend() and is + // waiting for a response from the server. And if the + // server fails for some reason, we will wait until + // some other condition, such as a context timeout. + // TODO: possibly, improve to wait for no outstanding + // requests and then stop reading. resp, err := s.client.Recv() if err != nil { // Note: do not wrap, contains a Status. @@ -382,24 +383,24 @@ func (s *Stream) read(_ context.Context) error { } if err = s.processBatchStatus(resp); err != nil { - return fmt.Errorf("process: %w", err) + return err } } } // getSenderChannel takes the stream lock and removes the corresonding // sender channel. -func (sws *streamWorkState) getSenderChannel(status *arrowpb.BatchStatus) (chan<- error, error) { +func (sws *streamWorkState) getSenderChannel(bstat *arrowpb.BatchStatus) (chan<- error, error) { sws.lock.Lock() defer sws.lock.Unlock() - ch, ok := sws.waiters[status.BatchId] + ch, ok := sws.waiters[bstat.BatchId] if !ok { // Will break the stream. - return nil, fmt.Errorf("unrecognized batch ID: %d", status.BatchId) + return nil, status.Errorf(codes.Internal, "unrecognized batch ID: %d", bstat.BatchId) } - delete(sws.waiters, status.BatchId) + delete(sws.waiters, bstat.BatchId) return ch, nil } @@ -460,7 +461,7 @@ func (s *Stream) encode(records any) (_ *arrowpb.BatchArrowRecords, retErr error zap.Reflect("recovered", err), zap.Stack("stacktrace"), ) - retErr = fmt.Errorf("panic in otel-arrow-adapter: %v", err) + retErr = status.Errorf(codes.Internal, "panic in otel-arrow-adapter: %v", err) } }() var batch *arrowpb.BatchArrowRecords @@ -473,7 +474,7 @@ func (s *Stream) encode(records any) (_ *arrowpb.BatchArrowRecords, retErr error case pmetric.Metrics: batch, err = s.producer.BatchArrowRecordsFromMetrics(data) default: - return nil, fmt.Errorf("unsupported OTLP type: %T", records) + return nil, status.Errorf(codes.Unimplemented, "unsupported OTel-Arrow signal type: %T", records) } return batch, err } diff --git a/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go b/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go index 4159822ee5..0c3fdb0a97 100644 --- a/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go +++ b/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go @@ -83,7 +83,11 @@ type Receiver struct { recvInFlightItems metric.Int64UpDownCounter recvInFlightRequests metric.Int64UpDownCounter boundedQueue *admission.BoundedQueue - inFlightWG sync.WaitGroup +} + +type receiverStream struct { + *Receiver + inFlightWG sync.WaitGroup } // New creates a new Receiver reference. @@ -358,6 +362,14 @@ func (r *Receiver) recoverErr(retErr *error) { } } +func (r *Receiver) newReceiverStream() *receiverStream { + rs := &receiverStream{ + Receiver: r, + } + //@@@rs.inFlightWG.Add(1) + return rs +} + func (r *Receiver) anyStream(serverStream anyStreamServer, method string) (retErr error) { streamCtx := serverStream.Context() ac := r.newConsumer() @@ -381,34 +393,32 @@ func (r *Receiver) anyStream(serverStream anyStreamServer, method string) (retEr // wg is used to ensure this thread returns after both // sender and recevier threads return. - var wg sync.WaitGroup - wg.Add(2) + var sendWG sync.WaitGroup + var recvWG sync.WaitGroup + sendWG.Add(1) + recvWG.Add(1) - // The inflightWG is used to wait for all data to send. The - // 1-count here is removed after srvReceiveLoop() returns, - // having this ensures that concurrent calls to Add() in the - // receiver do not race with Wait() in the sender. - r.inFlightWG.Add(1) + rstream := r.newReceiverStream() go func() { var err error - defer wg.Done() + defer recvWG.Done() defer r.recoverErr(&err) - defer r.inFlightWG.Done() - err = r.srvReceiveLoop(doneCtx, serverStream, pendingCh, method, ac) + err = rstream.srvReceiveLoop(doneCtx, serverStream, pendingCh, method, ac) streamErrCh <- err }() go func() { var err error - defer wg.Done() + defer sendWG.Done() defer r.recoverErr(&err) - err = r.srvSendLoop(doneCtx, serverStream, pendingCh) + err = rstream.srvSendLoop(doneCtx, serverStream, &recvWG, pendingCh) streamErrCh <- err }() // Wait for sender/receiver threads to return before returning. - defer wg.Wait() + defer recvWG.Wait() + defer sendWG.Wait() select { case <-doneCtx.Done(): @@ -419,17 +429,17 @@ func (r *Receiver) anyStream(serverStream anyStreamServer, method string) (retEr } } -func (r *Receiver) newInFlightData(ctx context.Context, method string, batchID int64, pendingCh chan<- batchResp) (context.Context, *inFlightData) { +func (r *receiverStream) newInFlightData(ctx context.Context, method string, batchID int64, pendingCh chan<- batchResp) (context.Context, *inFlightData) { ctx, span := r.tracer.Start(ctx, "otel_arrow_stream_inflight") r.inFlightWG.Add(1) r.recvInFlightRequests.Add(ctx, 1) id := &inFlightData{ - Receiver: r, - method: method, - batchID: batchID, - pendingCh: pendingCh, - span: span, + receiverStream: r, + method: method, + batchID: batchID, + pendingCh: pendingCh, + span: span, } id.refs.Add(1) return ctx, id @@ -438,7 +448,7 @@ func (r *Receiver) newInFlightData(ctx context.Context, method string, batchID i // inFlightData is responsible for storing the resources held by one request. type inFlightData struct { // Receiver is the owner of the resources held by this object. - *Receiver + *receiverStream method string batchID int64 @@ -539,7 +549,7 @@ func (id *inFlightData) anyDone(ctx context.Context) { // This handles constructing an inFlightData object, which itself // tracks everything that needs to be used by instrumention when the // batch finishes. -func (r *Receiver) recvOne(streamCtx context.Context, serverStream anyStreamServer, hrcv *headerReceiver, pendingCh chan<- batchResp, method string, ac arrowRecord.ConsumerAPI) (retErr error) { +func (r *receiverStream) recvOne(streamCtx context.Context, serverStream anyStreamServer, hrcv *headerReceiver, pendingCh chan<- batchResp, method string, ac arrowRecord.ConsumerAPI) (retErr error) { // Receive a batch corresponding with one ptrace.Traces, pmetric.Metrics, // or plog.Logs item. @@ -650,7 +660,7 @@ func (r *Receiver) consumeAndRespond(ctx context.Context, data any, flight *inFl } // srvReceiveLoop repeatedly receives one batch of data. -func (r *Receiver) srvReceiveLoop(ctx context.Context, serverStream anyStreamServer, pendingCh chan<- batchResp, method string, ac arrowRecord.ConsumerAPI) (retErr error) { +func (r *receiverStream) srvReceiveLoop(ctx context.Context, serverStream anyStreamServer, pendingCh chan<- batchResp, method string, ac arrowRecord.ConsumerAPI) (retErr error) { hrcv := newHeaderReceiver(ctx, r.authServer, r.gsettings.IncludeMetadata) for { select { @@ -665,7 +675,7 @@ func (r *Receiver) srvReceiveLoop(ctx context.Context, serverStream anyStreamSer } // srvReceiveLoop repeatedly sends one batch data response. -func (r *Receiver) sendOne(serverStream anyStreamServer, resp batchResp) error { +func (r *receiverStream) sendOne(serverStream anyStreamServer, resp batchResp) error { // Note: Statuses can be batched, but we do not take // advantage of this feature. bs := &arrowpb.BatchStatus{ @@ -709,19 +719,17 @@ func (r *Receiver) sendOne(serverStream anyStreamServer, resp batchResp) error { return nil } -func (r *Receiver) flushSender(serverStream anyStreamServer, pendingCh <-chan batchResp) error { - var err error - // wait for all in flight requests to be successfully - // processed or fail. this implies waiting for the receiver - // loop to exit, as it holds one additional wait count to - // avoid a race with Add() here. +func (r *receiverStream) flushSender(serverStream anyStreamServer, recvWG *sync.WaitGroup, pendingCh <-chan batchResp) error { + // wait to ensure no more items are accepted + recvWG.Wait() + + // wait for all responses to be sent r.inFlightWG.Wait() for { select { case resp := <-pendingCh: - err = r.sendOne(serverStream, resp) - if err != nil { + if err := r.sendOne(serverStream, resp); err != nil { return err } default: @@ -731,11 +739,11 @@ func (r *Receiver) flushSender(serverStream anyStreamServer, pendingCh <-chan ba } } -func (r *Receiver) srvSendLoop(ctx context.Context, serverStream anyStreamServer, pendingCh <-chan batchResp) error { +func (r *receiverStream) srvSendLoop(ctx context.Context, serverStream anyStreamServer, recvWG *sync.WaitGroup, pendingCh <-chan batchResp) error { for { select { case <-ctx.Done(): - return r.flushSender(serverStream, pendingCh) + return r.flushSender(serverStream, recvWG, pendingCh) case resp := <-pendingCh: if err := r.sendOne(serverStream, resp); err != nil { return err From f6a8a429b331bed55c9b93d8dd02d54d963bcfdf Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 13:52:52 -0700 Subject: [PATCH 09/15] test fixes --- .../internal/arrow/exporter_test.go | 18 ++++- .../internal/arrow/stream.go | 12 +-- .../internal/arrow/stream_test.go | 11 ++- .../otelarrowreceiver/internal/arrow/arrow.go | 4 +- collector/test/e2e_test.go | 73 +++++++++++++------ pkg/otel/arrow_record/consumer.go | 8 +- pkg/otel/common/arrow/allocator.go | 24 +----- 7 files changed, 84 insertions(+), 66 deletions(-) diff --git a/collector/exporter/otelarrowexporter/internal/arrow/exporter_test.go b/collector/exporter/otelarrowexporter/internal/arrow/exporter_test.go index 276e5f3fa4..7047d74074 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/exporter_test.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/exporter_test.go @@ -6,7 +6,6 @@ package arrow import ( "context" "encoding/json" - "errors" "fmt" "sync" "sync/atomic" @@ -31,7 +30,9 @@ import ( "go.uber.org/zap/zaptest" "golang.org/x/net/http2/hpack" "google.golang.org/grpc" + "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" ) var AllPrioritizers = []PrioritizerName{LeastLoadedPrioritizer, LeastLoadedTwoPrioritizer} @@ -278,7 +279,10 @@ func TestArrowExporterTimeout(t *testing.T) { sent, err := tc.exporter.SendAndWait(ctx, twoTraces) require.True(t, sent) require.Error(t, err) - require.True(t, errors.Is(err, context.Canceled)) + + stat, is := status.FromError(err) + require.True(t, is, "is a gRPC status") + require.Equal(t, codes.Canceled, stat.Code()) require.NoError(t, tc.exporter.Shutdown(ctx)) }) @@ -406,7 +410,10 @@ func TestArrowExporterConnectTimeout(t *testing.T) { }() _, err := tc.exporter.SendAndWait(ctx, twoTraces) require.Error(t, err) - require.True(t, errors.Is(err, context.Canceled)) + + stat, is := status.FromError(err) + require.True(t, is, "is a gRPC status error: %v", err) + require.Equal(t, codes.Canceled, stat.Code()) require.NoError(t, tc.exporter.Shutdown(bg)) }) @@ -489,7 +496,10 @@ func TestArrowExporterStreamRace(t *testing.T) { // This blocks until the cancelation. _, err := tc.exporter.SendAndWait(callctx, twoTraces) require.Error(t, err) - require.True(t, errors.Is(err, context.Canceled)) + + stat, is := status.FromError(err) + require.True(t, is, "is a gRPC status error: %v", err) + require.Equal(t, codes.Canceled, stat.Code()) }() } diff --git a/collector/exporter/otelarrowexporter/internal/arrow/stream.go b/collector/exporter/otelarrowexporter/internal/arrow/stream.go index 793c9b4034..2704376d05 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/stream.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/stream.go @@ -133,9 +133,9 @@ func (s *Stream) setBatchChannel(batchID int64, errCh chan<- error) { s.workState.waiters[batchID] = errCh } -// logStreamError decides how to log an error. `which` indicates the -// stream direction, will be "reader" or "writer". -func (s *Stream) logStreamError(which string, err error) { +// logStreamError decides how to log an error. `where` indicates the +// error location, will be "reader" or "writer". +func (s *Stream) logStreamError(where string, err error) { var code codes.Code var msg string // gRPC tends to supply status-wrapped errors, so we always @@ -154,9 +154,9 @@ func (s *Stream) logStreamError(which string, err error) { msg = err.Error() } if code == codes.Canceled { - s.telemetry.Logger.Debug("arrow stream shutdown", zap.String("which", which), zap.String("message", msg)) + s.telemetry.Logger.Debug("arrow stream shutdown", zap.String("message", msg), zap.String("where", where)) } else { - s.telemetry.Logger.Error("arrow stream error", zap.String("which", which), zap.String("message", msg), zap.Int("code", int(code))) + s.telemetry.Logger.Error("arrow stream error", zap.Int("code", int(code)), zap.String("message", msg), zap.String("where", where)) } } @@ -334,7 +334,7 @@ func (s *Stream) encodeAndSend(wri writeItem, hdrsBuf *bytes.Buffer, hdrsEnc *hp // This case is like the encode-failure case // above, we will restart the stream but consider // this a permenent error. - err = status.Errorf(codes.Internal, "hpack: %w", err) + err = status.Errorf(codes.Internal, "hpack: %v", err) wri.errCh <- err return err } diff --git a/collector/exporter/otelarrowexporter/internal/arrow/stream_test.go b/collector/exporter/otelarrowexporter/internal/arrow/stream_test.go index 91a33f30d9..f653cc887e 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/stream_test.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/stream_test.go @@ -15,9 +15,10 @@ import ( "github.com/open-telemetry/otel-arrow/collector/netstats" arrowRecordMock "github.com/open-telemetry/otel-arrow/pkg/otel/arrow_record/mock" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/consumer/consumererror" "go.uber.org/mock/gomock" "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" ) var oneBatch = &arrowpb.BatchArrowRecords{ @@ -182,8 +183,12 @@ func TestStreamEncodeError(t *testing.T) { // sender should get a permanent testErr err := tc.mustSendAndWait() require.Error(t, err) - require.True(t, errors.Is(err, testErr)) - require.True(t, consumererror.IsPermanent(err)) + + stat, is := status.FromError(err) + require.True(t, is, "is a gRPC status error: %v", err) + require.Equal(t, codes.Internal, stat.Code()) + + require.Contains(t, stat.Message(), testErr.Error()) }) } } diff --git a/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go b/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go index 0c3fdb0a97..df2ce5bc2b 100644 --- a/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go +++ b/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go @@ -310,9 +310,9 @@ func (r *Receiver) logStreamError(err error, where string) { } if code == codes.Canceled { - r.telemetry.Logger.Debug("arrow stream shutdown", zap.String("message", msg)) + r.telemetry.Logger.Debug("arrow stream shutdown", zap.String("message", msg), zap.String("where", where)) } else { - r.telemetry.Logger.Error("arrow stream error", zap.String("message", msg), zap.Int("code", int(code)), zap.String("where", where)) + r.telemetry.Logger.Error("arrow stream error", zap.Int("code", int(code)), zap.String("message", msg), zap.String("where", where)) } } diff --git a/collector/test/e2e_test.go b/collector/test/e2e_test.go index e7b60444e9..792783280a 100644 --- a/collector/test/e2e_test.go +++ b/collector/test/e2e_test.go @@ -14,12 +14,13 @@ import ( "testing" "time" + "github.com/gogo/status" "github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter" "github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver" "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" - common "github.com/open-telemetry/otel-arrow/pkg/otel/common/arrow" + "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" @@ -33,8 +34,8 @@ import ( "go.opentelemetry.io/collector/receiver" "go.uber.org/zap" "go.uber.org/zap/zapcore" - "go.uber.org/zap/zaptest" "go.uber.org/zap/zaptest/observer" + "google.golang.org/grpc/codes" ) type testParams struct { @@ -83,8 +84,8 @@ func testLoggerSettings(t *testing.T) (component.TelemetrySettings, *observer.Ob core, obslogs := observer.New(zapcore.InfoLevel) // Note: if you want to see these logs, use: - tset.Logger = zap.New(zapcore.NewTee(core, zaptest.NewLogger(t).Core())) - //tset.Logger = zap.New(core) + //tset.Logger = zap.New(zapcore.NewTee(core, zaptest.NewLogger(t).Core())) + tset.Logger = zap.New(core) return tset, obslogs } @@ -270,28 +271,47 @@ func standardEnding(t *testing.T, tp testParams, testCon *testConsumer, expect [ assert.Equiv(asserter, expectJSON, receivedJSON) } -func failureMemoryLimitEnding(t *testing.T, _ testParams, testCon *testConsumer, _ [][]ptrace.Traces) { - require.Equal(t, 0, testCon.sink.SpanCount()) - - var memErrs int - - // Make sure we've exercised the memory limit. - for _, rl := range testCon.expLogs.All() { +func logSigs(obs *observer.ObservedLogs) (map[string]int, []string) { + counts := map[string]int{} + var msgs []string + for _, rl := range obs.All() { + var attrs []string for _, f := range rl.Context { - fmt.Println("EXP", rl.Message, f.String) - if strings.Contains(f.String, common.MemoryErrorStringPrefix) { - memErrs++ + attrs = append(attrs, f.Key) + + if rl.Message == "arrow stream error" && f.Key == "message" { + msgs = append(msgs, f.String) } } + var sig strings.Builder + sig.WriteString(rl.Message) + sig.WriteString("|||") + sig.WriteString(strings.Join(attrs, "///")) + counts[sig.String()]++ } + return counts, msgs +} - for _, rl := range testCon.recvLogs.All() { - for _, f := range rl.Context { - fmt.Println("RECV", rl.Message, f.String) +func countMemoryLimitErrors(msgs []string) (cnt int) { + for _, msg := range msgs { + if _, ok := arrow.NewLimitErrorFromError(errors.New(msg)); ok { + cnt++ } } + return +} + +func failureMemoryLimitEnding(t *testing.T, _ testParams, testCon *testConsumer, _ [][]ptrace.Traces) { + require.Equal(t, 0, testCon.sink.SpanCount()) - require.Less(t, 0, memErrs, "should have seen memory limit errors") + eSigs, eMsgs := logSigs(testCon.expLogs) + rSigs, rMsgs := logSigs(testCon.recvLogs) + + require.Less(t, 0, eSigs["arrow stream error|||code///message///where"], "should have exporter arrow stream errors: %v", eSigs) + require.Less(t, 0, rSigs["arrow stream error|||code///message///where"], "should have receiver arrow stream errors: %v", rSigs) + + require.Less(t, 0, countMemoryLimitErrors(rMsgs), "should have memory limit errors: %v", rMsgs) + require.Less(t, 0, countMemoryLimitErrors(eMsgs), "should have memory limit errors: %v", eMsgs) } func consumerSuccess(t *testing.T, err error) { @@ -302,10 +322,19 @@ func consumerFailure(t *testing.T, err error) { require.Error(t, err) // there should be no permanent errors anywhere in this test. - require.True(t, !consumererror.IsPermanent(err), "should not be permanent: %v", err) - require.True(t, - errors.Is(err, context.DeadlineExceeded) || - errors.Is(err, context.Canceled)) + require.True(t, !consumererror.IsPermanent(err), + "should not be permanent: %v", err) + + stat, ok := status.FromError(err) + require.True(t, ok, "should be a status error: %v", err) + + switch stat.Code() { + case codes.ResourceExhausted, codes.Canceled: + // Cool + default: + // Not cool + t.Fatalf("unexpected status code %v", stat) + } } func TestIntegrationTracesSimple(t *testing.T) { diff --git a/pkg/otel/arrow_record/consumer.go b/pkg/otel/arrow_record/consumer.go index 4ac571e553..dd00561e8f 100644 --- a/pkg/otel/arrow_record/consumer.go +++ b/pkg/otel/arrow_record/consumer.go @@ -62,10 +62,8 @@ type ConsumerAPI interface { var _ ConsumerAPI = &Consumer{} // ErrConsumerMemoryLimit is used by calling code to check -// errors.Is(err, ErrConsumerMemoryLimit). It is never returned, -// however when memory limit errors are seen, they are replaced -// to match this via Is(). -var ErrConsumerMemoryLimit error = common.MemoryLimitClassifier{} +// errors.Is(err, ErrConsumerMemoryLimit). It is never returned. +var ErrConsumerMemoryLimit error = common.LimitError{} var errConsumerInternalError = errors.New( "internal error: number of decoded records is smaller than the number of received payloads") @@ -393,9 +391,7 @@ func (c *Consumer) Consume(bar *colarspb.BatchArrowRecords) (ibes []*record_mess func distinguishMemoryError(err error) error { limErr, ok := common.NewLimitErrorFromError(err) - fmt.Println("ERRCHECK", ok, err, limErr) if ok { - fmt.Printf("We return: %T %v\n", limErr, limErr) return limErr } return err diff --git a/pkg/otel/common/arrow/allocator.go b/pkg/otel/common/arrow/allocator.go index 26e79adf5b..04f35d41c0 100644 --- a/pkg/otel/common/arrow/allocator.go +++ b/pkg/otel/common/arrow/allocator.go @@ -16,7 +16,6 @@ package arrow import ( "fmt" - "os" "regexp" "strconv" "strings" @@ -63,12 +62,10 @@ var limitRegexp = regexp.MustCompile(`requested (\d+) out of (\d+) \(in-use=(\d+ func NewLimitErrorFromError(err error) (error, bool) { msg := err.Error() if !strings.Contains(msg, MemoryErrorStringPrefix) { - fmt.Println("CASE A", err) return err, false } matches := limitRegexp.FindStringSubmatch(msg) if len(matches) != 4 { - fmt.Println("CASE B", err) return err, false } @@ -76,7 +73,6 @@ func NewLimitErrorFromError(err error) (error, bool) { lim, _ := strconv.ParseUint(matches[2], 10, 64) inuse, _ := strconv.ParseUint(matches[3], 10, 64) - fmt.Println("CASE C") return LimitError{ Request: req, Inuse: inuse, @@ -89,22 +85,10 @@ func (le LimitError) Error() string { } func (_ LimitError) Is(tgt error) bool { - if _, ok := tgt.(LimitError); ok { - return true - } - _, ok := tgt.(MemoryLimitClassifier) + _, ok := tgt.(LimitError) return ok } -type MemoryLimitClassifier struct { -} - -var _ error = MemoryLimitClassifier{} - -func (MemoryLimitClassifier) Error() string { - return "error class: memory limit exceeded" -} - func (l *LimitedAllocator) Inuse() uint64 { return l.inuse } @@ -117,9 +101,6 @@ func (l *LimitedAllocator) Allocate(size int) []byte { Inuse: l.inuse, Limit: l.limit, } - // Write the error to stderr so that it is visible even if the - // panic is caught. - os.Stderr.WriteString(err.Error() + "\n") panic(err) } @@ -138,9 +119,6 @@ func (l *LimitedAllocator) Reallocate(size int, b []byte) []byte { Inuse: l.inuse, Limit: l.limit, } - // Write the error to stderr so that it is visible even if the - // panic is caught. - os.Stderr.WriteString(err.Error() + "\n") panic(err) } From 8fc3c98043dfb6e0d956ceedf05b8954b31da5c3 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 13:57:52 -0700 Subject: [PATCH 10/15] revert arrow v16 --- collector/exporter/otelarrowexporter/go.mod | 3 +-- collector/exporter/otelarrowexporter/go.sum | 2 -- collector/exporter/otelarrowexporter/otelarrow.go | 2 +- collector/test/go.mod | 5 ++++- collector/test/go.sum | 9 +++++++++ go.mod | 3 ++- go.sum | 4 ++-- 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 | 4 ++-- 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 +++--- pkg/otel/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 | 2 +- pkg/otel/common/arrow/allocator_test.go | 2 +- 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 +++--- pkg/otel/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 +- pkg/otel/common/schema/transform/dictionary.go | 2 +- pkg/otel/common/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 +- pkg/otel/common/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, 160 insertions(+), 150 deletions(-) diff --git a/collector/exporter/otelarrowexporter/go.mod b/collector/exporter/otelarrowexporter/go.mod index ae4db40444..10aa38b017 100644 --- a/collector/exporter/otelarrowexporter/go.mod +++ b/collector/exporter/otelarrowexporter/go.mod @@ -5,7 +5,7 @@ go 1.21 toolchain go1.21.4 require ( - github.com/apache/arrow/go/v16 v16.1.0 + github.com/apache/arrow/go/v14 v14.0.2 github.com/open-telemetry/otel-arrow v0.23.0 github.com/open-telemetry/otel-arrow/collector v0.23.0 github.com/stretchr/testify v1.9.0 @@ -36,7 +36,6 @@ require ( require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect - github.com/apache/arrow/go/v14 v14.0.2 // indirect github.com/axiomhq/hyperloglog v0.0.0-20230201085229-3ddf4bad03dc // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect diff --git a/collector/exporter/otelarrowexporter/go.sum b/collector/exporter/otelarrowexporter/go.sum index b9715985fe..b0b6eba08a 100644 --- a/collector/exporter/otelarrowexporter/go.sum +++ b/collector/exporter/otelarrowexporter/go.sum @@ -5,8 +5,6 @@ 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/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= -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/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/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/collector/exporter/otelarrowexporter/otelarrow.go b/collector/exporter/otelarrowexporter/otelarrow.go index 627fd52842..783b507b35 100644 --- a/collector/exporter/otelarrowexporter/otelarrow.go +++ b/collector/exporter/otelarrowexporter/otelarrow.go @@ -10,7 +10,7 @@ import ( "runtime" "time" - arrowPkg "github.com/apache/arrow/go/v16/arrow" + arrowPkg "github.com/apache/arrow/go/v14/arrow" "github.com/open-telemetry/otel-arrow/collector/compression/zstd" "github.com/open-telemetry/otel-arrow/collector/netstats" arrowRecord "github.com/open-telemetry/otel-arrow/pkg/otel/arrow_record" diff --git a/collector/test/go.mod b/collector/test/go.mod index eca4f38b2f..4a7a022b37 100644 --- a/collector/test/go.mod +++ b/collector/test/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/otel-arrow/collector/test go 1.22.2 require ( + github.com/gogo/status v1.1.1 github.com/open-telemetry/otel-arrow v0.23.0 github.com/open-telemetry/otel-arrow/collector v0.23.0 github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.23.0 @@ -14,6 +15,7 @@ require ( go.opentelemetry.io/collector/pdata v1.5.0 go.opentelemetry.io/collector/receiver v0.98.0 go.uber.org/zap v1.27.0 + google.golang.org/grpc v1.63.2 ) require ( @@ -34,7 +36,9 @@ require ( 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/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect github.com/google/flatbuffers v23.5.26+incompatible // indirect github.com/google/uuid v1.6.0 // indirect @@ -89,7 +93,6 @@ require ( golang.org/x/tools v0.15.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect - google.golang.org/grpc v1.63.2 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/test/go.sum b/collector/test/go.sum index 94a66c24e4..b2205249f2 100644 --- a/collector/test/go.sum +++ b/collector/test/go.sum @@ -40,9 +40,16 @@ github.com/go-viper/mapstructure/v2 v2.0.0-alpha.1 h1:TQcrn6Wq+sKGkpyPvppOz99zsM 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/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a h1:dR8+Q0uO5S2ZBcs2IH6VBKYwSxPo2vYCYq0ot0mu7xA= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.1 h1:DuHXlSFHNKqTQ+/ACf5Vs6r4X/dH2EgIzR9Vr+H65kg= +github.com/gogo/status v1.1.1/go.mod h1:jpG3dM5QPcqu19Hg8lkUhBFBa3TcLs1DG7+2Jqci7oU= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= @@ -253,8 +260,10 @@ gonum.org/v1/gonum v0.15.0 h1:2lYxjRbTYyxkJxlhC+LvJIx3SsANPdRybu1tGj9/OrQ= gonum.org/v1/gonum v0.15.0/go.mod h1:xzZVBJBtS+Mz4q0Yl2LJTk+OxOg4jiXZ7qBoM0uISGo= gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/go.mod b/go.mod index 5e1ccc931c..fc227691d9 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.21.4 require ( github.com/HdrHistogram/hdrhistogram-go v1.1.2 - github.com/apache/arrow/go/v16 v16.1.0 + github.com/apache/arrow/go/v14 v14.0.2 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 @@ -52,6 +52,7 @@ require ( golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.19.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect + gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 0c2ecb947b..999aefb110 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/v14 v14.0.2 h1:N8OkaJEOfI3mEZt07BIkvo4sC6XDbL+48MBPWO5IONw= +github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY= 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= diff --git a/pkg/arrow/from_array.go b/pkg/arrow/from_array.go index 3d5afb2dd1..b94ac18ec0 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 b1b22a7bc6..cce0911d85 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 fed27132ad..71d8d80df2 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/v14/arrow" "github.com/open-telemetry/otel-arrow/pkg/werror" ) diff --git a/pkg/arrow/from_sparseunion.go b/pkg/arrow/from_sparseunion.go index 3423999363..a5a5ddf04a 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/v14/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 bc5dbccc3e..2f043c1629 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 35abd2821c..b10f781912 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 adec8467c1..c36f0d6424 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 283a0a046b..d6155eeae8 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/v14/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 f4a3960c7e..5ed9200a40 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/v14/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 95115b1598..efdcdeb059 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/v14/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 68a4d122ab..7dc5e79107 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/v14/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 3a69767ef0..91b51960b4 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/v14/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 dd00561e8f..62eff883fa 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/v14/arrow/ipc" + "github.com/apache/arrow/go/v14/arrow/memory" "go.opentelemetry.io/collector/config/configtelemetry" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" diff --git a/pkg/otel/arrow_record/logs_dict_test.go b/pkg/otel/arrow_record/logs_dict_test.go index dfcfdd9ebe..362aa2e0fa 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/v14/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 8f7485039c..984db0a7d2 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/v14/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 35f98be3e1..6b6926faac 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/v14/arrow" + "github.com/apache/arrow/go/v14/arrow/ipc" + "github.com/apache/arrow/go/v14/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 5df26093c3..feb4d637c1 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/v14/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 51a4070335..af4775872d 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/v14/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 a2f9c64511..070966078e 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 04f35d41c0..5974624857 100644 --- a/pkg/otel/common/arrow/allocator.go +++ b/pkg/otel/common/arrow/allocator.go @@ -20,7 +20,7 @@ import ( "strconv" "strings" - "github.com/apache/arrow/go/v16/arrow/memory" + "github.com/apache/arrow/go/v14/arrow/memory" ) // MemoryErrorStringPrefix is a prefix used to recognize memory limit errors. diff --git a/pkg/otel/common/arrow/allocator_test.go b/pkg/otel/common/arrow/allocator_test.go index 05a9c722e5..10b6aaa030 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/v14/arrow/memory" "github.com/stretchr/testify/require" ) diff --git a/pkg/otel/common/arrow/any_value.go b/pkg/otel/common/arrow/any_value.go index 01f482a5d3..f5eaeddd3a 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 9c7a30994b..b61bb1f212 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 612f124b2d..31ec45d286 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/v14/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 8f9c7e1ac6..a12c302a92 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/v14/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 fe5b5d9850..eb770caabc 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/v14/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 e1bc0015fe..108a02becf 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/v14/arrow" + "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v14/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 a50fb31033..adc58e83aa 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/v14/arrow" + "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v14/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 36f073a8f5..162b42367f 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/v14/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 036bfbcce3..db397c2e60 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 f4a9d9476d..cff07b55f4 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 2a38d82afa..8adf7981de 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/v14/arrow" + "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v14/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 094f18993e..a9436542a6 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 0e4e9cbea0..a8f318dccc 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/v14/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 62f91a3a01..15c68e4691 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/v14/arrow" + "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v14/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 7ecfc82c06..db651be798 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/v14/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 61f3754096..4e015545f5 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/v14/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 d3c5968e26..b63fe08cc7 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/v14/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 1eccaaefce..1b69e35fba 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/v14/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 5a1503e322..95362de294 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/v14/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 927b92f907..4ab7d9689f 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/v14/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 9f80aeb99d..a8435ab7d8 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/v14/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 d419945d60..4db36caa9b 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 11d0f01638..1767f5e00e 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/v14/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 d75ed49573..4247f493e9 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/v14/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 2123f15ac3..1a970ccbd6 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 6445462826..0de1241673 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 33e3de78b3..2dc393e6ea 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/v14/arrow" + "github.com/apache/arrow/go/v14/arrow/array" + "github.com/apache/arrow/go/v14/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 2786e2d98a..823b904fff 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 64917aa4cf..9aac2b906c 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/v14/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 2340f0414c..b34611ebc0 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 5513412ab7..22d16acde0 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 4061a1d779..7c7c2e6891 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/v14/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 2538be779d..e3ceb8b7f6 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/v14/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 afa867d1b4..8958edde3b 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/v14/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 f7beceb006..06706f92aa 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/v14/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 b2d8126b3c..6d7650c8f4 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/v14/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 56abfe6fd1..38e54a0feb 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/v14/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 40ddf6226f..20e6c629ef 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/v14/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 455cedf91b..a39c7ff355 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/v14/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 b4b6843eca..3039d16fdb 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/v14/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 cb65e991b6..c866c95de7 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 86aa2ba99e..77cdcde045 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/v14/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 a5a427a9a5..3260243a7f 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/v14/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 733ef83cf2..ed31cb1cde 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 9301078dd8..d0433ba2e6 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/v14/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 a8ba5d026b..f943313015 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 9d0942254f..abf78aa633 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/v14/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 bf960472f7..8f013fff39 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/v14/arrow" "errors" "math" diff --git a/pkg/otel/metrics/arrow/metrics.go b/pkg/otel/metrics/arrow/metrics.go index 584334815b..38b1d41edc 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/v14/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 723dd550ba..0f467bfe45 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/v14/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 a317b77feb..59355197d2 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 3d1038b7b3..12b137e0b4 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/v14/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 028612a7d1..b7b3e1fd17 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/v14/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 61d9c8ed61..f613f8d33b 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 614168e9fb..6c9677131b 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/v14/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 d462e1c688..e077f52ec7 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 e66bc6c7ab..4d44da49cc 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/v14/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 2bdc71cacf..0e7c637f74 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/v14/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 82c739c2f8..67c8620351 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/v14/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 4f9e4a7b78..f363a11c07 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/v14/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 64e2de301c..3aaeb3d0f6 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 6b0d7b0116..d05e7e6984 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/v14/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 70848dbcf8..7bbef47e27 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 5bffbb2085..71b24adc52 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 e18ccd1b20..0f5d085054 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/v14/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 d30080c285..f551575ffa 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/v14/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 e3e40e23d8..4e43284383 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 e1dec85274..5029b5659e 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/v14/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 b1d0e36fdb..909d8da960 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/v14/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 e9f94002f1..b193b712fb 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/v14/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 d0846bc89b..6792834e5b 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/v14/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 02cbc39c46..aa400e164a 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 8c213efa37..f4044202cb 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 917be13e1c..b479a96d85 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/v14/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 6a2fea3b69..2047c40957 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/v14/arrow" + "github.com/apache/arrow/go/v14/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 2569f04a8d..1a6729d8bd 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/v14/arrow" + "github.com/apache/arrow/go/v14/arrow/memory" arrowpb "github.com/open-telemetry/otel-arrow/api/experimental/arrow/v1" "github.com/open-telemetry/otel-arrow/pkg/benchmark" From d40cf419d9f42b9f60a2d5b1e24ce17faf8f5ff0 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 14:16:53 -0700 Subject: [PATCH 11/15] revert comment --- .../exporter/otelarrowexporter/internal/arrow/stream.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/collector/exporter/otelarrowexporter/internal/arrow/stream.go b/collector/exporter/otelarrowexporter/internal/arrow/stream.go index 2704376d05..f1e713c3c7 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/stream.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/stream.go @@ -370,12 +370,9 @@ func (s *Stream) read(_ context.Context) error { // cancel a call to Recv() but the call to processBatchStatus // is non-blocking. for { - // Note: if the client has called CloseSend() and is - // waiting for a response from the server. And if the - // server fails for some reason, we will wait until - // some other condition, such as a context timeout. - // TODO: possibly, improve to wait for no outstanding - // requests and then stop reading. + // Note: if the client has called CloseSend() and is waiting for a response from the server. + // And if the server fails for some reason, we will wait until some other condition, such as a context + // timeout. TODO: possibly, improve to wait for no outstanding requests and then stop reading. resp, err := s.client.Recv() if err != nil { // Note: do not wrap, contains a Status. From 30b5d514ba805f95781717e975eebc0763ec36bf Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 14:20:09 -0700 Subject: [PATCH 12/15] use status.Error() --- .../exporter/otelarrowexporter/internal/arrow/bestofn.go | 2 +- .../exporter/otelarrowexporter/internal/arrow/exporter.go | 4 ++-- collector/exporter/otelarrowexporter/internal/arrow/stream.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/collector/exporter/otelarrowexporter/internal/arrow/bestofn.go b/collector/exporter/otelarrowexporter/internal/arrow/bestofn.go index 944333149e..0c3d938d14 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/bestofn.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/bestofn.go @@ -117,7 +117,7 @@ func (lp *bestOfNPrioritizer) sendAndWait(ctx context.Context, errCh <-chan erro case <-lp.done: return ErrStreamRestarting case <-ctx.Done(): - return status.Errorf(codes.Canceled, "stream canceled") + return status.Error(codes.Canceled, ctx.Err().Error()) case lp.input <- wri: return waitForWrite(ctx, errCh, lp.done) } diff --git a/collector/exporter/otelarrowexporter/internal/arrow/exporter.go b/collector/exporter/otelarrowexporter/internal/arrow/exporter.go index 86b549bf64..544a6ee20a 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/exporter.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/exporter.go @@ -259,7 +259,7 @@ func (e *Exporter) runArrowStream(ctx context.Context, dc doneCancel, state *str func (e *Exporter) SendAndWait(ctx context.Context, data any) (bool, error) { select { case <-ctx.Done(): - return false, status.Errorf(codes.Canceled, "incoming request already canceled") + return false, status.Error(codes.Canceled, "incoming request already canceled") default: } @@ -348,7 +348,7 @@ func waitForWrite(ctx context.Context, errCh <-chan error, down <-chan struct{}) select { case <-ctx.Done(): // This caller's context timed out. - return status.Errorf(codes.Canceled, ctx.Err().Error()) + return status.Error(codes.Canceled, ctx.Err().Error()) case <-down: return ErrStreamRestarting case err := <-errCh: diff --git a/collector/exporter/otelarrowexporter/internal/arrow/stream.go b/collector/exporter/otelarrowexporter/internal/arrow/stream.go index f1e713c3c7..78d7345c43 100644 --- a/collector/exporter/otelarrowexporter/internal/arrow/stream.go +++ b/collector/exporter/otelarrowexporter/internal/arrow/stream.go @@ -272,7 +272,7 @@ func (s *Stream) write(ctx context.Context) (retErr error) { return nil case wri = <-s.workState.toWrite: case <-ctx.Done(): - return status.Errorf(codes.Canceled, ctx.Err().Error()) + return status.Error(codes.Canceled, ctx.Err().Error()) } err := s.encodeAndSend(wri, &hdrsBuf, hdrsEnc) From 0fc86a964cd4774ffaf191e1161413d8245386e7 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 14:24:45 -0700 Subject: [PATCH 13/15] comment receiverStream --- .../otelarrowreceiver/internal/arrow/arrow.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go b/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go index df2ce5bc2b..5515b7fe06 100644 --- a/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go +++ b/collector/receiver/otelarrowreceiver/internal/arrow/arrow.go @@ -85,6 +85,7 @@ type Receiver struct { boundedQueue *admission.BoundedQueue } +// receiverStream holds the inFlightWG for a single stream. type receiverStream struct { *Receiver inFlightWG sync.WaitGroup @@ -362,14 +363,6 @@ func (r *Receiver) recoverErr(retErr *error) { } } -func (r *Receiver) newReceiverStream() *receiverStream { - rs := &receiverStream{ - Receiver: r, - } - //@@@rs.inFlightWG.Add(1) - return rs -} - func (r *Receiver) anyStream(serverStream anyStreamServer, method string) (retErr error) { streamCtx := serverStream.Context() ac := r.newConsumer() @@ -398,7 +391,9 @@ func (r *Receiver) anyStream(serverStream anyStreamServer, method string) (retEr sendWG.Add(1) recvWG.Add(1) - rstream := r.newReceiverStream() + rstream := &receiverStream{ + Receiver: r, + } go func() { var err error From ed3d10860f9d6a7e5fddc13f4d876161565b844a Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 14:30:50 -0700 Subject: [PATCH 14/15] revert all gomods --- collector/exporter/otelarrowexporter/go.mod | 11 +++++----- collector/exporter/otelarrowexporter/go.sum | 24 ++++++++++----------- go.mod | 12 +++++------ go.sum | 24 ++++++++++----------- 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/collector/exporter/otelarrowexporter/go.mod b/collector/exporter/otelarrowexporter/go.mod index 10aa38b017..937525a324 100644 --- a/collector/exporter/otelarrowexporter/go.mod +++ b/collector/exporter/otelarrowexporter/go.mod @@ -50,12 +50,12 @@ require ( github.com/goccy/go-json v0.10.2 // 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/flatbuffers v23.5.26+incompatible // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/go-version v1.6.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/cpuid/v2 v2.2.5 // 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 @@ -64,7 +64,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mostynb/go-grpc-compression v1.2.2 // indirect - github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.19.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect @@ -82,11 +82,10 @@ require ( go.opentelemetry.io/otel/metric v1.25.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect - golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect - golang.org/x/mod v0.16.0 // indirect + golang.org/x/mod v0.14.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.19.0 // indirect + golang.org/x/tools v0.15.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/collector/exporter/otelarrowexporter/go.sum b/collector/exporter/otelarrowexporter/go.sum index b0b6eba08a..e4c966927e 100644 --- a/collector/exporter/otelarrowexporter/go.sum +++ b/collector/exporter/otelarrowexporter/go.sum @@ -41,8 +41,8 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk= github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI= -github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= +github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -58,8 +58,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI 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/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/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= @@ -88,8 +88,8 @@ github.com/open-telemetry/otel-arrow v0.23.0 h1:Vx4q3GR36l9O+S7ZOOITNL1TPp+X1Wxk github.com/open-telemetry/otel-arrow v0.23.0/go.mod h1:F50XFaiNfkfB0MYftZIUKFULm6pxfGqjbgQzevi+65M= github.com/open-telemetry/otel-arrow/collector v0.23.0 h1:ztmq1ipJBhm4xWjHDbmKOtgP3Nl/ZDoLX+3ThhzFs6k= github.com/open-telemetry/otel-arrow/collector v0.23.0/go.mod h1:SLgLEhhcfR9MjG1taK8RPuwiuIoAPW7IpCjFBobwIUM= -github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= -github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= +github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU= @@ -186,8 +186,8 @@ golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= -golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -195,8 +195,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.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= -golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.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= @@ -226,8 +226,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.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= +golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= +golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= 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 fc227691d9..fa80a1f8c1 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/metric v1.25.0 go.uber.org/mock v0.4.0 - golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 + golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa google.golang.org/grpc v1.63.2 google.golang.org/protobuf v1.33.0 ) @@ -33,24 +33,24 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/flatbuffers v24.3.25+incompatible // indirect + github.com/google/flatbuffers v23.5.26+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.5 // 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 - github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pierrec/lz4/v4 v4.1.18 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect go.opentelemetry.io/otel/trace v1.25.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/mod v0.16.0 // indirect + golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.24.0 // indirect golang.org/x/sys v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect - golang.org/x/tools v0.19.0 // indirect + golang.org/x/tools v0.15.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect gonum.org/v1/gonum v0.15.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect diff --git a/go.sum b/go.sum index 999aefb110..65c7830348 100644 --- a/go.sum +++ b/go.sum @@ -31,8 +31,8 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG 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= -github.com/google/flatbuffers v24.3.25+incompatible h1:CX395cjN9Kke9mmalRoL3d81AtFUxJM+yDthflgJGkI= -github.com/google/flatbuffers v24.3.25+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= +github.com/google/flatbuffers v23.5.26+incompatible h1:M9dgRyhJemaM4Sw8+66GHBu8ioaQmyPLg1b8VwK5WJg= +github.com/google/flatbuffers v23.5.26+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -46,8 +46,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI 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/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg= +github.com/klauspost/cpuid/v2 v2.2.5/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= @@ -66,8 +66,8 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= -github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ= +github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= @@ -110,8 +110,8 @@ golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ= -golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ= +golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -119,8 +119,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.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= -golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= +golang.org/x/mod v0.14.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= @@ -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.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= -golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= +golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= +golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= 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= From b5cfa27dd71bc5d222c0edc6624eb18886177289 Mon Sep 17 00:00:00 2001 From: Joshua MacDonald Date: Tue, 4 Jun 2024 14:45:57 -0700 Subject: [PATCH 15/15] fix test --- pkg/otel/common/arrow/allocator_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/otel/common/arrow/allocator_test.go b/pkg/otel/common/arrow/allocator_test.go index 10b6aaa030..7925b9da67 100644 --- a/pkg/otel/common/arrow/allocator_test.go +++ b/pkg/otel/common/arrow/allocator_test.go @@ -69,6 +69,5 @@ func TestLimitedAllocatorFormatted(t *testing.T) { require.True(t, ok) require.Equal(t, expect, unwrap) - // @@@ HERE CHECK THE CLASSIFIER - require.True(t, + require.True(t, errors.Is(unwrap, LimitError{})) }