Skip to content

Commit c0378b4

Browse files
committed
Many fixes
Signed-off-by: haanhvu <[email protected]>
1 parent a7616e6 commit c0378b4

File tree

4 files changed

+59
-5
lines changed

4 files changed

+59
-5
lines changed

cmd/jaeger/internal/exporters/storageexporter/exporter.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ type storageExporter struct {
2828

2929
func newExporter(config *Config, otel component.TelemetrySettings) *storageExporter {
3030
return &storageExporter{
31-
config: config,
32-
logger: otel.Logger,
33-
clickhouse: false,
31+
config: config,
32+
logger: otel.Logger,
3433
}
3534
}
3635

@@ -46,6 +45,7 @@ func (exp *storageExporter) start(ctx context.Context, host component.Host) erro
4645
t.CreateSpansTable(ctx)
4746
exp.chExportTraces = t.ExportSpans
4847
default:
48+
exp.clickhouse = false
4949
if exp.spanWriter, err = f.CreateSpanWriter(); err != nil {
5050
return fmt.Errorf("cannot create span writer: %w", err)
5151
}

config.yaml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
service:
2+
extensions: [jaeger_storage, jaeger_query]
3+
pipelines:
4+
traces:
5+
receivers: [otlp, jaeger, zipkin]
6+
processors: [batch]
7+
exporters: [jaeger_storage_exporter]
8+
9+
extensions:
10+
# health_check:
11+
# pprof:
12+
# endpoint: 0.0.0.0:1777
13+
# zpages:
14+
# endpoint: 0.0.0.0:55679
15+
16+
jaeger_query:
17+
trace_storage: ch_store
18+
ui_config: ./cmd/jaeger/config-ui.json
19+
20+
jaeger_storage:
21+
memory:
22+
memstore:
23+
max_traces: 100000
24+
memstore_archive:
25+
max_traces: 100000
26+
clickhouse:
27+
ch_store:
28+
endpoint: tcp://127.0.0.1:9000?dial_timeout=10s&compress=lz4
29+
spans_table_name: jaeger_spans
30+
31+
receivers:
32+
otlp:
33+
protocols:
34+
grpc:
35+
http:
36+
37+
jaeger:
38+
protocols:
39+
grpc:
40+
thrift_binary:
41+
thrift_compact:
42+
thrift_http:
43+
44+
zipkin:
45+
46+
processors:
47+
batch:
48+
49+
exporters:
50+
jaeger_storage_exporter:
51+
trace_storage: ch_store

plugin/storage/clickhouse/config.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ type Config struct {
2222
// Materialized views' names?
2323
}
2424

25+
var driverName = "clickhouse"
26+
2527
const (
2628
defaultDatabase = "default"
2729
defaultUsername = "default"
@@ -67,7 +69,7 @@ func (cfg *Config) NewClient(ctx context.Context) (*sql.DB, error) {
6769
return nil, err
6870
}
6971

70-
db, err := sql.Open("", dsn)
72+
db, err := sql.Open(driverName, dsn)
7173
if err != nil {
7274
return nil, err
7375
}

plugin/storage/clickhouse/factory_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ func createTraces(count int) ptrace.Traces {
6969
}
7070

7171
func initClickhouseTestServer(t *testing.T, recorder recorder) {
72-
sql.Register("", &testClickhouseDriver{
72+
driverName = "test"
73+
sql.Register(driverName, &testClickhouseDriver{
7374
recorder: recorder,
7475
})
7576
}

0 commit comments

Comments
 (0)