Add support for communication over HTTP Protocol

.github/workflows/build.yaml

@@ -95,7 +95,7 @@ jobs:
           go-version: ^1.19
 
       - name: Setup database
-        run: docker run --rm -d -p9000:9000 --name test-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server:22
+        run: docker run --rm -d -p9000:9000 --name test-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server:24
 
       - name: Run integration tests
         run: make integration-test

Makefile

@@ -3,7 +3,7 @@ GOARCH ?= $(shell go env GOARCH)
 GOBUILD=CGO_ENABLED=0 installsuffix=cgo go build -trimpath
 
 TOOLS_MOD_DIR = ./internal/tools
-JAEGER_VERSION ?= 1.32.0
+JAEGER_VERSION ?= 1.54.0
 
 DOCKER_REPO ?= ghcr.io/jaegertracing/jaeger-clickhouse
 DOCKER_TAG ?= latest
@@ -60,7 +60,7 @@ test:
 .PHONY: integration-test
 integration-test: build
 	STORAGE=grpc-plugin \
-	PLUGIN_BINARY_PATH=$(PWD)/jaeger-clickhouse-linux-amd64 \
+	PLUGIN_BINARY_PATH=$(PWD)/jaeger-clickhouse-$(GOOS)-$(GOARCH) \
 	PLUGIN_CONFIG_PATH=$(PWD)/integration/config-local.yaml \
 	go test ./integration
 

blog/post1.md

@@ -75,7 +75,7 @@ Refer to the [config.yaml](../config.yaml) for all supported configuration optio
 ### Docker database example
 
 ```bash
-docker run --rm -it -p9000:9000 --name some-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server:22
+docker run --rm -it -p9000:9000 --name some-clickhouse-server --ulimit nofile=262144:262144 clickhouse/clickhouse-server:24
 GOOS=linux make build run
 make run-hotrod
 ```

e2etests/e2e_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"testing"
@@ -19,8 +19,8 @@ import (
 )
 
 const (
-	clickHouseImage = "clickhouse/clickhouse-server:22"
-	jaegerImage     = "jaegertracing/all-in-one:1.32.0"
+	clickHouseImage = "clickhouse/clickhouse-server:24"
+	jaegerImage     = "jaegertracing/all-in-one:1.54.0"
 
 	networkName     = "chi-jaeger-test"
 	clickhousePort  = "9000/tcp"
@@ -77,21 +77,27 @@ func testE2E(t *testing.T, test testCase) {
 	require.NoError(t, err)
 	defer network.Remove(ctx)
 
-	var bindMounts map[string]string
+	var files []testcontainers.ContainerFile
 	if test.chiconf != nil {
-		bindMounts = map[string]string{
-			fmt.Sprintf("%s/%s", workingDir, *test.chiconf): "/etc/clickhouse-server/config.d/testconf.xml",
+		files = []testcontainers.ContainerFile{
+			{
+				HostFilePath:      workingDir + "/clickhouse-replicated.xml",
+				ContainerFilePath: "/etc/clickhouse-server/config.d/testconf.xml",
+				FileMode:          0o777,
+			},
 		}
 	} else {
-		bindMounts = map[string]string{}
+		files = []testcontainers.ContainerFile{}
 	}
+
 	chReq := testcontainers.ContainerRequest{
-		Image:        clickHouseImage,
-		ExposedPorts: []string{clickhousePort},
-		WaitingFor:   &clickhouseWaitStrategy{test: t, pollInterval: time.Millisecond * 200, startupTimeout: time.Minute},
-		Networks:     []string{networkName},
-		Hostname:     "chi",
-		BindMounts:   bindMounts,
+		Image:         clickHouseImage,
+		ImagePlatform: "linux/amd64",
+		ExposedPorts:  []string{clickhousePort},
+		WaitingFor:    &clickhouseWaitStrategy{test: t, pollInterval: time.Millisecond * 200, startupTimeout: time.Minute},
+		Networks:      []string{networkName},
+		Hostname:      "chi",
+		Files:         files,
 	}
 	chContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 		ContainerRequest: chReq,
@@ -103,22 +109,39 @@ func testE2E(t *testing.T, test testCase) {
 	jaegerContainers := make([]testcontainers.Container, 0)
 	for _, pluginConfig := range test.configs {
 		jaegerReq := testcontainers.ContainerRequest{
-			Image:        jaegerImage,
-			ExposedPorts: []string{jaegerQueryPort, jaegerAdminPort},
-			WaitingFor:   wait.ForHTTP("/").WithPort(jaegerAdminPort).WithStartupTimeout(time.Second * 10),
+			Image:         jaegerImage,
+			ImagePlatform: "linux/amd64",
+			ExposedPorts:  []string{jaegerQueryPort, jaegerAdminPort},
+			WaitingFor:    wait.ForHTTP("/").WithPort(jaegerAdminPort).WithStartupTimeout(time.Second * 10),
 			Env: map[string]string{
 				"SPAN_STORAGE_TYPE": "grpc-plugin",
 			},
 			Cmd: []string{
-				"--grpc-storage-plugin.binary=/project-dir/jaeger-clickhouse-linux-amd64",
-				fmt.Sprintf("--grpc-storage-plugin.configuration-file=/project-dir/e2etests/%s", pluginConfig),
+				"--grpc-storage-plugin.binary=/tmp/jaeger-clickhouse-linux-amd64",
+				fmt.Sprintf("--grpc-storage-plugin.configuration-file=/tmp/%s", pluginConfig),
 				"--grpc-storage-plugin.log-level=debug",
+				"--query.ui-config=/tmp/jaeger-ui.json",
 			},
-			BindMounts: map[string]string{
-				workingDir + "/..": "/project-dir",
+			Files: []testcontainers.ContainerFile{
+				{
+					HostFilePath:      workingDir + "/../jaeger-clickhouse-linux-amd64",
+					ContainerFilePath: "/tmp/jaeger-clickhouse-linux-amd64",
+					FileMode:          0o777,
+				},
+				{
+					HostFilePath:      workingDir + "/" + pluginConfig,
+					ContainerFilePath: fmt.Sprintf("/tmp/%s", pluginConfig),
+					FileMode:          0o777,
+				},
+				{
+					HostFilePath:      workingDir + "/../jaeger-ui.json",
+					ContainerFilePath: "/tmp/jaeger-ui.json",
+					FileMode:          0o777,
+				},
 			},
 			Networks: []string{networkName},
 		}
+
 		// Call Start() manually here so that if it fails then we can still access the logs.
 		jaegerContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
 			ContainerRequest: jaegerReq,
@@ -127,7 +150,7 @@ func testE2E(t *testing.T, test testCase) {
 		defer func() {
 			logs, errLogs := jaegerContainer.Logs(ctx)
 			require.NoError(t, errLogs)
-			all, errLogs := ioutil.ReadAll(logs)
+			all, errLogs := io.ReadAll(logs)
 			require.NoError(t, errLogs)
 			fmt.Printf("Jaeger logs:\n---->\n%s<----\n\n", string(all))
 			jaegerContainer.Terminate(ctx)
@@ -142,16 +165,16 @@ func testE2E(t *testing.T, test testCase) {
 		jaegerQueryPort, err := jaegerContainer.MappedPort(ctx, jaegerQueryPort)
 		require.NoError(t, err)
 
-		err = awaitility.Await(100*time.Millisecond, time.Second*3, func() bool {
+		err = awaitility.Await(1000*time.Millisecond, time.Second*10, func() bool {
 			// Jaeger traces itself so this request generates some spans
 			response, errHTTP := http.Get(fmt.Sprintf("http://localhost:%d/api/services", jaegerQueryPort.Int()))
 			require.NoError(t, errHTTP)
-			body, errHTTP := ioutil.ReadAll(response.Body)
+			body, errHTTP := io.ReadAll(response.Body)
 			require.NoError(t, errHTTP)
 			var r result
 			errHTTP = json.Unmarshal(body, &r)
 			require.NoError(t, errHTTP)
-			return len(r.Data) == 1 && r.Data[0] == "jaeger-query"
+			return len(r.Data) == 1 && r.Data[0] == "jaeger-all-in-one"
 		})
 		assert.NoError(t, err)
 	}

go.mod

@@ -3,99 +3,129 @@ module github.com/jaegertracing/jaeger-clickhouse
 go 1.19
 
 require (
-	github.com/ClickHouse/clickhouse-go/v2 v2.3.0
-	github.com/DATA-DOG/go-sqlmock v1.5.0
+	github.com/ClickHouse/clickhouse-go/v2 v2.18.0
+	github.com/DATA-DOG/go-sqlmock v1.5.2
 	github.com/ecodia/golang-awaitility v0.0.0-20180710094957-fb55e59708c7
 	github.com/gogo/protobuf v1.3.2
-	github.com/hashicorp/go-hclog v1.3.1
-	github.com/jaegertracing/jaeger v1.38.2-0.20221007043206-b4c88ddf6cdd
+	github.com/hashicorp/go-hclog v1.6.2
+	github.com/jaegertracing/jaeger v1.54.0
 	github.com/opentracing/opentracing-go v1.2.0
-	github.com/prometheus/client_golang v1.13.0
-	github.com/stretchr/testify v1.8.0
-	github.com/testcontainers/testcontainers-go v0.11.1
-	go.uber.org/zap v1.23.0
+	github.com/prometheus/client_golang v1.18.0
+	github.com/stretchr/testify v1.8.4
+	github.com/testcontainers/testcontainers-go v0.27.0
+	go.uber.org/zap v1.26.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
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
+	github.com/ClickHouse/ch-go v0.61.2 // indirect
+	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/Microsoft/hcsshim v0.11.4 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/benbjohnson/clock v1.3.5 // 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/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
-	github.com/docker/distribution v2.7.1+incompatible // indirect
-	github.com/docker/docker v20.10.7+incompatible // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
-	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/cenkalti/backoff/v4 v4.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/containerd/cgroups v1.1.0 // indirect
+	github.com/containerd/containerd v1.7.13 // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/cpuguy83/dockercfg v0.3.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/distribution/reference v0.5.0 // indirect
+	github.com/docker/distribution v2.8.3+incompatible // indirect
+	github.com/docker/docker v25.0.3+incompatible // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/fatih/color v1.16.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-faster/city v1.0.1 // indirect
-	github.com/go-faster/errors v0.6.1 // indirect
+	github.com/go-faster/errors v0.7.1 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
-	github.com/hashicorp/go-plugin v1.4.5 // indirect
+	github.com/hashicorp/go-plugin v1.6.0 // 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.10 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/klauspost/compress v1.17.6 // indirect
+	github.com/kr/pretty v0.3.1 // 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
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+	github.com/lufia/plan9stats v0.0.0-20231016141302-07b5767bb0ed // indirect
+	github.com/magiconair/properties v1.8.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/moby/sys/mount v0.2.0 // indirect
-	github.com/moby/sys/mountinfo v0.4.1 // indirect
-	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
-	github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect
+	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect
+	github.com/moby/patternmatcher v0.6.0 // indirect
+	github.com/moby/sys/mount v0.3.3 // indirect
+	github.com/moby/sys/mountinfo v0.7.1 // indirect
+	github.com/moby/sys/sequential v0.5.0 // indirect
+	github.com/moby/sys/user v0.1.0 // indirect
+	github.com/moby/term v0.5.0 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/oklog/run v1.1.0 // indirect
 	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/opencontainers/image-spec v1.1.0-rc6 // indirect
+	github.com/opencontainers/runc v1.1.12 // indirect
+	github.com/paulmach/orb v0.11.1 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
-	github.com/pierrec/lz4/v4 v4.1.15 // indirect
+	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // 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.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	github.com/rogpeppe/go-internal v1.8.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.46.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
+	github.com/sagikazarmark/locafero v0.4.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
+	github.com/shirou/gopsutil/v3 v3.24.1 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // 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
-	github.com/spf13/cobra v1.5.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.6.0 // indirect
+	github.com/spf13/cobra v1.8.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.13.0 // indirect
-	github.com/subosito/gotenv v1.4.1 // indirect
+	github.com/spf13/viper v1.18.2 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.13 // indirect
+	github.com/tklauser/numcpus v0.7.0 // indirect
 	github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
-	go.opencensus.io v0.23.0 // indirect
-	go.opentelemetry.io/otel v1.10.0 // indirect
-	go.opentelemetry.io/otel/trace v1.10.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-20221002022538-bcab6841153b // indirect
-	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect
-	google.golang.org/grpc v1.50.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
+	go.opentelemetry.io/otel v1.23.1 // indirect
+	go.opentelemetry.io/otel/metric v1.23.1 // indirect
+	go.opentelemetry.io/otel/trace v1.23.1 // indirect
+	go.uber.org/atomic v1.11.0 // indirect
+	go.uber.org/goleak v1.3.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
+	golang.org/x/mod v0.15.0 // indirect
+	golang.org/x/net v0.21.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
+	google.golang.org/genproto v0.0.0-20240125205218-1f4bbc51befe // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240205150955-31a09d347014 // indirect
+	google.golang.org/grpc v1.61.0 // indirect
+	google.golang.org/protobuf v1.32.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect