Add jaeger grpc exporter

defaults/defaults.go

@@ -17,6 +17,7 @@ package defaults
 
 import (
 	"github.com/open-telemetry/opentelemetry-service/exporter"
+	"github.com/open-telemetry/opentelemetry-service/exporter/jaeger/jaegergrpcexporter"
 	"github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter"
 	"github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter"
 	"github.com/open-telemetry/opentelemetry-service/exporter/prometheusexporter"
@@ -60,6 +61,7 @@ func Components() (
 		&prometheusexporter.Factory{},
 		&loggingexporter.Factory{},
 		&zipkinexporter.Factory{},
+		&jaegergrpcexporter.Factory{},
 	)
 	if err != nil {
 		errs = append(errs, err)

defaults/defaults_test.go

@@ -23,6 +23,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/open-telemetry/opentelemetry-service/exporter"
+	"github.com/open-telemetry/opentelemetry-service/exporter/jaeger/jaegergrpcexporter"
 	"github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter"
 	"github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter"
 	"github.com/open-telemetry/opentelemetry-service/exporter/prometheusexporter"
@@ -55,10 +56,11 @@ func TestDefaultComponents(t *testing.T) {
 		"batch":          &nodebatcher.Factory{},
 	}
 	expectedExporters := map[string]exporter.Factory{
-		"opencensus": &opencensusexporter.Factory{},
-		"prometheus": &prometheusexporter.Factory{},
-		"logging":    &loggingexporter.Factory{},
-		"zipkin":     &zipkinexporter.Factory{},
+		"opencensus":  &opencensusexporter.Factory{},
+		"prometheus":  &prometheusexporter.Factory{},
+		"logging":     &loggingexporter.Factory{},
+		"zipkin":      &zipkinexporter.Factory{},
+		"jaeger-grpc": &jaegergrpcexporter.Factory{},
 	}
 
 	receivers, processors, exporters, err := Components()

examples/demotrace/docker-compose.yaml

@@ -3,10 +3,11 @@ services:
 
   # Jaeger
   jaeger-all-in-one:
-    image: jaegertracing/all-in-one:1.8
+    image: jaegertracing/all-in-one:latest
     ports:
       - "16686:16686"
       - "14268"
+      - "14250"
 
   # Zipkin
   zipkin-all-in-one:

examples/demotrace/otel-collector-config.yaml

@@ -7,18 +7,12 @@ receivers:
 
 exporters:
   logging:
+
   zipkin:
     url: "http://zipkin-all-in-one:9411/api/v2/spans"
 
-# TODO: enable jaeger exporter when it is implemented in otelsvc
-#  jaeger:
-#    num-workers: 4
-#    queue-size: 100
-#    retry-on-failure: true
-#    sender-type: jaeger-thrift-http
-#    jaeger-thrift-http:
-#      collector-endpoint: http://jaeger-all-in-one:14268/api/traces
-#      timeout: 5s
+  jaeger-grpc:
+    endpoint: jaeger-all-in-one:14250
 
 processors:
   batch:
@@ -27,5 +21,5 @@ processors:
 pipelines:
   traces:
     receivers: [opencensus]
-    exporters: [logging, zipkin]
+    exporters: [logging, zipkin, jaeger-grpc]
     processors: [batch, queued-retry]

exporter/README.md

@@ -1,15 +1,40 @@
 # Exporters
 
-A variety of exporters are available to the OpenTelemetry Service:
+Below is the list of exporters directly supported by the OpenTelemetry Service.
 
 * [Jaeger](#jaeger)
 * [Logging](#logging)
 * [OpenCensus](#opencensus)
 * [Prometheus](#prometheus)
 * [Zipkin](#zipkin)
 
+The [contributors repository](https://github.com/open-telemetry/opentelemetry-service-contrib)
+ has more exporters that can be added to custom builds of the service.
+
 ## <a name="jaeger"></a>Jaeger 
-TODO: document settings 
+
+Exports trace data to [Jaeger](https://www.jaegertracing.io/) collectors 
+accepting one of the following protocols:
+
+* [gRPC](#jaeger-grpc)
+
+### Configuration
+
+Each different supported protocol has its own configuration settings.
+
+#### <a name="jaeger-grpc"></a>gRPC
+
+* `endpoint:` target to which the exporter is going to send Jaeger trace data, 
+using the gRPC protocol. The valid syntax is described at 
+https://github.com/grpc/grpc/blob/master/doc/naming.md
+
+Example:
+
+```yaml
+exporters:
+  jaeger-grpc:
+    endpoint: jaeger-all-in-one:14250
+```
 
 ## <a name="logging"></a>Logging
 TODO: document settings 
@@ -21,7 +46,7 @@ TODO: document settings
 TODO: document settings 
 
 ## <a name="zipkin"></a>Zipkin
-Exports trace data to a [Zipkin](https://zipkin.io/) endpoint.
+Exports trace data to a [Zipkin](https://zipkin.io/) back-end.
 
 ### Configuration
 

exporter/jaegerexporter/empty_test.go → exporter/jaeger/empty_test.go

@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package jaegerexporter
+package jaeger
 
 // TODO: Delete me when tests are added.

exporter/jaegerexporter/jaeger_thrift_http_sender.go → exporter/jaeger/jaeger_thrift_http_sender.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package jaegerexporter
+package jaeger
 
 import (
 	"bytes"
@@ -35,29 +35,29 @@ import (
 // Default timeout for http request in seconds
 const defaultHTTPTimeout = time.Second * 5
 
-// JaegerThriftHTTPSender forwards spans encoded in the jaeger thrift
+// ThriftHTTPSender forwards spans encoded in the jaeger thrift
 // format to a http server
-type JaegerThriftHTTPSender struct {
+type ThriftHTTPSender struct {
 	url     string
 	headers map[string]string
 	client  *http.Client
 	logger  *zap.Logger
 }
 
-var _ consumer.TraceConsumer = (*JaegerThriftHTTPSender)(nil)
+var _ consumer.TraceConsumer = (*ThriftHTTPSender)(nil)
 
 // HTTPOption sets a parameter for the HttpCollector
-type HTTPOption func(s *JaegerThriftHTTPSender)
+type HTTPOption func(s *ThriftHTTPSender)
 
 // HTTPTimeout sets maximum timeout for http request.
 func HTTPTimeout(duration time.Duration) HTTPOption {
-	return func(s *JaegerThriftHTTPSender) { s.client.Timeout = duration }
+	return func(s *ThriftHTTPSender) { s.client.Timeout = duration }
 }
 
 // HTTPRoundTripper configures the underlying Transport on the *http.Client
 // that is used
 func HTTPRoundTripper(transport http.RoundTripper) HTTPOption {
-	return func(s *JaegerThriftHTTPSender) {
+	return func(s *ThriftHTTPSender) {
 		s.client.Transport = transport
 	}
 }
@@ -70,8 +70,8 @@ func NewJaegerThriftHTTPSender(
 	headers map[string]string,
 	zlogger *zap.Logger,
 	options ...HTTPOption,
-) *JaegerThriftHTTPSender {
-	s := &JaegerThriftHTTPSender{
+) *ThriftHTTPSender {
+	s := &ThriftHTTPSender{
 		url:     url,
 		headers: headers,
 		client:  &http.Client{Timeout: defaultHTTPTimeout},
@@ -85,7 +85,7 @@ func NewJaegerThriftHTTPSender(
 }
 
 // ConsumeTraceData sends the received data to the configured Jaeger Thrift end-point.
-func (s *JaegerThriftHTTPSender) ConsumeTraceData(ctx context.Context, td consumerdata.TraceData) error {
+func (s *ThriftHTTPSender) ConsumeTraceData(ctx context.Context, td consumerdata.TraceData) error {
 	// TODO: (@pjanotti) In case of failure the translation to Jaeger Thrift is going to be remade, cache it somehow.
 	tBatch, err := jaegertranslator.OCProtoToJaegerThrift(td)
 	if err != nil {

exporter/jaegerexporter/jaeger_thrift_tchannel_sender.go → exporter/jaeger/jaeger_thrift_tchannel_sender.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package jaegerexporter
+package jaeger
 
 import (
 	"context"
@@ -26,28 +26,28 @@ import (
 	jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger"
 )
 
-// JaegerThriftTChannelSender takes span batches and sends them
+// ThriftTChannelSender takes span batches and sends them
 // out on tchannel in thrift encoding
-type JaegerThriftTChannelSender struct {
+type ThriftTChannelSender struct {
 	logger   *zap.Logger
 	reporter reporter.Reporter
 }
 
-var _ consumer.TraceConsumer = (*JaegerThriftTChannelSender)(nil)
+var _ consumer.TraceConsumer = (*ThriftTChannelSender)(nil)
 
 // NewJaegerThriftTChannelSender creates new TChannel-based sender.
 func NewJaegerThriftTChannelSender(
 	reporter reporter.Reporter,
 	zlogger *zap.Logger,
-) *JaegerThriftTChannelSender {
-	return &JaegerThriftTChannelSender{
+) *ThriftTChannelSender {
+	return &ThriftTChannelSender{
 		logger:   zlogger,
 		reporter: reporter,
 	}
 }
 
 // ConsumeTraceData sends the received data to the configured Jaeger Thrift end-point.
-func (s *JaegerThriftTChannelSender) ConsumeTraceData(ctx context.Context, td consumerdata.TraceData) error {
+func (s *ThriftTChannelSender) ConsumeTraceData(ctx context.Context, td consumerdata.TraceData) error {
 	// TODO: (@pjanotti) In case of failure the translation to Jaeger Thrift is going to be remade, cache it somehow.
 	tBatch, err := jaegertranslator.OCProtoToJaegerThrift(td)
 	if err != nil {

exporter/jaeger/jaegergrpcexporter/config.go

@@ -0,0 +1,25 @@
+// Copyright 2019, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package jaegergrpcexporter
+
+import (
+	"github.com/open-telemetry/opentelemetry-service/config/configmodels"
+)
+
+// Config defines configuration for Jaeger gRPC exporter.
+type Config struct {
+	configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+	Endpoint                      string                   `mapstructure:"endpoint"`
+}

exporter/jaeger/jaegergrpcexporter/config_test.go

@@ -0,0 +1,53 @@
+// Copyright 2019, OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package jaegergrpcexporter
+
+import (
+	"path"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap"
+
+	"github.com/open-telemetry/opentelemetry-service/config"
+)
+
+func TestLoadConfig(t *testing.T) {
+	receivers, processors, exporters, err := config.ExampleComponents()
+	assert.Nil(t, err)
+
+	factory := &Factory{}
+	exporters[typeStr] = factory
+	cfg, err := config.LoadConfigFile(
+		t, path.Join(".", "testdata", "config.yaml"), receivers, processors, exporters,
+	)
+
+	require.NoError(t, err)
+	require.NotNil(t, cfg)
+
+	e0 := cfg.Exporters["jaeger-grpc"]
+
+	// Endpoint doesn't have a default value so set it directly.
+	defaultCfg := factory.CreateDefaultConfig().(*Config)
+	defaultCfg.Endpoint = "some.target:55678"
+	assert.Equal(t, defaultCfg, e0)
+
+	e1 := cfg.Exporters["jaeger-grpc/2"]
+	assert.Equal(t, "jaeger-grpc/2", e1.(*Config).Name())
+	assert.Equal(t, "a.new.target:1234", e1.(*Config).Endpoint)
+	_, _, err = factory.CreateTraceExporter(zap.NewNop(), e1)
+	require.NoError(t, err)
+}

exporter/jaegerexporter/doc.go → exporter/jaeger/jaegergrpcexporter/doc.go

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Package jaegerexporter contains a specialized Jaeger exporter. Unlike client
-// library exporters they do not buffer or attempt to resend failed batches, all
-// of that is delegated to the callers of the exporter.
-package jaegerexporter
+// Package jaegergrpcexporter implements an exporter that sends trace data to
+// a Jaeger collector gRPC endpoint.
+package jaegergrpcexporter