Merge branch 'main' into tvats-improve-alias-handling

conf/example.yaml

@@ -134,6 +134,7 @@ telemetrystore:
       max_result_rows: 0
       ignore_data_skipping_indices: ""
       secondary_indices_enable_bulk_filtering: false
+      prefer_column_name_to_alias: 0
 
 ##################### Prometheus #####################
 prometheus:

pkg/telemetrystore/config.go

@@ -47,6 +47,7 @@ type QuerySettings struct {
 	MaxResultRows                       int    `mapstructure:"max_result_rows"`
 	IgnoreDataSkippingIndices           string `mapstructure:"ignore_data_skipping_indices"`
 	SecondaryIndicesEnableBulkFiltering bool   `mapstructure:"secondary_indices_enable_bulk_filtering"`
+	PreferColumnNameToAlias             int    `mapstructure:"prefer_column_name_to_alias"`
 }
 
 func NewConfigFactory() factory.ConfigFactory {

pkg/telemetrystore/config_test.go

@@ -55,6 +55,7 @@ func TestNewWithEnvProviderWithQuerySettings(t *testing.T) {
 	t.Setenv("SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_SETTINGS_TIMEOUT__BEFORE__CHECKING__EXECUTION__SPEED", "10")
 	t.Setenv("SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_SETTINGS_MAX__BYTES__TO__READ", "1000000")
 	t.Setenv("SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_SETTINGS_MAX__RESULT__ROWS", "10000")
+	t.Setenv("SIGNOZ_TELEMETRYSTORE_CLICKHOUSE_SETTINGS_PREFER__COLUMN__NAME__TO__ALIAS", "1")
 
 	conf, err := config.New(
 		context.Background(),
@@ -83,6 +84,7 @@ func TestNewWithEnvProviderWithQuerySettings(t *testing.T) {
 				TimeoutBeforeCheckingExecutionSpeed: 10,
 				MaxBytesToRead:                      1000000,
 				MaxResultRows:                       10000,
+				PreferColumnNameToAlias:             1,
 			},
 		},
 	}

pkg/telemetrystore/telemetrystorehook/settings.go

@@ -54,6 +54,10 @@ func (h *provider) BeforeQuery(ctx context.Context, _ *telemetrystore.QueryEvent
 		settings["ignore_data_skipping_indices"] = h.settings.IgnoreDataSkippingIndices
 	}
 
+	if h.settings.PreferColumnNameToAlias != 0 {
+		settings["prefer_column_name_to_alias"] = h.settings.PreferColumnNameToAlias
+	}
+
 	if ctx.Value("clickhouse_max_threads") != nil {
 		if maxThreads, ok := ctx.Value("clickhouse_max_threads").(int); ok {
 			settings["max_threads"] = maxThreads