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

Backport receiver changes from collector-contrib #197

Merged
merged 2 commits into from
May 21, 2024
Merged

Backport receiver changes from collector-contrib #197

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
03cc594
Back-port from OTel-Collector-Contrib OTel-Arrow receiver, metadata c…
jmacd May 20, 2024
9c2b5cd
Merge branch 'main' into jmacd/recv_back
jmacd May 20, 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
6 changes: 3 additions & 3 deletions collector/receiver/otelarrowreceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ const (
defaultWaiterLimit = 1000
)

// NewFactory creates a new OTLP receiver factory.
// NewFactory creates a new OTel-Arrow receiver factory.
func NewFactory() receiver.Factory {
return receiver.NewFactory(
component.MustNewType(metadata.Type),
metadata.Type,
createDefaultConfig,
receiver.WithTraces(createTraces, metadata.TracesStability),
receiver.WithMetrics(createMetrics, metadata.MetricsStability),
Expand Down Expand Up @@ -112,7 +112,7 @@ func createLog(
return r, nil
}

// This is the map of already created OTLP receivers for particular configurations.
// This is the map of already created OTel-Arrow receivers for particular configurations.
// We maintain this map because the Factory is asked trace and metric receivers separately
// when it gets CreateTracesReceiver() and CreateMetricsReceiver() but they must not
// create separate objects, they must use one otelArrowReceiver object per configuration.
Expand Down
83 changes: 83 additions & 0 deletions collector/receiver/otelarrowreceiver/generated_component_test.go
View file
Open in desktop

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

13 changes: 13 additions & 0 deletions collector/receiver/otelarrowreceiver/generated_package_test.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion collector/receiver/otelarrowreceiver/internal/arrow/arrow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var (
ErrNoMetricsConsumer = fmt.Errorf("no metrics consumer")
ErrNoLogsConsumer = fmt.Errorf("no logs consumer")
ErrNoTracesConsumer = fmt.Errorf("no traces consumer")
ErrUnrecognizedPayload = fmt.Errorf("unrecognized OTLP payload")
ErrUnrecognizedPayload = fmt.Errorf("unrecognized OTel-Arrow payload")
)

type Consumers interface {
Expand Down
7 changes: 5 additions & 2 deletions collector/receiver/otelarrowreceiver/internal/metadata/generated_status.go
View file
Open in desktop

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

17 changes: 17 additions & 0 deletions collector/receiver/otelarrowreceiver/internal/metadata/generated_telemetry.go
View file
Open in desktop

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

63 changes: 63 additions & 0 deletions collector/receiver/otelarrowreceiver/internal/metadata/generated_telemetry_test.go
View file
Open in desktop

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

8 changes: 4 additions & 4 deletions collector/receiver/otelarrowreceiver/otelarrow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import (

const otlpReceiverName = "receiver_test"

var testReceiverID = component.NewIDWithName(component.MustNewType(componentMetadata.Type), otlpReceiverName)
var testReceiverID = component.NewIDWithName(componentMetadata.Type, otlpReceiverName)

func TestGRPCNewPortAlreadyUsed(t *testing.T) {
addr := testutil.GetAvailableLocalAddress(t)
Expand All @@ -65,13 +65,13 @@ func TestGRPCNewPortAlreadyUsed(t *testing.T) {
require.Error(t, r.Start(context.Background(), componenttest.NewNopHost()))
}

// TestOTLPReceiverGRPCTracesIngestTest checks that the gRPC trace receiver
// TestOTelArrowReceiverGRPCTracesIngestTest checks that the gRPC trace receiver
// is returning the proper response (return and metrics) when the next consumer
// in the pipeline reports error. The test changes the responses returned by the
// next trace consumer, checks if data was passed down the pipeline and if
// proper metrics were recorded. It also uses all endpoints supported by the
// trace receiver.
func TestOTLPReceiverGRPCTracesIngestTest(t *testing.T) {
func TestOTelArrowReceiverGRPCTracesIngestTest(t *testing.T) {
type ingestionStateTest struct {
okToIngest bool
expectedCode codes.Code
Expand Down Expand Up @@ -236,7 +236,7 @@ func TestShutdown(t *testing.T) {

nextSink := new(consumertest.TracesSink)

// Create OTLP receiver
// Create OTelArrow receiver
factory := NewFactory()
cfg := factory.CreateDefaultConfig().(*Config)
cfg.GRPC.NetAddr.Endpoint = endpointGrpc
Expand Down
Loading