Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OpenTelemetry Protocol with Apache Arrow Receiver component #32015

Merged
merged 28 commits into from
Apr 24, 2024
Merged

OpenTelemetry Protocol with Apache Arrow Receiver component #32015

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c7caed8
Raw import @ c86a6c7
jmacd Mar 27, 2024
c0d325f
lint
jmacd Mar 27, 2024
1c3d4c3
ArrowSettings -> ArrowConfig
jmacd Mar 27, 2024
e6556ed
ConfigValidator update
jmacd Mar 27, 2024
0835778
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Mar 27, 2024
b201147
tiny revert
jmacd Mar 27, 2024
af2fbbf
tiny revert2
jmacd Mar 27, 2024
a64bdee
tiny revert3
jmacd Mar 27, 2024
35d5e46
chlog
jmacd Mar 27, 2024
bbd31a3
chlog
jmacd Mar 27, 2024
df250fd
tidy
jmacd Mar 27, 2024
6c22cfb
restore deps
jmacd Mar 28, 2024
c4bc81a
versions
jmacd Mar 28, 2024
00f5f07
crosslink
jmacd Mar 28, 2024
7eedbb8
gen
jmacd Mar 28, 2024
1b34d24
GOWORK=off
jmacd Mar 28, 2024
a25f09e
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Apr 22, 2024
c73fd92
from otel-arrow@14c63d1eaac7c53585e6b9195d09f1f9703869ed
jmacd Apr 22, 2024
f00f6b3
from codeboten
jmacd Apr 22, 2024
456444e
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Apr 22, 2024
9fd6d58
remove two
jmacd Apr 22, 2024
435ab69
Update cmd/otelcontribcol/go.mod
codeboten Apr 23, 2024
ea02f75
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Apr 23, 2024
4f6452a
make tidygenetc
jmacd Apr 23, 2024
42e95ab
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Apr 23, 2024
2c995b8
update go.mod toolchain
codeboten Apr 24, 2024
af13423
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Apr 24, 2024
04b9782
Merge branch 'jmacd/arrow_receiver' of github.com:jmacd/opentelemetry…
jmacd Apr 24, 2024
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
Prev Previous commit
Next Next commit
tidy
  • Loading branch information
@jmacd
jmacd committed Mar 27, 2024
commit df250fd63ca86aef98e3169c0e1e0a23bfc3da0e
6 changes: 5 additions & 1 deletion receiver/otelarrowreceiver/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"testing"
"time"

"github.com/open-telemetry/otel-arrow/collector/compression/zstd"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component"
Expand Down Expand Up @@ -53,7 +54,7 @@ func TestUnmarshalConfig(t *testing.T) {
Transport: "tcp",
jmacd marked this conversation as resolved.
Show resolved Hide resolved
},
TLSSetting: &configtls.ServerConfig{
TLSSetting: configtls.Config{
Config: configtls.Config{
CertFile: "test.crt",
KeyFile: "test.key",
},
Expand All @@ -78,6 +79,9 @@ func TestUnmarshalConfig(t *testing.T) {
},
Arrow: ArrowConfig{
MemoryLimitMiB: 123,
Zstd: zstd.DecoderConfig{
MemoryLimitMiB: 8,
},
},
},
}, cfg)
Expand Down
7 changes: 3 additions & 4 deletions receiver/otelarrowreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelar
go 1.21

require (
github.com/gogo/protobuf v1.3.2
github.com/klauspost/compress v1.17.7
github.com/open-telemetry/otel-arrow v0.18.0
github.com/open-telemetry/otel-arrow/collector v0.18.0
github.com/stretchr/testify v1.9.0
Expand All @@ -20,15 +18,13 @@ require (
go.opentelemetry.io/collector/extension/auth v0.97.0
go.opentelemetry.io/collector/pdata v1.4.0
go.opentelemetry.io/collector/receiver v0.97.0
go.opentelemetry.io/collector/semconv v0.97.0
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/metric v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
go.uber.org/mock v0.4.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.27.0
golang.org/x/net v0.21.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c
google.golang.org/grpc v1.62.1
)

Expand All @@ -46,12 +42,14 @@ 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/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // 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
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.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
Expand Down Expand Up @@ -84,6 +82,7 @@ require (
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.14.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Expand Down
2 changes: 0 additions & 2 deletions receiver/otelarrowreceiver/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions receiver/otelarrowreceiver/otelarrow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ func TestGRPCInvalidTLSCredentials(t *testing.T) {
Endpoint: testutil.GetAvailableLocalAddress(t),
Transport: "tcp",
},
TLSSetting: &configtls.TLSServerSetting{
TLSSetting: configtls.TLSSetting{
TLSSetting: &configtls.ServerConfig{
Config: configtls.Config{
CertFile: "willfail",
},
},
Expand Down
Loading