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
8 changes: 8 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,17 @@ 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.
files: |
docker/otel-collector/**
smoke-tests/otel-collector/**
packages/otel-collector/builder-config.yaml
Comment thread
pulpdrew marked this conversation as resolved.
Resolved

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.

P1 Smoke trigger misses inputs

The smoke-test image copies the entire packages/otel-collector package and compiles cmd/migrate, but this trigger tracks only builder-config.yaml. A change to the migration source or its Go dependencies can therefore alter the schema-seeding binary while any_changed remains false, so CI skips the OTel smoke suite for code it directly builds. Cover packages/otel-collector/**, as the OTel unit-test trigger already does.

Suggested change
packages/otel-collector/builder-config.yaml
packages/otel-collector/**

Fix in Claude Code Fix in Conductor Fix in Cursor Fix in Codex

docker/clickhouse/local/config.xml
docker/clickhouse/local/users.xml
docker-compose.ci.yml
- name: Install required tooling
if: steps.changed-files.outputs.any_changed == 'true'
env:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ e2e/cypress/results
# storybook
**/storybook-static/

# otel smoke tests: OIDC issuer fixtures, regenerated on every run
# (the matching private.pem is already covered by **/*.pem above)
smoke-tests/otel-collector/data/oidc-auth/public/

# scripts
scripts/*.csv
**/venv
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<!-- The shared local config.xml declares a `prometheus_api_v1` HTTP handler,
which only exists in ClickHouse >= 26.2. On the older compat server the
Comment thread
pulpdrew marked this conversation as resolved.
Resolved
unknown handler type aborts the whole HTTP listener (port 8123 never
opens, so the healthcheck fails), so drop the block here. -->
<clickhouse>
<http_handlers remove="1"/>
</clickhouse>
1 change: 1 addition & 0 deletions smoke-tests/otel-collector/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ services:
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
Expand Down
Loading