Resolve Yuri's review and fix lint

jaegertracing · Jun 13, 2024 · e498cdb · e498cdb
1 parent 10776aa
commit e498cdb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/cmd/jaeger/internal/exporters/storageexporter/exporter.go b/cmd/jaeger/internal/exporters/storageexporter/exporter.go
@@ -35,7 +35,7 @@ func newExporter(config *Config, otel component.TelemetrySettings) *storageExpor
 	}
 }
 
-func (exp *storageExporter) start(ctx context.Context, host component.Host) error {
+func (exp *storageExporter) start(_ context.Context, host component.Host) error {
 	f, err := jaegerstorage.GetStorageFactory(exp.config.TraceStorage, host)
 	if err != nil {
 		return fmt.Errorf("cannot find storage factory: %w", err)
@@ -44,7 +44,6 @@ func (exp *storageExporter) start(ctx context.Context, host component.Host) erro
 	switch t := f.(type) {
 	case *ch.Factory:
 		exp.clickhouse = true
-		t.CreateSpansTable(ctx)
 		exp.chExportTraces = t.ExportSpans
 	default:
 		exp.clickhouse = false

diff --git a/plugin/storage/clickhouse/factory.go b/plugin/storage/clickhouse/factory.go
@@ -35,18 +35,15 @@ func NewFactory(ctx context.Context, cfg Config, logger *zap.Logger) *Factory {
 		f.client = client
 	}
 
+	if err = chSpanStore.CreateSpansTable(ctx, f.client, f.spansTableName); err != nil {
+		f.logger.Error("failed to create spans table", zap.Error(err))
+	}
+
 	return f
 
 	// TODO: Move some steps to Initialize()
 }
 
-func (f *Factory) CreateSpansTable(ctx context.Context) error {
-	if err := chSpanStore.CreateSpansTable(ctx, f.client, f.spansTableName); err != nil {
-		f.logger.Error("failed to create spans table", zap.Error(err))
-	}
-	return nil
-}
-
 func (f *Factory) ExportSpans(ctx context.Context, td ptrace.Traces) error {
 	if err := chSpanStore.ExportSpans(ctx, f.client, f.spansTableName, td); err != nil {
 		return err
@@ -55,18 +52,18 @@ func (f *Factory) ExportSpans(ctx context.Context, td ptrace.Traces) error {
 	return nil
 }
 
-func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger) error {
+func (*Factory) Initialize(_ metrics.Factory, _ *zap.Logger) error {
 	return nil
 }
 
-func (f *Factory) CreateSpanReader() (spanstore.Reader, error) {
+func (*Factory) CreateSpanReader() (spanstore.Reader, error) {
 	return nil, nil
 }
 
-func (f *Factory) CreateSpanWriter() (spanstore.Writer, error) {
+func (*Factory) CreateSpanWriter() (spanstore.Writer, error) {
 	return nil, nil
 }
 
-func (f *Factory) CreateDependencyReader() (dependencystore.Reader, error) {
+func (*Factory) CreateDependencyReader() (dependencystore.Reader, error) {
 	return nil, nil
 }
diff --git a/plugin/storage/clickhouse/factory_test.go b/plugin/storage/clickhouse/factory_test.go
@@ -45,10 +45,7 @@ func TestExportSpans(t *testing.T) {
 		f := NewFactory(context.TODO(), c, zap.NewNop())
 		require.NotNil(t, f.client)
 
-		err := f.CreateSpansTable(context.TODO())
-		require.NoError(t, err)
-
-		err = f.ExportSpans(context.TODO(), createTraces(5))
+		err := f.ExportSpans(context.TODO(), createTraces(5))
 		require.NoError(t, err)
 
 		err = f.ExportSpans(context.TODO(), createTraces(10))
@@ -143,6 +140,6 @@ func (t *testClickhouseDriverStmt) NumInput() int {
 	return strings.Count(t.query, "?")
 }
 
-func (t *testClickhouseDriverStmt) Query(_ []driver.Value) (driver.Rows, error) {
+func (*testClickhouseDriverStmt) Query(_ []driver.Value) (driver.Rows, error) {
 	return nil, nil
 }