From 536635f54bdf863ff75ef13f2bd5983142faf9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A1ndor=20Guba?= Date: Fri, 8 Dec 2023 19:20:20 +0100 Subject: [PATCH] [Bugfix] Fix regression error introduced in #29095 (#29573) Fixing regression error in https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/29095 The name of the `timeField` in `generateTTLExpr` was ignored and defaulted to `Timestamp`. The problem is that different tables have different names for this field. Now it is specified at each table creation. --------- Co-authored-by: Alex Boten --- .../fix-clickhouse-create-table-bug.yaml | 27 +++++++++++++++++++ exporter/clickhouseexporter/exporter_logs.go | 2 +- .../clickhouseexporter/exporter_metrics.go | 2 +- .../clickhouseexporter/exporter_traces.go | 4 +-- exporter/clickhouseexporter/factory.go | 12 ++++----- 5 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 .chloggen/fix-clickhouse-create-table-bug.yaml diff --git a/.chloggen/fix-clickhouse-create-table-bug.yaml b/.chloggen/fix-clickhouse-create-table-bug.yaml new file mode 100644 index 000000000000..f42f14b13078 --- /dev/null +++ b/.chloggen/fix-clickhouse-create-table-bug.yaml @@ -0,0 +1,27 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: clickhouseexporter + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Fix regression error introduced in #29095" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [29573] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] diff --git a/exporter/clickhouseexporter/exporter_logs.go b/exporter/clickhouseexporter/exporter_logs.go index b75ee1a0bba3..337ef58216d5 100644 --- a/exporter/clickhouseexporter/exporter_logs.go +++ b/exporter/clickhouseexporter/exporter_logs.go @@ -234,7 +234,7 @@ func createLogsTable(ctx context.Context, cfg *Config, db *sql.DB) error { } func renderCreateLogsTableSQL(cfg *Config) string { - ttlExpr := generateTTLExpr(cfg.TTLDays, cfg.TTL) + ttlExpr := generateTTLExpr(cfg.TTLDays, cfg.TTL, "Timestamp") return fmt.Sprintf(createLogsTableSQL, cfg.LogsTableName, ttlExpr) } diff --git a/exporter/clickhouseexporter/exporter_metrics.go b/exporter/clickhouseexporter/exporter_metrics.go index 340b3fe071ea..9dd5e49a2ca5 100644 --- a/exporter/clickhouseexporter/exporter_metrics.go +++ b/exporter/clickhouseexporter/exporter_metrics.go @@ -43,7 +43,7 @@ func (e *metricsExporter) start(ctx context.Context, _ component.Host) error { internal.SetLogger(e.logger) - ttlExpr := generateTTLExpr(e.cfg.TTLDays, e.cfg.TTL) + ttlExpr := generateTTLExpr(e.cfg.TTLDays, e.cfg.TTL, "TimeUnix") return internal.NewMetricsTable(ctx, e.cfg.MetricsTableName, ttlExpr, e.client) } diff --git a/exporter/clickhouseexporter/exporter_traces.go b/exporter/clickhouseexporter/exporter_traces.go index eef63f488c02..0584ad661b52 100644 --- a/exporter/clickhouseexporter/exporter_traces.go +++ b/exporter/clickhouseexporter/exporter_traces.go @@ -291,12 +291,12 @@ func renderInsertTracesSQL(cfg *Config) string { } func renderCreateTracesTableSQL(cfg *Config) string { - ttlExpr := generateTTLExpr(cfg.TTLDays, cfg.TTL) + ttlExpr := generateTTLExpr(cfg.TTLDays, cfg.TTL, "Timestamp") return fmt.Sprintf(createTracesTableSQL, cfg.TracesTableName, ttlExpr) } func renderCreateTraceIDTsTableSQL(cfg *Config) string { - ttlExpr := generateTTLExpr(cfg.TTLDays, cfg.TTL) + ttlExpr := generateTTLExpr(cfg.TTLDays, cfg.TTL, "Start") return fmt.Sprintf(createTraceIDTsTableSQL, cfg.TracesTableName, ttlExpr) } diff --git a/exporter/clickhouseexporter/factory.go b/exporter/clickhouseexporter/factory.go index d5013d9e5ab8..04c9fdd6e7b4 100644 --- a/exporter/clickhouseexporter/factory.go +++ b/exporter/clickhouseexporter/factory.go @@ -121,21 +121,21 @@ func createMetricExporter( ) } -func generateTTLExpr(ttlDays uint, ttl time.Duration) string { +func generateTTLExpr(ttlDays uint, ttl time.Duration, timeField string) string { if ttlDays > 0 { - return fmt.Sprintf(`TTL toDateTime(Timestamp) + toIntervalDay(%d)`, ttlDays) + return fmt.Sprintf(`TTL toDateTime(%s) + toIntervalDay(%d)`, timeField, ttlDays) } if ttl > 0 { switch { case ttl%(24*time.Hour) == 0: - return fmt.Sprintf(`TTL toDateTime(Timestamp) + toIntervalDay(%d)`, ttl/(24*time.Hour)) + return fmt.Sprintf(`TTL toDateTime(%s) + toIntervalDay(%d)`, timeField, ttl/(24*time.Hour)) case ttl%(time.Hour) == 0: - return fmt.Sprintf(`TTL toDateTime(Timestamp) + toIntervalHour(%d)`, ttl/time.Hour) + return fmt.Sprintf(`TTL toDateTime(%s) + toIntervalHour(%d)`, timeField, ttl/time.Hour) case ttl%(time.Minute) == 0: - return fmt.Sprintf(`TTL toDateTime(Timestamp) + toIntervalMinute(%d)`, ttl/time.Minute) + return fmt.Sprintf(`TTL toDateTime(%s) + toIntervalMinute(%d)`, timeField, ttl/time.Minute) default: - return fmt.Sprintf(`TTL toDateTime(Timestamp) + toIntervalSecond(%d)`, ttl/time.Second) + return fmt.Sprintf(`TTL toDateTime(%s) + toIntervalSecond(%d)`, timeField, ttl/time.Second) } } return ""