Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**
Expand Down
2 changes: 1 addition & 1 deletion smoke-tests/otel-collector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`).
Expand Down

This file was deleted.

14 changes: 0 additions & 14 deletions smoke-tests/otel-collector/compat-schema.bats

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

49 changes: 0 additions & 49 deletions smoke-tests/otel-collector/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
1 change: 0 additions & 1 deletion smoke-tests/otel-collector/setup_suite.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions smoke-tests/otel-collector/test_helpers/assertions.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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() {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔵 minor — _assert_test_data_on_port indirection is now dead weight

The port parameter only existed for assert_test_data_compat (port 29000). With that removed, assert_test_data is the only caller and always passes 9000. Fold the body back into assert_test_data and hardcode port 9000 in it.

Advisory. Fix if it is a small defect in code this PR changes; otherwise reply in the thread. Do not widen the PR or touch files it did not already change. How to respond

local port=$1
local testdir=$2
Expand Down
Loading