Skip to content
This repository has been archived by the owner on Nov 7, 2023. It is now read-only.

Updates from open-telemetry/otel-arrow committed June 28 through Aug 14 #60

Merged
merged 2 commits into from
Aug 14, 2023
Merged

Updates from open-telemetry/otel-arrow committed June 28 through Aug 14 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1dcbb5
Updates from c5c36c334e75795b1c3a49e503601ae4b8fb7782 through caeffd6…
jmacd Aug 14, 2023
61c24e8
Merge branch 'main' of github.com:open-telemetry/otel-arrow-collector…
jmacd Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/otelcorecol/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ require (
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/f5/otel-arrow-adapter v0.0.0-20230629002931-9dac16c8ad8f // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
Expand All @@ -56,7 +55,7 @@ require (
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/asmfmt v1.3.2 // indirect
github.com/klauspost/compress v1.16.6 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
Expand All @@ -69,6 +68,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.1.19 // indirect
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand Down
8 changes: 4 additions & 4 deletions cmd/otelcorecol/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,8 +650,6 @@ github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J
github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
github.com/f5/otel-arrow-adapter v0.0.0-20230629002931-9dac16c8ad8f h1:GQeKf74r7kOzLxO53CFRoBj38i+I+5fOgtnc/Kzmv4g=
github.com/f5/otel-arrow-adapter v0.0.0-20230629002931-9dac16c8ad8f/go.mod h1:LlrQzSY6y3cusaBHQ6fTy5NuiGfhBkC/2dJKa2k1w0M=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
Expand Down Expand Up @@ -840,8 +838,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
github.com/klauspost/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
Expand Down Expand Up @@ -913,6 +911,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60 h1:yCQq2YHwISLwlCuRiFC+kvrT3Y0lC4k9KrijSLjlJ10=
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60/go.mod h1:yWEudwLj+xkvv3oooZyuzwrpAZhlS00gN24GUDJyDfc=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
Expand Down
2 changes: 1 addition & 1 deletion config/configgrpc/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.6 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions config/configgrpc/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
Expand Down
7 changes: 5 additions & 2 deletions exporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,22 @@ go 1.19

require (
github.com/cenkalti/backoff/v4 v4.2.1
github.com/klauspost/compress v1.16.7
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60
github.com/stretchr/testify v1.8.4
go.opencensus.io v0.24.0
go.opentelemetry.io/collector v0.80.0
go.opentelemetry.io/collector/component v0.80.0
go.opentelemetry.io/collector/confmap v0.80.0
go.opentelemetry.io/collector/consumer v0.80.0
go.opentelemetry.io/collector/extension v0.80.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0013
go.opentelemetry.io/otel v1.16.0
go.opentelemetry.io/otel/sdk v1.16.0
go.opentelemetry.io/otel/trace v1.16.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.24.0
gopkg.in/natefinch/lumberjack.v2 v2.2.1
)

require (
Expand Down Expand Up @@ -44,15 +49,13 @@ require (
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/statsd_exporter v0.22.7 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.80.0 // indirect
go.opentelemetry.io/collector/confmap v0.80.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 // indirect
go.opentelemetry.io/collector/processor v0.80.0 // indirect
go.opentelemetry.io/collector/receiver v0.80.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.11.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
Expand Down
6 changes: 6 additions & 0 deletions exporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
github.com/knadh/koanf v1.5.0/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
Expand Down Expand Up @@ -286,6 +288,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60 h1:yCQq2YHwISLwlCuRiFC+kvrT3Y0lC4k9KrijSLjlJ10=
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60/go.mod h1:yWEudwLj+xkvv3oooZyuzwrpAZhlS00gN24GUDJyDfc=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
Expand Down Expand Up @@ -717,6 +721,8 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Expand Down
14 changes: 10 additions & 4 deletions exporter/otlpexporter/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package otlpexporter // import "go.opentelemetry.io/collector/exporter/otlpexpor

import (
"fmt"
"time"

"google.golang.org/grpc"

Expand Down Expand Up @@ -33,10 +34,11 @@ type Config struct {
// ArrowSettings includes whether Arrow is enabled and the number of
// concurrent Arrow streams.
type ArrowSettings struct {
Disabled bool `mapstructure:"disabled"`
NumStreams int `mapstructure:"num_streams"`
DisableDowngrade bool `mapstructure:"disable_downgrade"`
EnableMixedSignals bool `mapstructure:"enable_mixed_signals"`
Disabled bool `mapstructure:"disabled"`
NumStreams int `mapstructure:"num_streams"`
DisableDowngrade bool `mapstructure:"disable_downgrade"`
EnableMixedSignals bool `mapstructure:"enable_mixed_signals"`
MaxStreamLifetime time.Duration `mapstructure:"max_stream_lifetime"`
}

var _ component.Config = (*Config)(nil)
Expand All @@ -59,5 +61,9 @@ func (cfg *ArrowSettings) Validate() error {
return fmt.Errorf("stream count must be > 0: %d", cfg.NumStreams)
}

if cfg.MaxStreamLifetime.Seconds() < float64(1) {
return fmt.Errorf("max stream life must be > 0: %d", cfg.MaxStreamLifetime)
}

return nil
}
27 changes: 16 additions & 11 deletions exporter/otlpexporter/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,27 +79,32 @@ func TestUnmarshalConfig(t *testing.T) {
Arrow: ArrowSettings{
NumStreams: 2,
EnableMixedSignals: true,
MaxStreamLifetime: 2 * time.Hour,
},
}, cfg)
}

func TestArrowSettingsValidate(t *testing.T) {
settings := func(enabled bool, numStreams int) *ArrowSettings {
return &ArrowSettings{Disabled: !enabled, NumStreams: numStreams}
settings := func(enabled bool, numStreams int, maxStreamLifetime time.Duration) *ArrowSettings {
return &ArrowSettings{Disabled: !enabled, NumStreams: numStreams, MaxStreamLifetime: maxStreamLifetime}
}
require.NoError(t, settings(true, 1).Validate())
require.NoError(t, settings(false, 1).Validate())
require.NoError(t, settings(true, 2).Validate())
require.NoError(t, settings(true, math.MaxInt).Validate())
require.NoError(t, settings(true, 1, 10*time.Second).Validate())
require.NoError(t, settings(false, 1, 10*time.Second).Validate())
require.NoError(t, settings(true, 2, 1*time.Second).Validate())
require.NoError(t, settings(true, math.MaxInt, 10*time.Second).Validate())

require.Error(t, settings(true, 0).Validate())
require.Contains(t, settings(true, 0).Validate().Error(), "stream count must be")
require.Error(t, settings(false, -1).Validate())
require.Error(t, settings(true, math.MinInt).Validate())
require.Error(t, settings(true, 0, 10*time.Second).Validate())
require.Contains(t, settings(true, 0, 10*time.Second).Validate().Error(), "stream count must be")
require.Contains(t, settings(true, 1, -1*time.Second).Validate().Error(), "max stream life must be")
require.Error(t, settings(false, -1, 10*time.Second).Validate())
require.Error(t, settings(false, 1, -1*time.Second).Validate())
require.Error(t, settings(true, math.MinInt, 10*time.Second).Validate())
}

func TestDefaultSettingsValid(t *testing.T) {
cfg := createDefaultConfig()
// this must be set by the user and config
// validation always checks that a value is set.
cfg.(*Config).Arrow.MaxStreamLifetime = 2 * time.Second
require.NoError(t, cfg.(*Config).Validate())

}
8 changes: 5 additions & 3 deletions exporter/otlpexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ package otlpexporter // import "go.opentelemetry.io/collector/exporter/otlpexpor
import (
"context"
"runtime"
"time"

arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowpb "github.com/open-telemetry/otel-arrow/api/experimental/arrow/v1"
"google.golang.org/grpc"

"go.opentelemetry.io/collector/component"
Expand All @@ -22,7 +23,7 @@ import (

const (
// The value of "type" key in configuration.
typeStr = "otlp"
typeStr = "otelarrow"
)

// NewFactory creates a factory for OTLP exporter.
Expand All @@ -49,7 +50,8 @@ func createDefaultConfig() component.Config {
WriteBufferSize: 512 * 1024,
},
Arrow: ArrowSettings{
NumStreams: runtime.NumCPU(),
NumStreams: runtime.NumCPU(),
MaxStreamLifetime: time.Hour,
},
}
}
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlpexporter/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestCreateDefaultConfig(t *testing.T) {
assert.Equal(t, ocfg.QueueSettings, exporterhelper.NewDefaultQueueSettings())
assert.Equal(t, ocfg.TimeoutSettings, exporterhelper.NewDefaultTimeoutSettings())
assert.Equal(t, ocfg.Compression, configcompression.Gzip)
assert.Equal(t, ocfg.Arrow, ArrowSettings{Disabled: false, NumStreams: runtime.NumCPU()})
assert.Equal(t, ocfg.Arrow, ArrowSettings{Disabled: false, NumStreams: runtime.NumCPU(), MaxStreamLifetime: time.Hour})
}

func TestCreateMetricsExporter(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions exporter/otlpexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.19

require (
github.com/apache/arrow/go/v12 v12.0.1
github.com/f5/otel-arrow-adapter v0.0.0-20230629002931-9dac16c8ad8f
github.com/golang/mock v1.6.0
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/collector v0.80.0
go.opentelemetry.io/collector/component v0.80.0
Expand Down Expand Up @@ -49,7 +49,7 @@ require (
github.com/google/flatbuffers v2.0.8+incompatible // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/asmfmt v1.3.2 // indirect
github.com/klauspost/compress v1.16.6 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
Expand Down
8 changes: 4 additions & 4 deletions exporter/otlpexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8=
github.com/f5/otel-arrow-adapter v0.0.0-20230629002931-9dac16c8ad8f h1:GQeKf74r7kOzLxO53CFRoBj38i+I+5fOgtnc/Kzmv4g=
github.com/f5/otel-arrow-adapter v0.0.0-20230629002931-9dac16c8ad8f/go.mod h1:LlrQzSY6y3cusaBHQ6fTy5NuiGfhBkC/2dJKa2k1w0M=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
Expand Down Expand Up @@ -206,8 +204,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/asmfmt v1.3.2 h1:4Ri7ox3EwapiOjCki+hw14RyKk201CN4rzyCJRFLpK4=
github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE=
github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk=
github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/knadh/koanf v1.5.0 h1:q2TSd/3Pyc/5yP9ldIrSdIz26MCcyNQzW0pEAugLPNs=
Expand Down Expand Up @@ -268,6 +266,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk=
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60 h1:yCQq2YHwISLwlCuRiFC+kvrT3Y0lC4k9KrijSLjlJ10=
github.com/open-telemetry/otel-arrow v0.0.0-20230814172509-caeffd6edc60/go.mod h1:yWEudwLj+xkvv3oooZyuzwrpAZhlS00gN24GUDJyDfc=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
Expand Down
8 changes: 5 additions & 3 deletions exporter/otlpexporter/internal/arrow/common_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"io"
"testing"

arrowpb "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1"
arrowCollectorMock "github.com/f5/otel-arrow-adapter/api/experimental/arrow/v1/mock"
"github.com/golang/mock/gomock"
arrowpb "github.com/open-telemetry/otel-arrow/api/experimental/arrow/v1"
arrowCollectorMock "github.com/open-telemetry/otel-arrow/api/experimental/arrow/v1/mock"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest"
Expand Down Expand Up @@ -97,6 +97,7 @@ type commonTestStream struct {
ctxCall *gomock.Call
sendCall *gomock.Call
recvCall *gomock.Call
closeSendCall *gomock.Call
}

func (ctc *commonTestCase) newMockStream(ctx context.Context) *commonTestStream {
Expand All @@ -108,7 +109,8 @@ func (ctc *commonTestCase) newMockStream(ctx context.Context) *commonTestStream
sendCall: client.EXPECT().Send(
gomock.Any(), // *arrowpb.BatchArrowRecords
).Times(0),
recvCall: client.EXPECT().Recv().Times(0),
recvCall: client.EXPECT().Recv().Times(0),
closeSendCall: client.EXPECT().CloseSend().AnyTimes().Return(nil),
}
return testStream
}
Expand Down
Loading