diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5b4c3c94a5..bfb5e3064c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -194,10 +194,9 @@ jobs: id: changed-files uses: tj-actions/changed-files@v47.0.6 with: - # The ClickHouse config is mounted into both ch-server (via - # docker-compose.ci.yml) and ch-server-compat, which pins an older - # ClickHouse -- a config feature the old server rejects takes the - # whole suite down, so changes to it run these tests. + # The ClickHouse config is mounted into ch-server (via + # docker-compose.ci.yml) -- a config change the server rejects takes + # the whole suite down, so changes to it run these tests. files: | docker/otel-collector/** smoke-tests/otel-collector/** diff --git a/smoke-tests/otel-collector/README.md b/smoke-tests/otel-collector/README.md index f159740945..b9d2f13f7e 100644 --- a/smoke-tests/otel-collector/README.md +++ b/smoke-tests/otel-collector/README.md @@ -45,7 +45,7 @@ The suite exercises all three OTLP signal types against the standalone collector config (`docker/otel-collector/config.standalone.yaml`): - **logs** - severity inference/normalization, JSON auto-parse, JSON-schema - exporter, compat-schema (old ClickHouse), custom-pipeline processor swap, and + exporter, custom-pipeline processor swap, and the `routing/logs` connector that splits rrweb (session replay) logs into `hyperdx_sessions` from ordinary logs in `otel_logs`. - **traces** - the `traces` pipeline into `otel_traces` (`traces.bats`). diff --git a/smoke-tests/otel-collector/ch-compat-config.d/remove-prometheus-api.xml b/smoke-tests/otel-collector/ch-compat-config.d/remove-prometheus-api.xml deleted file mode 100644 index 1213f1ee17..0000000000 --- a/smoke-tests/otel-collector/ch-compat-config.d/remove-prometheus-api.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/smoke-tests/otel-collector/compat-schema.bats b/smoke-tests/otel-collector/compat-schema.bats deleted file mode 100644 index 57055aab50..0000000000 --- a/smoke-tests/otel-collector/compat-schema.bats +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bats - -load 'test_helpers/utilities.bash' -load 'test_helpers/assertions.bash' - -@test "compat schema should use bloom_filter indexes instead of full text on ClickHouse < 26.2" { - assert_test_data_compat "data/compat-schema/index-types" -} - -@test "compat schema should insert and query log data correctly" { - emit_otel_data "http://localhost:24318" "data/compat-schema/basic-insert" - sleep 3 - assert_test_data_compat "data/compat-schema/basic-insert" -} diff --git a/smoke-tests/otel-collector/data/compat-schema/basic-insert/assert_query.sql b/smoke-tests/otel-collector/data/compat-schema/basic-insert/assert_query.sql deleted file mode 100644 index 051bd0f5e2..0000000000 --- a/smoke-tests/otel-collector/data/compat-schema/basic-insert/assert_query.sql +++ /dev/null @@ -1 +0,0 @@ -SELECT SeverityText, SeverityNumber, Body FROM otel_logs WHERE ResourceAttributes['suite-id'] = 'compat-schema' AND ResourceAttributes['test-id'] = 'basic-insert' ORDER BY (toStartOfFiveMinutes(Timestamp), Timestamp) FORMAT CSV diff --git a/smoke-tests/otel-collector/data/compat-schema/basic-insert/expected.snap b/smoke-tests/otel-collector/data/compat-schema/basic-insert/expected.snap deleted file mode 100644 index cf778479d9..0000000000 --- a/smoke-tests/otel-collector/data/compat-schema/basic-insert/expected.snap +++ /dev/null @@ -1,2 +0,0 @@ -"info",9,"compat schema test log entry" -"warn",13,"compat schema warning message" \ No newline at end of file diff --git a/smoke-tests/otel-collector/data/compat-schema/basic-insert/input.json b/smoke-tests/otel-collector/data/compat-schema/basic-insert/input.json deleted file mode 100644 index 1b14b19bf9..0000000000 --- a/smoke-tests/otel-collector/data/compat-schema/basic-insert/input.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "resourceLogs": [ - { - "resource": { - "attributes": [ - { - "key": "suite-id", - "value": { - "stringValue": "compat-schema" - } - }, - { - "key": "test-id", - "value": { - "stringValue": "basic-insert" - } - }, - { - "key": "service.name", - "value": { - "stringValue": "compat-test-service" - } - } - ] - }, - "scopeLogs": [ - { - "scope": {}, - "logRecords": [ - { - "timeUnixNano": "1901999580000000000", - "severityNumber": 9, - "severityText": "INFO", - "body": { - "stringValue": "compat schema test log entry" - } - }, - { - "timeUnixNano": "1901999580000000001", - "severityNumber": 13, - "severityText": "WARN", - "body": { - "stringValue": "compat schema warning message" - } - } - ] - } - ] - } - ] -} diff --git a/smoke-tests/otel-collector/data/compat-schema/index-types/assert_query.sql b/smoke-tests/otel-collector/data/compat-schema/index-types/assert_query.sql deleted file mode 100644 index 4e7b27b1da..0000000000 --- a/smoke-tests/otel-collector/data/compat-schema/index-types/assert_query.sql +++ /dev/null @@ -1,7 +0,0 @@ -SELECT name, type -FROM system.data_skipping_indices -WHERE database = 'default' - AND table = 'otel_logs' - AND name IN ('idx_trace_id', 'idx_lower_body') -ORDER BY name -FORMAT CSV diff --git a/smoke-tests/otel-collector/data/compat-schema/index-types/expected.snap b/smoke-tests/otel-collector/data/compat-schema/index-types/expected.snap deleted file mode 100644 index 99cc5b5ed9..0000000000 --- a/smoke-tests/otel-collector/data/compat-schema/index-types/expected.snap +++ /dev/null @@ -1,2 +0,0 @@ -"idx_lower_body","tokenbf_v1" -"idx_trace_id","bloom_filter" \ No newline at end of file diff --git a/smoke-tests/otel-collector/docker-compose.yaml b/smoke-tests/otel-collector/docker-compose.yaml index 0c0201d9d7..cf015c9933 100644 --- a/smoke-tests/otel-collector/docker-compose.yaml +++ b/smoke-tests/otel-collector/docker-compose.yaml @@ -158,55 +158,6 @@ services: networks: - internal - # Older ClickHouse (< 26.2) to test the compatibility schema (bloom filters - # instead of full text indexes) - ch-server-compat: - image: clickhouse/clickhouse-server:25.12-alpine - environment: - CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 - volumes: - - ../../docker/clickhouse/local/config.xml:/etc/clickhouse-server/config.xml - - ../../docker/clickhouse/local/users.xml:/etc/clickhouse-server/users.xml - - ./ch-compat-config.d/remove-prometheus-api.xml:/etc/clickhouse-server/config.d/remove-prometheus-api.xml:ro - ports: - - 29000:9000 - - 28123:8123 - networks: - - internal - healthcheck: - test: - wget -O /dev/null --no-verbose --tries=1 http://127.0.0.1:8123/ping || - exit 1 - interval: 5s - timeout: 3s - retries: 5 - start_period: 10s - otel-collector-compat: - build: - context: ../.. - dockerfile: docker/otel-collector/Dockerfile - target: dev - args: - OTEL_COLLECTOR_VERSION: ${OTEL_COLLECTOR_VERSION:-0.155.0} - OTEL_COLLECTOR_CORE_VERSION: ${OTEL_COLLECTOR_CORE_VERSION:-1.61.0} - environment: - - CLICKHOUSE_ENDPOINT=tcp://ch-server-compat:9000?dial_timeout=10s - - CLICKHOUSE_PROMETHEUS_METRICS_ENDPOINT=ch-server-compat:9363 - - CLICKHOUSE_USER=default - - CLICKHOUSE_PASSWORD= - - HYPERDX_OTEL_EXPORTER_CLICKHOUSE_DATABASE=default - - HYPERDX_LOG_LEVEL=info - # See the note on the otel-collector service above for rationale. - - HYPERDX_OTEL_BATCH_TIMEOUT=100ms - # OPAMP_SERVER_URL is intentionally not set to run in standalone mode - ports: - - 24318:4318 # OTLP http receiver - networks: - - internal - depends_on: - ch-server-compat: - condition: service_healthy - # Static bearer-token auth (see docker/otel-collector/config.standalone.auth.yaml). # Verifies both accepted Authorization header forms end-to-end: the bare # token and the `Bearer `-prefixed value. diff --git a/smoke-tests/otel-collector/setup_suite.bash b/smoke-tests/otel-collector/setup_suite.bash index 82bc5cb6b3..a76a28450c 100644 --- a/smoke-tests/otel-collector/setup_suite.bash +++ b/smoke-tests/otel-collector/setup_suite.bash @@ -13,7 +13,6 @@ setup_suite() { docker compose up --build --detach wait_for_ready "otel-collector" wait_for_ready "otel-collector-json" - wait_for_ready "otel-collector-compat" wait_for_ready "otel-collector-custom" wait_for_ready "otel-collector-oidc" wait_for_ready "otel-collector-bearer-auth" diff --git a/smoke-tests/otel-collector/test_helpers/assertions.bash b/smoke-tests/otel-collector/test_helpers/assertions.bash index a4ed90c0ca..3c86aaedb3 100644 --- a/smoke-tests/otel-collector/test_helpers/assertions.bash +++ b/smoke-tests/otel-collector/test_helpers/assertions.bash @@ -2,10 +2,6 @@ assert_test_data() { _assert_test_data_on_port "9000" "$@" } -assert_test_data_compat() { - _assert_test_data_on_port "29000" "$@" -} - _assert_test_data_on_port() { local port=$1 local testdir=$2