From 24b55dbe147357d67d7b28fea9041acb6a6bacbb Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 3 Nov 2022 19:43:21 +0200 Subject: [PATCH 1/2] fix: Change trace env var back and avoid URL error when disabled --- cli/deployment/config.go | 2 +- cli/server.go | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cli/deployment/config.go b/cli/deployment/config.go index f3e432fb559d3..6a44afbad6885 100644 --- a/cli/deployment/config.go +++ b/cli/deployment/config.go @@ -236,7 +236,7 @@ func newConfig() *codersdk.DeploymentConfig { Telemetry: &codersdk.TelemetryConfig{ Enable: &codersdk.DeploymentConfigField[bool]{ - Name: "Telemetry Enable", + Name: "Telemetry", Usage: "Whether telemetry is enabled or not. Coder collects anonymized usage data to help improve our product.", Flag: "telemetry", Default: flag.Lookup("test.v") == nil, diff --git a/cli/server.go b/cli/server.go index f359f6fc7f297..8a8e4998db5d7 100644 --- a/cli/server.go +++ b/cli/server.go @@ -468,16 +468,17 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co } } - // Parse the raw telemetry URL! - telemetryURL, err := parseURL(cfg.Telemetry.URL.Value) - if err != nil { - return xerrors.Errorf("parse telemetry url: %w", err) - } // Disable telemetry if the in-memory database is used unless explicitly defined! if cfg.InMemoryDatabase.Value && !cmd.Flags().Changed(cfg.Telemetry.Enable.Flag) { cfg.Telemetry.Enable.Value = false } if cfg.Telemetry.Enable.Value { + // Parse the raw telemetry URL! + telemetryURL, err := parseURL(cfg.Telemetry.URL.Value) + if err != nil { + return xerrors.Errorf("parse telemetry url: %w", err) + } + options.Telemetry, err = telemetry.New(telemetry.Options{ BuiltinPostgres: builtinPostgres, DeploymentID: deploymentID, From 38a5dd30f42285219dfc46243a9db7a5261b2850 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 3 Nov 2022 19:51:09 +0200 Subject: [PATCH 2/2] Revert name change of telemetry enable config field --- cli/deployment/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/deployment/config.go b/cli/deployment/config.go index 6a44afbad6885..f3e432fb559d3 100644 --- a/cli/deployment/config.go +++ b/cli/deployment/config.go @@ -236,7 +236,7 @@ func newConfig() *codersdk.DeploymentConfig { Telemetry: &codersdk.TelemetryConfig{ Enable: &codersdk.DeploymentConfigField[bool]{ - Name: "Telemetry", + Name: "Telemetry Enable", Usage: "Whether telemetry is enabled or not. Coder collects anonymized usage data to help improve our product.", Flag: "telemetry", Default: flag.Lookup("test.v") == nil,