configure obsReport.NewExporter with struct (#2668)

fixes #2643 Signed-off-by: naseemkullah <naseem@transit.app>
open-o11y · Mar 24, 2021 · 9c14430 · 9c14430
1 parent 8da7dcc
commit 9c14430
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 11 deletions.
diff --git a/exporter/exporterhelper/logshelper.go b/exporter/exporterhelper/logshelper.go
@@ -92,7 +92,10 @@ func NewLogsExporter(
 	be := newBaseExporter(cfg, logger, options...)
 	be.wrapConsumerSender(func(nextSender requestSender) requestSender {
 		return &logsExporterWithObservability{
-			obsrep:     obsreport.NewExporter(configtelemetry.GetMetricsLevelFlagValue(), cfg.Name()),
+			obsrep: obsreport.NewExporter(obsreport.ExporterSettings{
+				Level:        configtelemetry.GetMetricsLevelFlagValue(),
+				ExporterName: cfg.Name(),
+			}),
 			nextSender: nextSender,
 		}
 	})

diff --git a/exporter/exporterhelper/metricshelper.go b/exporter/exporterhelper/metricshelper.go
@@ -96,7 +96,10 @@ func NewMetricsExporter(
 	be := newBaseExporter(cfg, logger, options...)
 	be.wrapConsumerSender(func(nextSender requestSender) requestSender {
 		return &metricsSenderWithObservability{
-			obsrep:     obsreport.NewExporter(configtelemetry.GetMetricsLevelFlagValue(), cfg.Name()),
+			obsrep: obsreport.NewExporter(obsreport.ExporterSettings{
+				Level:        configtelemetry.GetMetricsLevelFlagValue(),
+				ExporterName: cfg.Name(),
+			}),
 			nextSender: nextSender,
 		}
 	})

diff --git a/exporter/exporterhelper/tracehelper.go b/exporter/exporterhelper/tracehelper.go
@@ -93,7 +93,11 @@ func NewTraceExporter(
 	be := newBaseExporter(cfg, logger, options...)
 	be.wrapConsumerSender(func(nextSender requestSender) requestSender {
 		return &tracesExporterWithObservability{
-			obsrep:     obsreport.NewExporter(configtelemetry.GetMetricsLevelFlagValue(), cfg.Name()),
+			obsrep: obsreport.NewExporter(
+				obsreport.ExporterSettings{
+					Level:        configtelemetry.GetMetricsLevelFlagValue(),
+					ExporterName: cfg.Name(),
+				}),
 			nextSender: nextSender,
 		}
 	})

diff --git a/exporter/prometheusexporter/prometheus.go b/exporter/prometheusexporter/prometheus.go
@@ -49,7 +49,10 @@ func newPrometheusExporter(config *Config, logger *zap.Logger) (*prometheusExpor
 		return nil, errBlankPrometheusAddress
 	}
 
-	obsrep := obsreport.NewExporter(configtelemetry.GetMetricsLevelFlagValue(), config.Name())
+	obsrep := obsreport.NewExporter(obsreport.ExporterSettings{
+		Level:        configtelemetry.GetMetricsLevelFlagValue(),
+		ExporterName: config.Name(),
+	})
 
 	collector := newCollector(config, logger)
 	registry := prometheus.NewRegistry()

diff --git a/obsreport/obsreport_exporter.go b/obsreport/obsreport_exporter.go
@@ -89,7 +89,13 @@ type Exporter struct {
 	mutators     []tag.Mutator
 }
 
-func NewExporter(level configtelemetry.Level, exporterName string) *Exporter {
+type ExporterSettings struct {
+	Level        configtelemetry.Level
+	ExporterName string
+}
+
+func NewExporter(cfg ExporterSettings) *Exporter {
+	level, exporterName := cfg.Level, cfg.ExporterName
 	return &Exporter{
 		level:        level,
 		exporterName: exporterName,

diff --git a/obsreport/obsreport_test.go b/obsreport/obsreport_test.go
@@ -338,7 +338,7 @@ func TestExportTraceDataOp(t *testing.T) {
 		t.Name(), trace.WithSampler(trace.AlwaysSample()))
 	defer parentSpan.End()
 
-	obsrep := obsreport.NewExporter(configtelemetry.LevelNormal, exporter)
+	obsrep := obsreport.NewExporter(obsreport.ExporterSettings{configtelemetry.LevelNormal, exporter})
 	errs := []error{nil, errFake}
 	numExportedSpans := []int{22, 14}
 	for i, err := range errs {
@@ -385,7 +385,7 @@ func TestExportMetricsOp(t *testing.T) {
 		t.Name(), trace.WithSampler(trace.AlwaysSample()))
 	defer parentSpan.End()
 
-	obsrep := obsreport.NewExporter(configtelemetry.LevelNormal, exporter)
+	obsrep := obsreport.NewExporter(obsreport.ExporterSettings{configtelemetry.LevelNormal, exporter})
 
 	errs := []error{nil, errFake}
 	toSendMetricPoints := []int{17, 23}
@@ -434,7 +434,7 @@ func TestExportLogsOp(t *testing.T) {
 		t.Name(), trace.WithSampler(trace.AlwaysSample()))
 	defer parentSpan.End()
 
-	obsrep := obsreport.NewExporter(configtelemetry.LevelNormal, exporter)
+	obsrep := obsreport.NewExporter(obsreport.ExporterSettings{configtelemetry.LevelNormal, exporter})
 	errs := []error{nil, errFake}
 	toSendLogRecords := []int{17, 23}
 	for i, err := range errs {

diff --git a/obsreport/obsreporttest/obsreporttest_test.go b/obsreport/obsreporttest/obsreporttest_test.go
@@ -81,7 +81,10 @@ func TestCheckExporterTracesViews(t *testing.T) {
 	require.NoError(t, err)
 	defer doneFn()
 
-	obsrep := obsreport.NewExporter(configtelemetry.LevelNormal, exporter)
+	obsrep := obsreport.NewExporter(obsreport.ExporterSettings{
+		Level:        configtelemetry.LevelNormal,
+		ExporterName: exporter,
+	})
 	ctx := obsrep.StartTracesExportOp(context.Background())
 	assert.NotNil(t, ctx)
 
@@ -95,7 +98,10 @@ func TestCheckExporterMetricsViews(t *testing.T) {
 	require.NoError(t, err)
 	defer doneFn()
 
-	obsrep := obsreport.NewExporter(configtelemetry.LevelNormal, exporter)
+	obsrep := obsreport.NewExporter(obsreport.ExporterSettings{
+		Level:        configtelemetry.LevelNormal,
+		ExporterName: exporter,
+	})
 	ctx := obsrep.StartMetricsExportOp(context.Background())
 	assert.NotNil(t, ctx)
 
@@ -109,7 +115,10 @@ func TestCheckExporterLogsViews(t *testing.T) {
 	require.NoError(t, err)
 	defer doneFn()
 
-	obsrep := obsreport.NewExporter(configtelemetry.LevelNormal, exporter)
+	obsrep := obsreport.NewExporter(obsreport.ExporterSettings{
+		Level:        configtelemetry.LevelNormal,
+		ExporterName: exporter,
+	})
 	ctx := obsrep.StartLogsExportOp(context.Background())
 	assert.NotNil(t, ctx)
 	obsrep.EndLogsExportOp(ctx, 7, nil)