diff --git a/.devenv/docker/signoz-otel-collector/compose.yaml b/.devenv/docker/signoz-otel-collector/compose.yaml index 62a931b38de5..eac598f6de69 100644 --- a/.devenv/docker/signoz-otel-collector/compose.yaml +++ b/.devenv/docker/signoz-otel-collector/compose.yaml @@ -1,6 +1,6 @@ services: signoz-otel-collector: - image: signoz/signoz-otel-collector:v0.128.2 + image: signoz/signoz-otel-collector:v0.129.6 container_name: signoz-otel-collector-dev command: - --config=/etc/otel-collector-config.yaml diff --git a/.github/workflows/integrationci.yaml b/.github/workflows/integrationci.yaml index d2683a65375b..35efa27f6e36 100644 --- a/.github/workflows/integrationci.yaml +++ b/.github/workflows/integrationci.yaml @@ -21,10 +21,9 @@ jobs: - postgres - sqlite clickhouse-version: - - 24.1.2-alpine - 25.5.6 schema-migrator-version: - - v0.128.1 + - v0.129.6 postgres-version: - 15 if: | diff --git a/docs/contributing/go/integration.md b/docs/contributing/go/integration.md index 6e1074e6126b..980f4f23ec29 100644 --- a/docs/contributing/go/integration.md +++ b/docs/contributing/go/integration.md @@ -192,7 +192,7 @@ Tests can be configured using pytest options: - `--sqlstore-provider` - Choose database provider (default: postgres) - `--postgres-version` - PostgreSQL version (default: 15) -- `--clickhouse-version` - ClickHouse version (default: 24.1.2-alpine) +- `--clickhouse-version` - ClickHouse version (default: 25.5.6) - `--zookeeper-version` - Zookeeper version (default: 3.7.1) Example: diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 9f6de991b01f..c4c04fbd599c 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -45,7 +45,7 @@ def pytest_addoption(parser: pytest.Parser): parser.addoption( "--clickhouse-version", action="store", - default="24.1.2-alpine", + default="25.5.6", help="clickhouse version", ) parser.addoption( @@ -57,6 +57,6 @@ def pytest_addoption(parser: pytest.Parser): parser.addoption( "--schema-migrator-version", action="store", - default="v0.128.2", + default="v0.129.6", help="schema migrator version", ) diff --git a/tests/integration/fixtures/logs.py b/tests/integration/fixtures/logs.py index 479189401dd7..c12567d54a51 100644 --- a/tests/integration/fixtures/logs.py +++ b/tests/integration/fixtures/logs.py @@ -29,7 +29,7 @@ class LogsResource(ABC): self.seen_at_ts_bucket_start = seen_at_ts_bucket_start def np_arr(self) -> np.array: - return np.array([self.labels, self.fingerprint, self.seen_at_ts_bucket_start]) + return np.array([self.labels, self.fingerprint, self.seen_at_ts_bucket_start, np.uint64(10),np.uint64(15)]) class LogsResourceOrAttributeKeys(ABC): @@ -317,6 +317,9 @@ class Logs(ABC): self.scope_name, self.scope_version, self.scope_string, + np.uint64(10), + np.uint64(15), + self.resources_string, ] ) @@ -378,7 +381,7 @@ def insert_logs( table="distributed_logs_resource_keys", data=[resource_key.np_arr() for resource_key in resource_keys], ) - + clickhouse.conn.insert( database="signoz_logs", table="distributed_logs_v2", diff --git a/tests/integration/fixtures/traces.py b/tests/integration/fixtures/traces.py index 4d0f025bd4a2..62fa209a6074 100644 --- a/tests/integration/fixtures/traces.py +++ b/tests/integration/fixtures/traces.py @@ -593,6 +593,7 @@ class Traces(ABC): self.db_operation, self.has_error, self.is_remote, + self.resources_string, ], dtype=object, ) @@ -681,6 +682,7 @@ def insert_traces( "db_operation", "has_error", "is_remote", + "resource", ], data=[trace.np_arr() for trace in traces], )