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

Change With*Unmarshallers signatures #2973

Merged
merged 3 commits into from
Apr 21, 2021
Merged

Change With*Unmarshallers signatures #2973

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2a4e23
Change With*Unmarshallers signatures; Rename variables in kafkaReceiv…
sincejune Apr 21, 2021
feeef0a
fix tests
sincejune Apr 21, 2021
b72494b
rollback change to variables in kafkaReceiverFactory
sincejune Apr 21, 2021
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
rollback change to variables in kafkaReceiverFactory
  • Loading branch information
@sincejune
sincejune committed Apr 21, 2021
commit b72494b2a0542ca16436aa7bc879ce9e3f33cd7b
16 changes: 8 additions & 8 deletions receiver/kafkareceiver/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type FactoryOption func(factory *kafkaReceiverFactory)
func WithTracesUnmarshallers(tracesUnmarshallers ...TracesUnmarshaller) FactoryOption {
return func(factory *kafkaReceiverFactory) {
for _, unmarshaller := range tracesUnmarshallers {
factory.tracesUnmarshallers[unmarshaller.Encoding()] = unmarshaller
factory.tracesUnmarshalers[unmarshaller.Encoding()] = unmarshaller
}
}
}
Expand All @@ -57,16 +57,16 @@ func WithTracesUnmarshallers(tracesUnmarshallers ...TracesUnmarshaller) FactoryO
func WithLogsUnmarshallers(logsUnmarshallers ...LogsUnmarshaller) FactoryOption {
return func(factory *kafkaReceiverFactory) {
for _, unmarshaller := range logsUnmarshallers {
factory.logsUnmarshallers[unmarshaller.Encoding()] = unmarshaller
factory.logsUnmarshaller[unmarshaller.Encoding()] = unmarshaller
}
}
}

// NewFactory creates Kafka receiver factory.
func NewFactory(options ...FactoryOption) component.ReceiverFactory {
f := &kafkaReceiverFactory{
tracesUnmarshallers: defaultTracesUnmarshallers(),
logsUnmarshallers: defaultLogsUnmarshallers(),
tracesUnmarshalers: defaultTracesUnmarshallers(),
logsUnmarshaller: defaultLogsUnmarshallers(),
}
for _, o := range options {
o(f)
Expand Down Expand Up @@ -101,8 +101,8 @@ func createDefaultConfig() config.Receiver {
}

type kafkaReceiverFactory struct {
tracesUnmarshallers map[string]TracesUnmarshaller
logsUnmarshallers map[string]LogsUnmarshaller
tracesUnmarshalers map[string]TracesUnmarshaller
logsUnmarshaller map[string]LogsUnmarshaller
}

func (f *kafkaReceiverFactory) createTracesReceiver(
Expand All @@ -112,7 +112,7 @@ func (f *kafkaReceiverFactory) createTracesReceiver(
nextConsumer consumer.Traces,
) (component.TracesReceiver, error) {
c := cfg.(*Config)
r, err := newTracesReceiver(*c, params, f.tracesUnmarshallers, nextConsumer)
r, err := newTracesReceiver(*c, params, f.tracesUnmarshalers, nextConsumer)
if err != nil {
return nil, err
}
Expand All @@ -126,7 +126,7 @@ func (f *kafkaReceiverFactory) createLogsReceiver(
nextConsumer consumer.Logs,
) (component.LogsReceiver, error) {
c := cfg.(*Config)
r, err := newLogsReceiver(*c, params, f.logsUnmarshallers, nextConsumer)
r, err := newLogsReceiver(*c, params, f.logsUnmarshaller, nextConsumer)
if err != nil {
return nil, err
}
Expand Down
8 changes: 4 additions & 4 deletions receiver/kafkareceiver/factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestCreateTracesReceiver(t *testing.T) {
cfg := createDefaultConfig().(*Config)
cfg.Brokers = []string{"invalid:9092"}
cfg.ProtocolVersion = "2.0.0"
f := kafkaReceiverFactory{tracesUnmarshallers: defaultTracesUnmarshallers()}
f := kafkaReceiverFactory{tracesUnmarshalers: defaultTracesUnmarshallers()}
r, err := f.createTracesReceiver(context.Background(), component.ReceiverCreateParams{}, cfg, nil)
// no available broker
require.Error(t, err)
Expand All @@ -52,7 +52,7 @@ func TestCreateTracesReceiver_error(t *testing.T) {
cfg.ProtocolVersion = "2.0.0"
// disable contacting broker at startup
cfg.Metadata.Full = false
f := kafkaReceiverFactory{tracesUnmarshallers: defaultTracesUnmarshallers()}
f := kafkaReceiverFactory{tracesUnmarshalers: defaultTracesUnmarshallers()}
r, err := f.createTracesReceiver(context.Background(), component.ReceiverCreateParams{}, cfg, nil)
require.NoError(t, err)
assert.NotNil(t, r)
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestCreateLogsReceiver(t *testing.T) {
cfg := createDefaultConfig().(*Config)
cfg.Brokers = []string{"invalid:9092"}
cfg.ProtocolVersion = "2.0.0"
f := kafkaReceiverFactory{logsUnmarshallers: defaultLogsUnmarshallers()}
f := kafkaReceiverFactory{logsUnmarshaller: defaultLogsUnmarshallers()}
r, err := f.createLogsReceiver(context.Background(), component.ReceiverCreateParams{}, cfg, nil)
// no available broker
require.Error(t, err)
Expand All @@ -96,7 +96,7 @@ func TestCreateLogsReceiver_error(t *testing.T) {
cfg.ProtocolVersion = "2.0.0"
// disable contacting broker at startup
cfg.Metadata.Full = false
f := kafkaReceiverFactory{logsUnmarshallers: defaultLogsUnmarshallers()}
f := kafkaReceiverFactory{logsUnmarshaller: defaultLogsUnmarshallers()}
r, err := f.createLogsReceiver(context.Background(), component.ReceiverCreateParams{}, cfg, nil)
require.NoError(t, err)
assert.NotNil(t, r)
Expand Down