Skip to content
This repository was archived by the owner on Nov 7, 2025. It is now read-only.

Commit 7b4de20

Browse files
authored
A couple small fixes to ITs (#1133)
- Bump go to 1.23.2 in `ci/it` to be in line with go version in other modules in the repo - Update `golang.org/x/net` to v0.33.0 to get rid of the "Security advisory" warning (https://github.com/QuesmaOrg/quesma/security/dependabot/6) - Turn on SQL tracing in ITs - Use `testing.T.Cleanup()` instead of `defer` - `testing.T.Cleanup()` will run even if a test panics/fails/timeouts
1 parent dc539c6 commit 7b4de20

11 files changed

+47
-12
lines changed

ci/it/configs/quesma-ab.yml.template

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ backendConnectors:
1818
type: clickhouse-os
1919
config:
2020
url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
21-
ingestStatistics: true
21+
logging:
22+
path: "logs"
23+
level: "info"
24+
disableFileLogging: false
25+
enableSQLTracing: true
2226
processors:
2327
- name: QP
2428
type: quesma-v1-processor-query

ci/it/configs/quesma-as-transparent-proxy.yml.template

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ backendConnectors:
1414
url: "http://{{ .elasticsearch_host }}:{{ .elasticsearch_port }}"
1515
user: elastic
1616
password: quesmaquesma
17+
logging:
18+
path: "logs"
19+
level: "info"
20+
disableFileLogging: false
21+
enableSQLTracing: true
1722
processors:
1823
- name: noop-query-processor
1924
type: quesma-v1-processor-noop

ci/it/configs/quesma-ingest.yml.template

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ backendConnectors:
1818
type: clickhouse-os
1919
config:
2020
url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
21-
ingestStatistics: true
21+
logging:
22+
path: "logs"
23+
level: "info"
24+
disableFileLogging: false
25+
enableSQLTracing: true
2226
processors:
2327
- name: my-query-processor
2428
type: quesma-v1-processor-query

ci/it/configs/quesma-now-reads-clickhouse-tables.yml.template

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ backendConnectors:
1818
type: clickhouse-os
1919
config:
2020
url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
21-
ingestStatistics: true
21+
logging:
22+
path: "logs"
23+
level: "info"
24+
disableFileLogging: false
25+
enableSQLTracing: true
2226
processors:
2327
- name: my-query-processor
2428
type: quesma-v1-processor-query

ci/it/configs/quesma-wildcard-clickhouse.yml.template

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ backendConnectors:
1818
type: clickhouse-os
1919
config:
2020
url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
21-
ingestStatistics: true
21+
logging:
22+
path: "logs"
23+
level: "info"
24+
disableFileLogging: false
25+
enableSQLTracing: true
2226
processors:
2327
- name: my-query-processor
2428
type: quesma-v1-processor-query

ci/it/configs/quesma-wildcard-disabled.yml.template

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ backendConnectors:
1818
type: clickhouse-os
1919
config:
2020
url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
21-
ingestStatistics: true
21+
logging:
22+
path: "logs"
23+
level: "info"
24+
disableFileLogging: false
25+
enableSQLTracing: true
2226
processors:
2327
- name: my-query-processor
2428
type: quesma-v1-processor-query

ci/it/configs/quesma-with-dual-writes-and-common-table.yml.template

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ backendConnectors:
1818
type: clickhouse-os
1919
config:
2020
url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
21-
ingestStatistics: true
21+
logging:
22+
path: "logs"
23+
level: "info"
24+
disableFileLogging: false
25+
enableSQLTracing: true
2226
processors:
2327
- name: QP
2428
type: quesma-v1-processor-query

ci/it/configs/quesma-with-two-pipelines.yml.template

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ backendConnectors:
1818
type: clickhouse-os
1919
config:
2020
url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
21-
ingestStatistics: true
21+
logging:
22+
path: "logs"
23+
level: "info"
24+
disableFileLogging: false
25+
enableSQLTracing: true
2226
processors:
2327
- name: my-query-processor
2428
type: quesma-v1-processor-query

ci/it/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module quesma.com/its
22

3-
go 1.21.6
3+
go 1.23.2
44

55
require (
66
github.com/ClickHouse/clickhouse-go/v2 v2.20.0
@@ -61,7 +61,7 @@ require (
6161
go.opentelemetry.io/otel/metric v1.24.0 // indirect
6262
go.opentelemetry.io/otel/trace v1.24.0 // indirect
6363
golang.org/x/crypto v0.31.0 // indirect
64-
golang.org/x/net v0.26.0 // indirect
64+
golang.org/x/net v0.33.0 // indirect
6565
golang.org/x/sys v0.28.0 // indirect
6666
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
6767
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect

ci/it/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
174174
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
175175
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
176176
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
177-
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
178-
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
177+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
178+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
179179
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
180180
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
181181
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 commit comments

Comments
 (0)