fix: rebase

exporter/qrynexporter/README.md

@@ -20,13 +20,6 @@
   - Default: `true`
   - Description: Enables client-side processing of trace data. This can improve performance but may increase client-side resource usage.
 
-<<<<<<< HEAD
-- `dsn` (required): Clickhouse's dsn.
-- `clustered_clickhouse` (required): true if clickhouse cluster is used
-- `client_side_trace_processing`: use improved traces ingestion algorythm for clickhouse clusters. 
-Data ingestion is sess performant but more evenly distributed 
-=======
->>>>>>> e35202d (refactor: improve the code structure and documentation of qrynexporter.)
 
 # Example:
 ## Simple Trace Data

exporter/qrynexporter/config.go

@@ -30,10 +30,7 @@ type Config struct {
 	configretry.BackOffConfig      `mapstructure:"retry_on_failure"`
 	exporterhelper.QueueSettings   `mapstructure:"sending_queue"`
 
-<<<<<<< HEAD
-=======
 	// ClientSideTraceProcessing is a boolean that indicates whether to process traces on the client side.
->>>>>>> e35202d (refactor: improve the code structure and documentation of qrynexporter.)
 	ClientSideTraceProcessing bool `mapstructure:"client_side_trace_processing"`
 
 	ClusteredClickhouse bool `mapstructure:"clustered_clickhouse"`

exporter/qrynexporter/traces.go

@@ -67,19 +67,11 @@ func newTracesExporter(logger *zap.Logger, cfg *Config, set *exporter.Settings)
 		return nil, err
 	}
 	exp := &tracesExporter{
-<<<<<<< HEAD
-		logger:  logger,
-		meter:   set.MeterProvider.Meter(typeStr),
-		db:      db,
-		cluster: cfg.ClusteredClickhouse,
-		v2:      cfg.ClusteredClickhouse && cfg.ClientSideTraceProcessing,
-=======
 		logger:     logger,
 		meter:      set.MeterProvider.Meter(typeStr),
 		db:         db,
 		cluster:    cfg.ClusteredClickhouse,
 		clientSide: cfg.ClientSideTraceProcessing,
->>>>>>> e35202d (refactor: improve the code structure and documentation of qrynexporter.)
 	}
 	if err := initMetrics(exp.meter); err != nil {
 		exp.logger.Error(fmt.Sprintf("failed to init metrics: %s", err.Error()))