From 8aa7a76d3138a4549ac4b5be5ee522a4da03fee0 Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Thu, 30 Apr 2020 15:00:39 -0500 Subject: [PATCH] change default tracing config to 'off' also fix a typo --- cluster.go | 2 +- ctl/server.go | 2 +- docs/configuration.md | 2 +- server/config.go | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cluster.go b/cluster.go index ae7c2106c..c453aa2ef 100644 --- a/cluster.go +++ b/cluster.go @@ -1096,7 +1096,7 @@ func (c *cluster) waitForStarted() error { if !c.isCoordinator() { // In the case where a node has been restarted and memberlist has // not had enough time to determine the node went down/up, then - // the coorninator needs to be alerted that this node is back up + // the coordinator needs to be alerted that this node is back up // (and now in a state of STARTING) so that it can be put to the correct // cluster state. // TODO: Because the normal code path already sends a NodeJoin event (via diff --git a/ctl/server.go b/ctl/server.go index 9b7099a04..14a262470 100644 --- a/ctl/server.go +++ b/ctl/server.go @@ -78,7 +78,7 @@ func BuildServerFlags(cmd *cobra.Command, srv *server.Command) { // Tracing flags.StringVarP(&srv.Config.Tracing.AgentHostPort, "tracing.agent-host-port", "", srv.Config.Tracing.AgentHostPort, "Jaeger agent host:port.") - flags.StringVarP(&srv.Config.Tracing.SamplerType, "tracing.sampler-type", "", srv.Config.Tracing.SamplerType, "Jaeger sampler type or 'off' to disable tracing completely.") + flags.StringVarP(&srv.Config.Tracing.SamplerType, "tracing.sampler-type", "", srv.Config.Tracing.SamplerType, "Jaeger sampler type (remote, const, probabilistic, ratelimiting) or 'off' to disable tracing completely.") flags.Float64VarP(&srv.Config.Tracing.SamplerParam, "tracing.sampler-param", "", srv.Config.Tracing.SamplerParam, "Jaeger sampler parameter.") // Profiling diff --git a/docs/configuration.md b/docs/configuration.md index c698c847a..7b50aba33 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -403,7 +403,7 @@ The config file is in the [toml format](https://github.com/toml-lang/toml) and h #### Tracing Sampler Type -* Description: Jaeger sampler type (const, probabilistic, ratelimiting, or remote). Set to 'off' to disable tracing completely. +* Description: Jaeger sampler type (const, probabilistic, ratelimiting, or remote). Set to 'off' to disable tracing completely. Default is 'off'. * Flag: `tracing.sampler-type` * Env: `PILOSA_TRACING_SAMPLER_TYPE` * Config: diff --git a/server/config.go b/server/config.go index 34c155133..66acef154 100644 --- a/server/config.go +++ b/server/config.go @@ -27,7 +27,6 @@ import ( "github.com/pilosa/pilosa/v2/gossip" "github.com/pilosa/pilosa/v2/toml" "github.com/pkg/errors" - jaeger "github.com/uber/jaeger-client-go" ) // TLSConfig contains TLS configuration @@ -207,7 +206,7 @@ func NewConfig() *Config { c.Metric.Diagnostics = true // Tracing config. - c.Tracing.SamplerType = jaeger.SamplerTypeRemote + c.Tracing.SamplerType = "off" c.Tracing.SamplerParam = 0.001 c.Profile.BlockRate = 10000000 // 1 sample per 10 ms