Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[feat] Store traces in ClickHouse based on Jaeger V2 #6725

Closed
Closed
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
2 changes: 2 additions & 0 deletions .github/workflows/ci-e2e-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ jobs:
opensearch:
uses: ./.github/workflows/ci-e2e-opensearch.yml

clickhouse:
uses: ./.github/workflows/ci-e2e-clickhouse.yml
46 changes: 46 additions & 0 deletions .github/workflows/ci-e2e-clickhouse.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: CIT ClickHouse

on:
workflow_call:

concurrency:
group: cit-clickhouse-${{ github.workflow }}-${{ (github.event.pull_request && github.event.pull_request.number) || github.ref || github.run_id }}
cancel-in-progress: true

# See https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
permissions: # added using https://github.com/step-security/secure-workflows
contents: read

jobs:
clickhouse:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
clickhouse-version: ["25.x"]
name: clickhouse
steps:
- name: Harden Runner
uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
with:
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs

- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: 1.24.x

- name: Run clickhouse integration tests
id: test-execution
run: bash scripts/e2e/clickhouse.sh
- uses: ./.github/actions/verify-metrics-snapshot
with:
snapshot: metrics_snapshot_clickhouse
artifact_key: metrics_snapshot_clickhouse

- name: Upload coverage to codecov
uses: ./.github/actions/upload-codecov
with:
files: cover.out
flags: clickhouse-${{ matrix.clickhouse-version }}
5 changes: 5 additions & 0 deletions .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,8 @@ packages:
CoreSpanReader:
CoreSpanWriter:

github.com/jaegertracing/jaeger/internal/storage/v2/clickhouse/client:
interfaces:
ChPool:
Clickhouse:
Rows:
10 changes: 10 additions & 0 deletions docker-compose/clickhouse/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
services:
clickhouse:
container_name: clickhouse
image: bitnami/clickhouse:25.1.3
environment:
CLICKHOUSE_USER: "default"
CLICKHOUSE_PASSWORD: "default"
ports:
- 9000:9000
- 8123:8123
18 changes: 16 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ go 1.23.7
toolchain go1.24.1

require (
github.com/ClickHouse/ch-go v0.65.1
github.com/ClickHouse/clickhouse-go/v2 v2.33.1
github.com/HdrHistogram/hdrhistogram-go v1.1.2
github.com/Shopify/sarama v1.37.2
github.com/apache/thrift v0.21.0
Expand Down Expand Up @@ -103,15 +105,27 @@ require (
)

require (
github.com/andybalholm/brotli v1.1.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
github.com/dmarkham/enumer v1.5.10 // indirect
github.com/go-faster/city v1.0.1 // indirect
github.com/go-faster/errors v0.7.1 // indirect
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/pascaldekloe/name v1.0.1 // indirect
github.com/paulmach/orb v0.11.1 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/twmb/murmur3 v1.1.8 // indirect
go.opentelemetry.io/collector/extension/extensionauth v0.122.1 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.122.1 // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.122.1 // indirect
go.opentelemetry.io/collector/receiver/receiverhelper v0.122.1 // indirect
go.opentelemetry.io/collector/service/hostcapabilities v0.122.1 // indirect
go.opentelemetry.io/contrib/otelconf v0.15.0 // indirect
golang.org/x/mod v0.23.0 // indirect
golang.org/x/sync v0.12.0 // indirect
golang.org/x/tools v0.30.0 // indirect
)

require (
Expand Down Expand Up @@ -199,7 +213,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.122.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil v0.122.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.122.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.122.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils v0.122.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic v0.122.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.122.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.122.0 // indirect
Expand Down Expand Up @@ -264,7 +278,7 @@ require (
go.opentelemetry.io/collector/processor/xprocessor v0.122.1 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.122.1 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.122.1 // indirect
go.opentelemetry.io/collector/semconv v0.122.1 // indirect
go.opentelemetry.io/collector/semconv v0.122.1
go.opentelemetry.io/collector/service v0.122.1 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
Expand Down
Loading
Loading