Fix tests

lightstep · Dec 21, 2023 · 4c42f2f · 4c42f2f
1 parent 2691000
commit 4c42f2f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 14 deletions.
diff --git a/go.mod b/go.mod
@@ -58,7 +58,6 @@ require (
 	github.com/open-telemetry/otel-arrow/collector v0.13.0 // indirect
 	github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.13.0 // indirect
 	github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.13.0 // indirect
-	github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.13.0 // indirect
 	github.com/pierrec/lz4/v4 v4.1.18 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect

diff --git a/lightstep/sdk/metric/exporters/otlp/otelcol/client.go b/lightstep/sdk/metric/exporters/otlp/otelcol/client.go
@@ -72,10 +72,10 @@ func NewDefaultConfig() Config {
 		SelfMetrics: true,
 		SelfSpans:   true,
 		Batcher: concurrentbatchprocessor.Config{
-			Timeout:          0,
-			SendBatchSize:    1000,
-			SendBatchMaxSize: 1500,
-			MaxInFlightBytes: 32 * 1024 * 1024,
+			Timeout:            0,
+			SendBatchSize:      1000,
+			SendBatchMaxSize:   1500,
+			MaxInFlightSizeMiB: 32 * 1024 * 1024,
 		},
 		Exporter: otelarrowexporter.Config{
 			TimeoutSettings: exporterhelper.TimeoutSettings{

diff --git a/lightstep/sdk/metric/exporters/otlp/otelcol/client_test.go b/lightstep/sdk/metric/exporters/otlp/otelcol/client_test.go
@@ -167,9 +167,8 @@ func (t *clientTestSuite) SetupSuite() {
 
 	factory := otelarrowreceiver.NewFactory()
 	cfg := factory.CreateDefaultConfig().(*otelarrowreceiver.Config)
-	cfg.Protocols.Arrow = &otelarrowreceiver.ArrowSettings{}
+	cfg.Protocols.Arrow = otelarrowreceiver.ArrowSettings{}
 	cfg.GRPC.NetAddr = confignet.NetAddr{Endpoint: t.addr, Transport: "tcp"}
-	cfg.HTTP = nil
 
 	set := receivertest.NewNopCreateSettings()
 	tc := &consumertest.MetricsSink{}
@@ -261,7 +260,7 @@ func (t *clientTestSuite) TestCounterAndGauge() {
 
 	counter.Add(ctx, 1, metric.WithAttributes(testStmtAttrs...))
 
-	_ = t.sdk.Shutdown(ctx)
+	t.NoError(t.sdk.Shutdown(ctx))
 
 	t.Equal(1, len(t.sink.AllMetrics()))
 

diff --git a/lightstep/sdk/trace/exporters/otlp/otelcol/client.go b/lightstep/sdk/trace/exporters/otlp/otelcol/client.go
@@ -77,10 +77,10 @@ func NewDefaultConfig() Config {
 		SelfMetrics: true,
 		SelfSpans:   false,
 		Batcher: concurrentbatchprocessor.Config{
-			Timeout:          time.Second,
-			SendBatchSize:    1000,
-			SendBatchMaxSize: 1500,
-			MaxInFlightBytes: 32 * 1024 * 1024,
+			Timeout:            time.Second,
+			SendBatchSize:      1000,
+			SendBatchMaxSize:   1500,
+			MaxInFlightSizeMiB: 32 * 1024 * 1024,
 		},
 		Exporter: otelarrowexporter.Config{
 			TimeoutSettings: exporterhelper.TimeoutSettings{

diff --git a/lightstep/sdk/trace/exporters/otlp/otelcol/client_test.go b/lightstep/sdk/trace/exporters/otlp/otelcol/client_test.go
@@ -115,9 +115,8 @@ func (t *clientTestSuite) SetupSuite() {
 
 	factory := otelarrowreceiver.NewFactory()
 	cfg := factory.CreateDefaultConfig().(*otelarrowreceiver.Config)
-	cfg.Protocols.Arrow = &otelarrowreceiver.ArrowSettings{}
+	cfg.Protocols.Arrow = otelarrowreceiver.ArrowSettings{}
 	cfg.GRPC.NetAddr = confignet.NetAddr{Endpoint: t.addr, Transport: "tcp"}
-	cfg.HTTP = nil
 
 	set := receivertest.NewNopCreateSettings()
 	tc := &consumertest.TracesSink{}