From 561d18efecaf17a025e0cc997dad58590a85ae57 Mon Sep 17 00:00:00 2001 From: Prashant Shahi Date: Mon, 21 Mar 2022 20:39:53 +0530 Subject: [PATCH] =?UTF-8?q?chore(telemetry):=20=E2=9C=A8=20add=20deploymen?= =?UTF-8?q?t=20type=20(#875)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Prashant Shahi --- .../docker-swarm/clickhouse-setup/docker-compose.yaml | 5 +++++ deploy/docker/clickhouse-setup/docker-compose.arm.yaml | 2 ++ deploy/docker/clickhouse-setup/docker-compose.yaml | 2 ++ pkg/query-service/telemetry/telemetry.go | 10 ++++++++++ 4 files changed, 19 insertions(+) diff --git a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml index 7313a96251..46980c9a61 100644 --- a/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker-swarm/clickhouse-setup/docker-compose.yaml @@ -37,6 +37,11 @@ services: - STORAGE=clickhouse - POSTHOG_API_KEY=H-htDCae7CR3RV57gUzmol6IAKtm5IMCvbcm_fwnL-w - GODEBUG=netdns=go + - TELEMETRY_ENABLED=true + - DEPLOYMENT_TYPE=docker-swarm + deploy: + restart_policy: + condition: on-failure depends_on: - clickhouse diff --git a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml index defed773e8..32375e83c9 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.arm.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.arm.yaml @@ -35,6 +35,8 @@ services: - STORAGE=clickhouse - GODEBUG=netdns=go - TELEMETRY_ENABLED=true + - DEPLOYMENT_TYPE=docker-standalone-arm + restart: on-failure depends_on: clickhouse: condition: service_healthy diff --git a/deploy/docker/clickhouse-setup/docker-compose.yaml b/deploy/docker/clickhouse-setup/docker-compose.yaml index fff3535dd7..2a73859312 100644 --- a/deploy/docker/clickhouse-setup/docker-compose.yaml +++ b/deploy/docker/clickhouse-setup/docker-compose.yaml @@ -38,6 +38,8 @@ services: - STORAGE=clickhouse - GODEBUG=netdns=go - TELEMETRY_ENABLED=true + - DEPLOYMENT_TYPE=docker-standalone-amd + restart: on-failure depends_on: clickhouse: condition: service_healthy diff --git a/pkg/query-service/telemetry/telemetry.go b/pkg/query-service/telemetry/telemetry.go index 8a60be19da..9dea99f94f 100644 --- a/pkg/query-service/telemetry/telemetry.go +++ b/pkg/query-service/telemetry/telemetry.go @@ -3,6 +3,7 @@ package telemetry import ( "io/ioutil" "net/http" + "os" "sync" "time" @@ -111,6 +112,7 @@ func (a *Telemetry) SendEvent(event string, data map[string]interface{}) { // zap.S().Info(data) properties := analytics.NewProperties() properties.Set("version", version.GetVersion()) + properties.Set("deploymentType", getDeploymentType()) for k, v := range data { properties.Set(k, v) @@ -159,3 +161,11 @@ func GetInstance() *Telemetry { return telemetry } + +func getDeploymentType() string { + deploymentType := os.Getenv("DEPLOYMENT_TYPE") + if deploymentType == "" { + return "unknown" + } + return deploymentType +}