improve

Signed-off-by: zhengkezhou1 <[email protected]>

Author: zhengkezhou1

.mockery.yaml

@@ -85,9 +85,7 @@ packages:
       CoreSpanWriter:
 
   github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/client:
-    config:
-      all: true
     interfaces:
-      Pool:
-      Conn:
+      ChPool:
+      Clickhouse:
       Rows:

internal/storage/integration/clickhouse_test.go

@@ -30,8 +30,7 @@ func (s *ClickhouseIntegrationTestSuite) initialize(t *testing.T) {
 	logger := zaptest.NewLogger(t, zaptest.WrapOptions(zap.AddCaller()))
 
 	cfg := config.DefaultConfiguration()
-	cfg.ClickhouseGoCfg.Database = "jaeger"
-	cfg.ChGoConfig.ClientConfig.Database = "jaeger"
+	cfg.CreateSchema = true
 	f, err := clickhouse.NewFactory(&cfg, logger)
 	require.NoError(t, err)
 

internal/storage/v2/clickhouse/client/mocks/Pool.go internal/storage/v2/clickhouse/client/mocks/ChPool.go

@@ -9,34 +9,34 @@ import (
 )
 
 // Configuration all configuration of how to use clickhouse as storage.
-// ClickhouseGoCfg clickhouse-go client configuration.
-// ChGoConfig chpool configuration.
-// CreateSchema create requre table auto if not exist.
+// ClickhouseConfig clickhouse-go client configuration.
+// ChPoolConfig chpool configuration.
+// CreateSchema create require table auto if not exist.
 type Configuration struct {
-	ClickhouseGoCfg ClickhouseGoConfig
-	ChGoConfig      ChGoConfig
-	CreateSchema    bool
+	ClickhouseConfig ClickhouseConfig
+	ChPoolConfig     ChPoolConfig
+	CreateSchema     bool
 }
 
 func DefaultConfiguration() Configuration {
 	return Configuration{
-		DefaultClickhouseGoConfig(),
-		DefaultChGoConfig(),
+		DefaultClickhouseConfig(),
+		DefaultChPoolConfig(),
 		true,
 	}
 }
 
-// ClickhouseGoConfig clickhouse-go client connection configuration for read trace.
+// ClickhouseConfig clickhouse-go client connection configuration for read trace.
 // more detail see:https://clickhouse.com/docs/integrations/go#connection-settings
-type ClickhouseGoConfig struct {
+type ClickhouseConfig struct {
 	Address  []string `mapstructure:"address"`
 	Database string   `mapstructure:"database"`
 	Username string   `mapstructure:"username"`
 	Password string   `mapstructure:"password"`
 }
 
-func DefaultClickhouseGoConfig() ClickhouseGoConfig {
-	return ClickhouseGoConfig{
+func DefaultClickhouseConfig() ClickhouseConfig {
+	return ClickhouseConfig{
 		Address:  []string{"127.0.0.1:9000"},
 		Database: "default",
 		Username: "default",
@@ -50,8 +50,8 @@ const (
 	DefaultHealthCheckPeriod = time.Minute
 )
 
-// ChGoConfig chpool configuration for write trace.
-type ChGoConfig struct {
+// ChPoolConfig chpool configuration for write trace.
+type ChPoolConfig struct {
 	ClientConfig ClientConfig `mapstructure:"client"`
 	PoolConfig   PoolConfig   `mapstructure:"pool"`
 }
@@ -73,8 +73,8 @@ type PoolConfig struct {
 	HealthCheckPeriod time.Duration `mapstructure:"health_check_period"`
 }
 
-func DefaultChGoConfig() ChGoConfig {
-	return ChGoConfig{
+func DefaultChPoolConfig() ChPoolConfig {
+	return ChPoolConfig{
 		ClientConfig{
 			Address:  "127.0.0.1:9000",
 			Database: "default",

internal/storage/v2/clickhouse/client/mocks/Conn.go internal/storage/v2/clickhouse/client/mocks/Clickhouse.go

@@ -13,29 +13,29 @@ import (
 
 func TestDefaultConfig(t *testing.T) {
 	excepted := Configuration{
-		ClickhouseGoCfg: DefaultClickhouseGoConfig(),
-		ChGoConfig:      DefaultChGoConfig(),
-		CreateSchema:    true,
+		ClickhouseConfig: DefaultClickhouseConfig(),
+		ChPoolConfig:     DefaultChPoolConfig(),
+		CreateSchema:     true,
 	}
 
 	actual := DefaultConfiguration()
 	assert.Equal(t, excepted, actual)
 }
 
 func TestDefaultClickhouseGoCfg(t *testing.T) {
-	expected := ClickhouseGoConfig{
+	expected := ClickhouseConfig{
 		Address:  []string{"127.0.0.1:9000"},
 		Database: "default",
 		Username: "default",
 		Password: "default",
 	}
-	actual := DefaultClickhouseGoConfig()
+	actual := DefaultClickhouseConfig()
 	assert.NotNil(t, actual)
 	assert.Equal(t, expected, actual)
 }
 
 func TestDefaultChGoConfig(t *testing.T) {
-	expected := ChGoConfig{
+	expected := ChPoolConfig{
 		ClientConfig: ClientConfig{
 			Address:  "127.0.0.1:9000",
 			Database: "default",
@@ -51,7 +51,7 @@ func TestDefaultChGoConfig(t *testing.T) {
 		},
 	}
 
-	actual := DefaultChGoConfig()
+	actual := DefaultChPoolConfig()
 	assert.NotNil(t, actual)
 	assert.Equal(t, expected, actual)
 }

internal/storage/v2/clickhouse/config/config.go

@@ -8,29 +8,27 @@ import (
 
 	"go.uber.org/zap"
 
-	"github.com/jaegertracing/jaeger/internal/storage/v2/api/tracestore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/client"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/config"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/schema"
-	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/trace"
+	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/tracestore"
 	"github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/wrapper"
 )
 
 type Factory struct {
-	config *config.Configuration
-	logger *zap.Logger
-
+	config           *config.Configuration
+	logger           *zap.Logger
 	ClickhouseClient client.Clickhouse
 	chPool           client.ChPool
 }
 
-func newCHConn(cfg *config.Configuration) (client.Clickhouse, error) {
-	conn, err := wrapper.WrapOpen(cfg.ClickhouseGoCfg)
-	return conn, err
+func newClickhouseClient(cfg *config.Configuration) (client.Clickhouse, error) {
+	clickhouse, err := wrapper.WrapOpen(cfg.ClickhouseConfig)
+	return clickhouse, err
 }
 
-func newCHPool(cfg *config.Configuration, logger *zap.Logger) (client.ChPool, error) {
-	chPool, err := wrapper.WrapDial(cfg.ChGoConfig, logger)
+func newChPool(cfg *config.Configuration, logger *zap.Logger) (client.ChPool, error) {
+	chPool, err := wrapper.WrapDial(cfg.ChPoolConfig, logger)
 	return chPool, err
 }
 
@@ -39,7 +37,7 @@ func newClientPrerequisites(cfg *config.Configuration, logger *zap.Logger) error
 		return nil
 	}
 
-	chPool, err := newCHPool(cfg, logger)
+	chPool, err := newChPool(cfg, logger)
 	if err != nil {
 		return err
 	}
@@ -57,30 +55,30 @@ func NewFactory(cfg *config.Configuration, logger *zap.Logger) (*Factory, error)
 		return nil, err
 	}
 
-	connection, err := newCHConn(cfg)
+	clickhouse, err := newClickhouseClient(cfg)
 	if err != nil {
 		return nil, err
 	}
-	chPool, err := newCHPool(cfg, logger)
+	chPool, err := newChPool(cfg, logger)
 	if err != nil {
 		return nil, err
 	}
 
 	f := &Factory{
 		config:           cfg,
 		logger:           logger,
-		ClickhouseClient: connection,
+		ClickhouseClient: clickhouse,
 		chPool:           chPool,
 	}
 	return f, nil
 }
 
-func (f *Factory) CreateTraceWriter() (tracestore.Writer, error) {
-	return trace.NewTraceWriter(f.chPool, f.logger)
+func (f *Factory) CreateTraceWriter() (*tracestore.TraceWriter, error) {
+	return tracestore.NewTraceWriter(f.chPool, f.logger)
 }
 
-func (f *Factory) CreateTracReader() (tracestore.Reader, error) {
-	return trace.NewTraceReader(f.ClickhouseClient)
+func (f *Factory) CreateTracReader() (*tracestore.TraceReader, error) {
+	return tracestore.NewTraceReader(f.ClickhouseClient)
 }
 
 func (f *Factory) Purge(ctx context.Context) error {