Add zipkin receiver to OTEL collector

cmd/opentelemetry-collector/app/defaults/default_config.go

@@ -23,6 +23,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector/processor/batchprocessor"
 	"github.com/open-telemetry/opentelemetry-collector/receiver"
 	"github.com/open-telemetry/opentelemetry-collector/receiver/jaegerreceiver"
+	"github.com/open-telemetry/opentelemetry-collector/receiver/zipkinreceiver"
 
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/exporter/cassandra"
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/exporter/elasticsearch"
@@ -31,37 +32,42 @@ import (
 
 // Config creates default configuration.
 // It enables default Jaeger receivers, processors and exporters.
-func Config(storageType string, factories config.Factories) (*configmodels.Config, error) {
+func Config(storageType string, zipkinPort string, factories config.Factories) (*configmodels.Config, error) {
 	exporters, err := createExporters(storageType, factories)
 	if err != nil {
 		return nil, err
 	}
-	types := []string{}
+	expTypes := []string{}
 	for _, v := range exporters {
-		types = append(types, v.Type())
+		expTypes = append(expTypes, v.Type())
+	}
+	receivers := createReceivers(zipkinPort, factories)
+	recTypes := []string{}
+	for _, v := range receivers {
+		recTypes = append(recTypes, v.Type())
 	}
 	return &configmodels.Config{
-		Receivers:  createReceivers(factories),
+		Receivers:  receivers,
 		Exporters:  exporters,
 		Processors: createProcessors(factories),
 		Service: configmodels.Service{
 			Pipelines: map[string]*configmodels.Pipeline{
 				"traces": {
 					InputType:  configmodels.TracesDataType,
-					Receivers:  []string{"jaeger"},
-					Exporters:  types,
+					Receivers:  recTypes,
+					Exporters:  expTypes,
 					Processors: []string{"batch"},
 				},
 			},
 		},
 	}, nil
 }
 
-func createReceivers(factories config.Factories) configmodels.Receivers {
-	rec := factories.Receivers["jaeger"].CreateDefaultConfig().(*jaegerreceiver.Config)
+func createReceivers(zipkinPort string, factories config.Factories) configmodels.Receivers {
+	jaeger := factories.Receivers["jaeger"].CreateDefaultConfig().(*jaegerreceiver.Config)
 	// TODO load and serve sampling strategies
 	// TODO bind sampling strategies file
-	rec.Protocols = map[string]*receiver.SecureReceiverSettings{
+	jaeger.Protocols = map[string]*receiver.SecureReceiverSettings{
 		"grpc": {
 			ReceiverSettings: configmodels.ReceiverSettings{
 				Endpoint: "localhost:14250",
@@ -83,9 +89,15 @@ func createReceivers(factories config.Factories) configmodels.Receivers {
 			},
 		},
 	}
-	return map[string]configmodels.Receiver{
-		"jaeger": rec,
+	recvs := map[string]configmodels.Receiver{
+		"jaeger": jaeger,
+	}
+	if zipkinPort != ":0" {
+		zipkin := factories.Receivers["zipkin"].CreateDefaultConfig().(*zipkinreceiver.Config)
+		zipkin.Endpoint = zipkinPort
+		recvs["zipkin"] = zipkin
 	}
+	return recvs
 }
 
 func createExporters(storageTypes string, factories config.Factories) (configmodels.Exporters, error) {

cmd/opentelemetry-collector/app/defaults/defaults.go

@@ -15,8 +15,11 @@
 package defaults
 
 import (
+	"flag"
+
 	"github.com/open-telemetry/opentelemetry-collector/config"
 	"github.com/open-telemetry/opentelemetry-collector/service/defaultcomponents"
+	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/exporter/cassandra"
@@ -29,6 +32,10 @@ import (
 
 // Components creates default and Jaeger factories
 func Components(v *viper.Viper) config.Factories {
+	// Add flags to viper to make the default values available.
+	// We have to add all storage flags to viper because any exporter can be specified in the OTEL config file.
+	// OTEL collector creates default configurations for all factories to verify they can be created.
+	addDefaultValuesToViper(v)
 	kafkaExp := kafka.Factory{OptionsFactory: func() *storageKafka.Options {
 		opts := kafka.DefaultOptions()
 		opts.InitFromViper(v)
@@ -51,3 +58,14 @@ func Components(v *viper.Viper) config.Factories {
 	factories.Exporters[esExp.Type()] = esExp
 	return factories
 }
+
+// addDefaultValuesToViper adds Jaeger storage flags to viper to make the default values available.
+func addDefaultValuesToViper(v *viper.Viper) {
+	flagSet := &flag.FlagSet{}
+	kafka.DefaultOptions().AddFlags(flagSet)
+	elasticsearch.DefaultOptions().AddFlags(flagSet)
+	cassandra.DefaultOptions().AddFlags(flagSet)
+	pflagSet := &pflag.FlagSet{}
+	pflagSet.AddGoFlagSet(flagSet)
+	v.BindPFlags(pflagSet)
+}

cmd/opentelemetry-collector/app/exporter/cassandra/factory.go

@@ -73,6 +73,6 @@ func (Factory) CreateTraceExporter(log *zap.Logger, cfg configmodels.Exporter) (
 
 // CreateMetricsExporter is not implemented.
 // This function implements OTEL component.Factory interface.
-func (Factory) CreateMetricsExporter(*zap.Logger, configmodels.Exporter) (component.MetricsExporter, error) {
+func (Factory) CreateMetricsExporter(*zap.Logger, configmodels.Exporter) (component.MetricsExporterOld, error) {
 	return nil, configerror.ErrDataTypeIsNotSupported
 }

cmd/opentelemetry-collector/app/exporter/elasticsearch/factory.go

@@ -73,6 +73,6 @@ func (Factory) CreateTraceExporter(log *zap.Logger, cfg configmodels.Exporter) (
 
 // CreateMetricsExporter is not implemented.
 // This function implements OTEL exporter.Factory interface.
-func (Factory) CreateMetricsExporter(*zap.Logger, configmodels.Exporter) (component.MetricsExporter, error) {
+func (Factory) CreateMetricsExporter(*zap.Logger, configmodels.Exporter) (component.MetricsExporterOld, error) {
 	return nil, configerror.ErrDataTypeIsNotSupported
 }

cmd/opentelemetry-collector/app/exporter/kafka/factory.go

@@ -72,6 +72,6 @@ func (Factory) CreateTraceExporter(log *zap.Logger, cfg configmodels.Exporter) (
 
 // CreateMetricsExporter is not implemented.
 // This function implements OTEL component.Factory interface.
-func (Factory) CreateMetricsExporter(*zap.Logger, configmodels.Exporter) (component.TraceExporterOld, error) {
+func (Factory) CreateMetricsExporter(*zap.Logger, configmodels.Exporter) (component.MetricsExporterOld, error) {
 	return nil, configerror.ErrDataTypeIsNotSupported
 }

cmd/opentelemetry-collector/main.go

@@ -27,6 +27,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector/service/builder"
 	"github.com/spf13/viper"
 
+	collectorApp "github.com/jaegertracing/jaeger/cmd/collector/app"
 	jflags "github.com/jaegertracing/jaeger/cmd/flags"
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/defaults"
 	"github.com/jaegertracing/jaeger/cmd/opentelemetry-collector/app/exporter/cassandra"
@@ -62,7 +63,9 @@ func main() {
 	if getOTELConfigFile() == "" {
 		log.Println("Config file not provided, installing default Jaeger components")
 		cfgFactory = func(*viper.Viper, config.Factories) (*configmodels.Config, error) {
-			return defaults.Config(storageType, cmpts)
+			collectorOpts := &collectorApp.CollectorOptions{}
+			collectorOpts.InitFromViper(v)
+			return defaults.Config(storageType, collectorOpts.CollectorZipkinHTTPHostPort, cmpts)
 		}
 	}
 
@@ -82,6 +85,7 @@ func main() {
 	cmd := svc.Command()
 	jconfig.AddFlags(v,
 		cmd,
+		collectorApp.AddFlags,
 		jflags.AddConfigFileFlag,
 		storageFlags,
 	)