Add logger to construction methods. (#483)

Opportunistic fix: renamed the files of factorytemplate package.

Author: Paulo Janotti

…iver/factorytemplate/factory_template.go …eiver/factorytemplate/factorytemplate.goreceiver/factorytemplate/factory_template.go renamed to receiver/factorytemplate/factorytemplate.go receiver/factorytemplate/factory_template.go renamed to receiver/factorytemplate/factorytemplate.go

@@ -51,14 +51,14 @@ type factory struct {
 
 type traceReceiverFactory struct {
 	factory
-	newReceiver func(interface{}, consumer.TraceConsumer) (receiver.TraceReceiver, error)
+	newReceiver func(interface{}, consumer.TraceConsumer, *zap.Logger) (receiver.TraceReceiver, error)
 }
 
 var _ (receiver.TraceReceiverFactory) = (*traceReceiverFactory)(nil)
 
 type metricsReceiverFactory struct {
 	factory
-	newReceiver func(interface{}, consumer.MetricsConsumer) (receiver.MetricsReceiver, error)
+	newReceiver func(interface{}, consumer.MetricsConsumer, *zap.Logger) (receiver.MetricsReceiver, error)
 }
 
 var _ (receiver.MetricsReceiverFactory) = (*metricsReceiverFactory)(nil)
@@ -77,7 +77,7 @@ var _ (receiver.MetricsReceiverFactory) = (*metricsReceiverFactory)(nil)
 func NewTraceReceiverFactory(
 	receiverType string,
 	newDefaulfCfg func() interface{},
-	newReceiver func(interface{}, consumer.TraceConsumer) (receiver.TraceReceiver, error),
+	newReceiver func(interface{}, consumer.TraceConsumer, *zap.Logger) (receiver.TraceReceiver, error),
 ) (receiver.TraceReceiverFactory, error) {
 	if receiverType == "" {
 		return nil, ErrEmptyReciverType
@@ -112,7 +112,7 @@ func NewTraceReceiverFactory(
 func NewMetricsReceiverFactory(
 	receiverType string,
 	newDefaulfCfg func() interface{},
-	newReceiver func(interface{}, consumer.MetricsConsumer) (receiver.MetricsReceiver, error),
+	newReceiver func(interface{}, consumer.MetricsConsumer, *zap.Logger) (receiver.MetricsReceiver, error),
 ) (receiver.MetricsReceiverFactory, error) {
 	if receiverType == "" {
 		return nil, ErrEmptyReciverType
@@ -147,7 +147,7 @@ func (trf *traceReceiverFactory) NewFromViper(v *viper.Viper, next consumer.Trac
 	if err != nil {
 		return nil, err
 	}
-	r, err := trf.newReceiver(cfg, next)
+	r, err := trf.newReceiver(cfg, next, logger)
 	if err != nil {
 		return nil, err
 	}
@@ -165,7 +165,7 @@ func (mrf *metricsReceiverFactory) NewFromViper(v *viper.Viper, next consumer.Me
 	if err != nil {
 		return nil, err
 	}
-	r, err := mrf.newReceiver(cfg, next)
+	r, err := mrf.newReceiver(cfg, next, logger)
 	if err != nil {
 		return nil, err
 	}

…factorytemplate/factory_template_test.go …/factorytemplate/factorytemplate_test.goreceiver/factorytemplate/factory_template_test.go renamed to receiver/factorytemplate/factorytemplate_test.go receiver/factorytemplate/factory_template_test.go renamed to receiver/factorytemplate/factorytemplate_test.go

@@ -35,7 +35,7 @@ func TestNewTraceReceiverFactory(t *testing.T) {
 	type args struct {
 		receiverType  string
 		newDefaultCfg func() interface{}
-		newReceiver   func(interface{}, consumer.TraceConsumer) (receiver.TraceReceiver, error)
+		newReceiver   func(interface{}, consumer.TraceConsumer, *zap.Logger) (receiver.TraceReceiver, error)
 	}
 	tests := []struct {
 		name    string
@@ -104,7 +104,7 @@ func TestNewMetricsReceiverFactory(t *testing.T) {
 	type args struct {
 		receiverType  string
 		newDefaultCfg func() interface{}
-		newReceiver   func(interface{}, consumer.MetricsConsumer) (receiver.MetricsReceiver, error)
+		newReceiver   func(interface{}, consumer.MetricsConsumer, *zap.Logger) (receiver.MetricsReceiver, error)
 	}
 	tests := []struct {
 		name    string
@@ -283,7 +283,7 @@ func Test_traceReceiverFactory_NewFromViper_Errors(t *testing.T) {
 		},
 	}
 
-	newTraceReceiverAlwaysFail := func(cfg interface{}, next consumer.TraceConsumer) (receiver.TraceReceiver, error) {
+	newTraceReceiverAlwaysFail := func(cfg interface{}, next consumer.TraceConsumer, logger *zap.Logger) (receiver.TraceReceiver, error) {
 		return nil, errNewReceiver
 	}
 	factory, err := NewTraceReceiverFactory(
@@ -368,7 +368,7 @@ func Test_metricsReceiverFactory_NewFromViper_Errors(t *testing.T) {
 		},
 	}
 
-	newMetricsReceiverAlwaysFail := func(cfg interface{}, next consumer.MetricsConsumer) (receiver.MetricsReceiver, error) {
+	newMetricsReceiverAlwaysFail := func(cfg interface{}, next consumer.MetricsConsumer, logger *zap.Logger) (receiver.MetricsReceiver, error) {
 		return nil, errNewReceiver
 	}
 
@@ -435,7 +435,7 @@ func Examplefactory_DefaultConfig() {
 	templateArgs := []struct {
 		receiverType  string
 		newDefaultCfg func() interface{}
-		newReceiver   func(interface{}, consumer.TraceConsumer) (receiver.TraceReceiver, error)
+		newReceiver   func(interface{}, consumer.TraceConsumer, *zap.Logger) (receiver.TraceReceiver, error)
 	}{
 		{
 			receiverType:  "mockReceiver",
@@ -477,7 +477,7 @@ func checkedBuildReceiverFactory(
 	t *testing.T,
 	receiverType string,
 	newDefaultCfg func() interface{},
-	newReceiver func(interface{}, consumer.TraceConsumer) (receiver.TraceReceiver, error),
+	newReceiver func(interface{}, consumer.TraceConsumer, *zap.Logger) (receiver.TraceReceiver, error),
 ) receiver.TraceReceiverFactory {
 	factory, err := NewTraceReceiverFactory(receiverType, newDefaultCfg, newReceiver)
 	if err != nil {
@@ -509,13 +509,13 @@ func altNewMockReceiverDefaultCfg() interface{} {
 	}
 }
 
-func newMockTraceReceiver(cfg interface{}, next consumer.TraceConsumer) (receiver.TraceReceiver, error) {
+func newMockTraceReceiver(cfg interface{}, next consumer.TraceConsumer, logger *zap.Logger) (receiver.TraceReceiver, error) {
 	return &mockReceiver{
 		config: cfg.(*mockReceiverCfg),
 	}, nil
 }
 
-func newMockMetricsReceiver(cfg interface{}, next consumer.MetricsConsumer) (receiver.MetricsReceiver, error) {
+func newMockMetricsReceiver(cfg interface{}, next consumer.MetricsConsumer, logger *zap.Logger) (receiver.MetricsReceiver, error) {
 	return &mockReceiver{
 		config: cfg.(*mockReceiverCfg),
 	}, nil