[BREAKING CHANGE] Remove export_resource_labels flag from Zipkin ex…

…porter (open-telemetry#1163)

Addresses open-telemetry#595

This flag was scheduled to be removed. Removing now.

exporter/zipkinexporter/README.md

@@ -9,9 +9,6 @@ The following settings are required:
 
 The following settings can be optionally configured:
 
-- (temporary flag) `export_resource_labels` (default = true): Whether Resource labels are going to be merged with span attributes
-Note: this flag was added to aid the migration to new (fixed and symmetric) behavior and is going to be 
-removed soon. See https://github.com/open-telemetry/opentelemetry-collector/issues/595 for more details
 - `defaultservicename` (no default): What to name services missing this information
 
 Example:

exporter/zipkinexporter/config.go

@@ -27,10 +27,5 @@ type Config struct {
 	URL    string `mapstructure:"url"`
 	Format string `mapstructure:"format"`
 
-	// Whether resource labels from TraceData are to be included in Span. True by default
-	// This is a temporary flag and will be removed soon,
-	// see https://go.opentelemetry.io/collector/issues/595
-	ExportResourceLabels *bool `mapstructure:"export_resource_labels"`
-
 	DefaultServiceName string `mapstructure:"default_service_name"`
 }

exporter/zipkinexporter/config_test.go

@@ -48,7 +48,6 @@ func TestLoadConfig(t *testing.T) {
 	assert.Equal(t, "zipkin/2", e1.(*Config).Name())
 	assert.Equal(t, "https://somedest:1234/api/v2/spans", e1.(*Config).URL)
 	assert.Equal(t, "proto", e1.(*Config).Format)
-	assert.Equal(t, false, *e1.(*Config).ExportResourceLabels)
 	_, err = factory.CreateTraceExporter(zap.NewNop(), e1)
 	require.NoError(t, err)
 }

exporter/zipkinexporter/testdata/config.yaml

@@ -9,7 +9,6 @@ exporters:
     url: "http://some.location.org:9411/api/v2/spans"
   zipkin/2:
     url: "https://somedest:1234/api/v2/spans"
-    export_resource_labels: false
     format: proto
     default_service_name: test_name
 

exporter/zipkinexporter/zipkin.go

@@ -42,19 +42,16 @@ import (
 type zipkinExporter struct {
 	defaultServiceName string
 
-	exportResourceLabels bool
-	url                  string
-	client               *http.Client
-	serializer           zipkinreporter.SpanSerializer
+	url        string
+	client     *http.Client
+	serializer zipkinreporter.SpanSerializer
 }
 
 // Default values for Zipkin endpoint.
 const (
 	defaultTimeout = time.Second * 5
 
 	defaultServiceName string = "<missing service name>"
-
-	DefaultExportResourceLabels = true
 )
 
 // NewTraceExporter creates an zipkin trace exporter.
@@ -81,16 +78,10 @@ func createZipkinExporter(config configmodels.Exporter) (*zipkinExporter, error)
 		serviceName = zCfg.DefaultServiceName
 	}
 
-	exportResourceLabels := DefaultExportResourceLabels
-	if zCfg.ExportResourceLabels != nil {
-		exportResourceLabels = *zCfg.ExportResourceLabels
-	}
-
 	ze := &zipkinExporter{
-		defaultServiceName:   serviceName,
-		exportResourceLabels: exportResourceLabels,
-		url:                  zCfg.URL,
-		client:               &http.Client{Timeout: defaultTimeout},
+		defaultServiceName: serviceName,
+		url:                zCfg.URL,
+		client:             &http.Client{Timeout: defaultTimeout},
 	}
 
 	switch zCfg.Format {
@@ -108,10 +99,7 @@ func createZipkinExporter(config configmodels.Exporter) (*zipkinExporter, error)
 func (ze *zipkinExporter) PushTraceData(_ context.Context, td consumerdata.TraceData) (int, error) {
 	tbatch := make([]*zipkinmodel.SpanModel, 0, len(td.Spans))
 
-	var resource *resourcepb.Resource
-	if ze.exportResourceLabels {
-		resource = td.Resource
-	}
+	var resource *resourcepb.Resource = td.Resource
 
 	for _, span := range td.Spans {
 		zs, err := zipkin.OCSpanProtoToZipkin(td.Node, resource, span, ze.defaultServiceName)