Bump clickhouse-go: v1.5.4 -> v2.3.0 (#116)

* Bump clickhouse-go: v1.5.4 -> v2.3.0

This change will have some breaking change but we will have good performance gain.

* ClickHouse Address will change from `tcp://localhost:9000` to `localhost:9000`

* In Jaeger, `duration` is of `Time.Duration` datatype which is Int64 but ClickHouse's `durationUs` column used to be UInt64 datatype.
  Newer version of clickhouse client validates the datatype before writing the data. Hence we have to change the column `durationUs` to Int64 datatype.

Signed-off-by: Pradeep Chhetri <pradeepchhetri4444@gmail.com>

* Sanitize address if tcp:// scheme is present

Signed-off-by: Pradeep Chhetri <pradeepchhetri4444@gmail.com>

* Keep using UInt64 for durationUs

Signed-off-by: Pradeep Chhetri <pradeepchhetri4444@gmail.com>

* Cleanup

Signed-off-by: Pradeep Chhetri <pradeepchhetri4444@gmail.com>

* Feedbacks

Signed-off-by: Pradeep Chhetri <pradeepchhetri4444@gmail.com>

Signed-off-by: Pradeep Chhetri <pradeepchhetri4444@gmail.com>
Co-authored-by: Pradeep Chhetri <pchhetri@cloudflare.com>

Author: chhetripradeep

cmd/jaeger-clickhouse/main.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -32,7 +31,7 @@ func main() {
 		JSONFormat: true,
 	})
 
-	cfgFile, err := ioutil.ReadFile(filepath.Clean(configPath))
+	cfgFile, err := os.ReadFile(filepath.Clean(configPath))
 	if err != nil {
 		logger.Error("Could not read config file", "config", configPath, "error", err)
 		os.Exit(1)

config.yaml

@@ -1,4 +1,4 @@
-address: tcp://some-clickhouse-server:9000
+address: some-clickhouse-server:9000
 # Directory with .sql files to run at plugin startup, mainly for integration tests.
 # Depending on the value of "init_tables", this can be run as a
 # replacement or supplement to creating default tables for span storage.

e2etests/config-local-multi1.yaml

@@ -1,4 +1,4 @@
-address: tcp://chi:9000
+address: chi:9000
 tenant: multi1
 # For test purposes flush on every write
 batch_write_size: 1

e2etests/config-local-multi2.yaml

@@ -1,4 +1,4 @@
-address: tcp://chi:9000
+address: chi:9000
 tenant: multi2
 # For test purposes flush on every write
 batch_write_size: 1

e2etests/config-local-single.yaml

@@ -1,3 +1,3 @@
-address: tcp://chi:9000
+address: chi:9000
 # For test purposes flush on every write
 batch_write_size: 1

e2etests/config-replication-multi1.yaml

@@ -1,4 +1,4 @@
-address: tcp://chi:9000
+address: chi:9000
 replication: true
 tenant: multi1
 # For test purposes flush on every write

e2etests/config-replication-multi2.yaml

@@ -1,4 +1,4 @@
-address: tcp://chi:9000
+address: chi:9000
 replication: true
 tenant: multi2
 # For test purposes flush on every write

e2etests/config-replication-single.yaml

@@ -1,4 +1,4 @@
-address: tcp://chi:9000
+address: chi:9000
 replication: true
 # For test purposes flush on every write
 batch_write_size: 1

e2etests/e2e_test.go

@@ -2,7 +2,6 @@ package e2etests
 
 import (
 	"context"
-	"database/sql"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -11,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	_ "github.com/ClickHouse/clickhouse-go" // import driver
+	clickhouse "github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/ecodia/golang-awaitility/awaitility"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -176,7 +175,18 @@ func (c *clickhouseWaitStrategy) WaitUntilReady(ctx context.Context, target wait
 
 	port, err := target.MappedPort(ctx, clickhousePort)
 	require.NoError(c.test, err)
-	db, err := sql.Open("clickhouse", fmt.Sprintf("tcp://localhost:%d?database=default", port.Int()))
+
+	db := clickhouse.OpenDB(&clickhouse.Options{
+		Addr: []string{
+			fmt.Sprintf("localhost:%d", port.Int()),
+		},
+		Auth: clickhouse.Auth{
+			Database: "default",
+		},
+		Compression: &clickhouse.Compression{
+			Method: clickhouse.CompressionLZ4,
+		},
+	})
 	require.NoError(c.test, err)
 
 	for {

go.mod

@@ -3,7 +3,7 @@ module github.com/jaegertracing/jaeger-clickhouse
 go 1.19
 
 require (
-	github.com/ClickHouse/clickhouse-go v1.5.4
+	github.com/ClickHouse/clickhouse-go/v2 v2.3.0
 	github.com/DATA-DOG/go-sqlmock v1.5.0
 	github.com/ecodia/golang-awaitility v0.0.0-20180710094957-fb55e59708c7
 	github.com/gogo/protobuf v1.3.2
@@ -12,22 +12,23 @@ require (
 	github.com/kr/pretty v0.3.0
 	github.com/opentracing/opentracing-go v1.2.0
 	github.com/prometheus/client_golang v1.12.2
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.8.0
 	github.com/testcontainers/testcontainers-go v0.11.1
 	github.com/uber/jaeger-lib v2.4.1+incompatible
-	go.uber.org/zap v1.21.0
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
+	go.uber.org/zap v1.22.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
+	github.com/ClickHouse/ch-go v0.47.3 // indirect
 	github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 // indirect
 	github.com/Microsoft/hcsshim v0.8.16 // indirect
+	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 // indirect
 	github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect
 	github.com/containerd/containerd v1.5.0-beta.4 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -37,15 +38,17 @@ require (
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/fatih/color v1.13.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/go-faster/city v1.0.1 // indirect
+	github.com/go-faster/errors v0.6.1 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
 	github.com/hashicorp/go-plugin v1.4.4 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
 	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/klauspost/compress v1.15.9 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/magiconair/properties v1.8.6 // indirect
 	github.com/mattn/go-colorable v0.1.12 // indirect
@@ -61,14 +64,18 @@ require (
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/opencontainers/runc v1.0.0-rc93 // indirect
+	github.com/paulmach/orb v0.7.1 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.0-beta.8 // indirect
+	github.com/pierrec/lz4/v4 v4.1.15 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.34.0 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/rogpeppe/go-internal v1.8.1 // indirect
+	github.com/segmentio/asm v1.2.0 // indirect
+	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
 	github.com/spf13/afero v1.8.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
@@ -79,10 +86,12 @@ require (
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	go.opencensus.io v0.23.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
+	go.opentelemetry.io/otel v1.9.0 // indirect
+	go.opentelemetry.io/otel/trace v1.9.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
-	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac // indirect
 	google.golang.org/grpc v1.46.2 // indirect