Skip to content

Commit 1127acc

Browse files
committed
[ClickHouse org] make creating db and tables optional
1 parent b5f6831 commit 1127acc

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

exporter/clickhouseexporter/config_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ func TestLoadConfig(t *testing.T) {
4545
{
4646
id: component.NewIDWithName(metadata.Type, "full"),
4747
expected: &Config{
48-
Endpoint: defaultEndpoint,
49-
Database: "otel",
50-
Username: "foo",
51-
Password: "bar",
52-
TTL: 72 * time.Hour,
53-
LogsTableName: "otel_logs",
54-
TracesTableName: "otel_traces",
55-
MetricsTableName: "otel_metrics",
48+
Endpoint: defaultEndpoint,
49+
Database: "otel",
50+
Username: "foo",
51+
Password: "bar",
52+
TTL: 72 * time.Hour,
53+
CreateDBAndTables: true,
54+
LogsTableName: "otel_logs",
55+
TracesTableName: "otel_traces",
56+
MetricsTableName: "otel_metrics",
5657
TimeoutSettings: exporterhelper.TimeoutSettings{
5758
Timeout: 5 * time.Second,
5859
},

exporter/clickhouseexporter/factory.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,16 @@ func createDefaultConfig() component.Config {
3333
queueSettings.NumConsumers = 1
3434

3535
return &Config{
36-
TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(),
37-
QueueSettings: queueSettings,
38-
RetrySettings: exporterhelper.NewDefaultRetrySettings(),
39-
ConnectionParams: map[string]string{},
40-
Database: defaultDatabase,
41-
LogsTableName: "otel_logs",
42-
TracesTableName: "otel_traces",
43-
MetricsTableName: "otel_metrics",
44-
TTL: 0,
36+
TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(),
37+
QueueSettings: queueSettings,
38+
RetrySettings: exporterhelper.NewDefaultRetrySettings(),
39+
ConnectionParams: map[string]string{},
40+
Database: defaultDatabase,
41+
CreateDBAndTables: true, // this isn't actually default.
42+
LogsTableName: "otel_logs",
43+
TracesTableName: "otel_traces",
44+
MetricsTableName: "otel_metrics",
45+
TTL: 0,
4546
}
4647
}
4748

0 commit comments

Comments
 (0)