Refactored zipkin exporter for the upcoming ToClient confighttp API c…

…hanges. (#3290) * Refactored zipkin exporter for the upcoming ToClient confighttp API changes * added suggestion from the review * added suggestion from the review
open-telemetry · May 25, 2021 · 20d46b3 · 20d46b3
1 parent bfeb448
commit 20d46b3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/exporter/zipkinexporter/factory.go b/exporter/zipkinexporter/factory.go
@@ -79,6 +79,7 @@ func createTracesExporter(
 		zc,
 		params.Logger,
 		ze.pushTraceData,
+		exporterhelper.WithStart(ze.start),
 		// explicitly disable since we rely on http.Client timeout logic.
 		exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
 		exporterhelper.WithQueue(zc.QueueSettings),

diff --git a/exporter/zipkinexporter/zipkin.go b/exporter/zipkinexporter/zipkin.go
@@ -23,6 +23,8 @@ import (
 	"github.com/openzipkin/zipkin-go/proto/zipkin_proto3"
 	zipkinreporter "github.com/openzipkin/zipkin-go/reporter"
 
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/consumer/consumererror"
 	"go.opentelemetry.io/collector/consumer/pdata"
 	"go.opentelemetry.io/collector/translator/trace/zipkin"
@@ -36,21 +38,18 @@ import (
 type zipkinExporter struct {
 	defaultServiceName string
 
-	url        string
-	client     *http.Client
-	serializer zipkinreporter.SpanSerializer
+	url            string
+	client         *http.Client
+	serializer     zipkinreporter.SpanSerializer
+	clientSettings *confighttp.HTTPClientSettings
 }
 
 func createZipkinExporter(cfg *Config) (*zipkinExporter, error) {
-	client, err := cfg.HTTPClientSettings.ToClient()
-	if err != nil {
-		return nil, err
-	}
-
 	ze := &zipkinExporter{
 		defaultServiceName: cfg.DefaultServiceName,
 		url:                cfg.Endpoint,
-		client:             client,
+		clientSettings:     &cfg.HTTPClientSettings,
+		client:             nil,
 	}
 
 	switch cfg.Format {
@@ -65,6 +64,12 @@ func createZipkinExporter(cfg *Config) (*zipkinExporter, error) {
 	return ze, nil
 }
 
+// start creates the http client
+func (ze *zipkinExporter) start(_ context.Context, _ component.Host) (err error) {
+	ze.client, err = ze.clientSettings.ToClient()
+	return
+}
+
 func (ze *zipkinExporter) pushTraceData(ctx context.Context, td pdata.Traces) error {
 	tbatch, err := zipkin.InternalTracesToZipkinSpans(td)
 	if err != nil {

diff --git a/exporter/zipkinexporter/zipkin_test.go b/exporter/zipkinexporter/zipkin_test.go
@@ -69,6 +69,8 @@ func TestZipkinExporter_roundtripJSON(t *testing.T) {
 	assert.NoError(t, err)
 	require.NotNil(t, zexp)
 
+	require.NoError(t, zexp.Start(context.Background(), componenttest.NewNopHost()))
+
 	// The test requires the spans from zipkinSpansJSONJavaLibrary to be sent in a single batch, use
 	// a mock to ensure that this happens as intended.
 	mzr := newMockZipkinReporter(cst.URL)
@@ -314,6 +316,8 @@ func TestZipkinExporter_roundtripProto(t *testing.T) {
 	zexp, err := NewFactory().CreateTracesExporter(context.Background(), component.ExporterCreateParams{Logger: zap.NewNop()}, cfg)
 	require.NoError(t, err)
 
+	require.NoError(t, zexp.Start(context.Background(), componenttest.NewNopHost()))
+
 	// The test requires the spans from zipkinSpansJSONJavaLibrary to be sent in a single batch, use
 	// a mock to ensure that this happens as intended.
 	mzr := newMockZipkinReporter(cst.URL)