Fix nil reference panic due to variable shadowing bug

Author: lukasbindreiter

exporter/clickhouseexporter/exporter_logs_json.go

@@ -18,6 +18,13 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter/internal/sqltemplates"
 )
 
+// anyLogsExporter is an interface that satisfies both the default map logsExporter and the logsJSONExporter
+type anyLogsExporter interface {
+	start(context.Context, component.Host) error
+	shutdown(context.Context) error
+	pushLogsData(context.Context, plog.Logs) error
+}
+
 type logsJSONExporter struct {
 	cfg       *Config
 	logger    *zap.Logger

exporter/clickhouseexporter/exporter_traces_json.go

@@ -18,6 +18,13 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter/internal/sqltemplates"
 )
 
+// anyTracesExporter is an interface that satisfies both the default map tracesExporter and the tracesJSONExporter
+type anyTracesExporter interface {
+	start(context.Context, component.Host) error
+	shutdown(context.Context) error
+	pushTraceData(ctx context.Context, td ptrace.Traces) error
+}
+
 type tracesJSONExporter struct {
 	cfg       *Config
 	logger    *zap.Logger

exporter/clickhouseexporter/factory.go

@@ -37,19 +37,19 @@ func createLogsExporter(
 	c := cfg.(*Config)
 	c.collectorVersion = set.BuildInfo.Version
 
-	exp := newLogsExporter(set.Logger, c)
-	startOpt := exporterhelper.WithStart(exp.start)
+	var exp anyLogsExporter
 	if featureGateJSON.IsEnabled() {
-		exp := newLogsJSONExporter(set.Logger, c)
-		startOpt = exporterhelper.WithStart(exp.start)
+		exp = newLogsJSONExporter(set.Logger, c)
+	} else {
+		exp = newLogsExporter(set.Logger, c)
 	}
 
 	return exporterhelper.NewLogs(
 		ctx,
 		set,
 		cfg,
 		exp.pushLogsData,
-		startOpt,
+		exporterhelper.WithStart(exp.start),
 		exporterhelper.WithShutdown(exp.shutdown),
 		exporterhelper.WithTimeout(c.TimeoutSettings),
 		exporterhelper.WithQueue(c.QueueSettings),
@@ -65,19 +65,19 @@ func createTracesExporter(
 	c := cfg.(*Config)
 	c.collectorVersion = set.BuildInfo.Version
 
-	exp := newTracesExporter(set.Logger, c)
-	startOpt := exporterhelper.WithStart(exp.start)
+	var exp anyTracesExporter
 	if featureGateJSON.IsEnabled() {
-		exp := newTracesJSONExporter(set.Logger, c)
-		startOpt = exporterhelper.WithStart(exp.start)
+		exp = newTracesJSONExporter(set.Logger, c)
+	} else {
+		exp = newTracesExporter(set.Logger, c)
 	}
 
 	return exporterhelper.NewTraces(
 		ctx,
 		set,
 		cfg,
 		exp.pushTraceData,
-		startOpt,
+		exporterhelper.WithStart(exp.start),
 		exporterhelper.WithShutdown(exp.shutdown),
 		exporterhelper.WithTimeout(c.TimeoutSettings),
 		exporterhelper.WithQueue(c.QueueSettings),