Fix factory init, rename opts func

Signed-off-by: Daniil Rutskiy <[email protected]>
jaegertracing · Oct 1, 2020 · c6bbaf9 · c6bbaf9
1 parent 43f74e8
commit c6bbaf9
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 21 deletions.
diff --git a/cmd/agent/app/builder.go b/cmd/agent/app/builder.go
@@ -112,7 +112,7 @@ func (b *Builder) CreateAgent(primaryProxy CollectorProxy, logger *zap.Logger, m
 		return nil, fmt.Errorf("cannot create processors: %w", err)
 	}
 	server := b.HTTPServer.getHTTPServer(primaryProxy.GetManager(), mFactory)
-	b.setExpvarOptions(mFactory)
+	b.publishOpts(mFactory)
 
 	return NewAgent(processors, server, logger), nil
 }
@@ -129,7 +129,7 @@ func (b *Builder) getReporter(primaryProxy CollectorProxy) reporter.Reporter {
 	return reporter.NewMultiReporter(rep...)
 }
 
-func (b *Builder) setExpvarOptions(mFactory metrics.Factory) {
+func (b *Builder) publishOpts(mFactory metrics.Factory) {
 	internalFactory := mFactory.Namespace(metrics.NSOptions{Name: "internal"})
 	for _, p := range b.Processors {
 		prefix := fmt.Sprintf(processorPrefixFmt, p.Model, p.Protocol)

diff --git a/cmd/agent/app/builder_test.go b/cmd/agent/app/builder_test.go
@@ -279,7 +279,7 @@ func TestCreateCollectorProxy_UnknownReporter(t *testing.T) {
 	assert.EqualError(t, err, "unknown reporter type ")
 }
 
-func TestSetExpvarOptions(t *testing.T) {
+func TestPublishOpts(t *testing.T) {
 	v := viper.New()
 	cfg := &Builder{}
 	command := cobra.Command{}

diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -51,10 +51,12 @@ func main() {
 				return err
 			}
 			logger := svc.Logger // shortcut
-			baseFactory := svc.MetricsFactory.Namespace(metrics.NSOptions{Name: "jaeger"})
+			baseFactory := svc.MetricsFactory.
+				Namespace(metrics.NSOptions{Name: "jaeger"}).
+				Namespace(metrics.NSOptions{Name: "agent"})
 			mFactory := fork.New("internal",
-				jexpvar.NewFactory(10).Namespace(metrics.NSOptions{}), // backend for internal opts
-				baseFactory.Namespace(metrics.NSOptions{Name: "agent"}))
+				jexpvar.NewFactory(10), // backend for internal opts
+				baseFactory)
 
 			rOpts := new(reporter.Options).InitFromViper(v, logger)
 			grpcBuilder := grpc.NewConnBuilder().InitFromViper(v)

diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
@@ -84,7 +84,7 @@ by default uses only in-memory database.`,
 			logger := svc.Logger                     // shortcut
 			rootMetricsFactory := svc.MetricsFactory // shortcut
 			metricsFactory := fork.New("internal",
-				jexpvar.NewFactory(10).Namespace(metrics.NSOptions{}), // backend for internal opts
+				jexpvar.NewFactory(10), // backend for internal opts
 				rootMetricsFactory.Namespace(metrics.NSOptions{Name: "jaeger"}))
 
 			tracerCloser := initTracer(rootMetricsFactory, svc.Logger)

diff --git a/cmd/collector/app/collector.go b/cmd/collector/app/collector.go
@@ -122,12 +122,12 @@ func (c *Collector) Start(builderOpts *CollectorOptions) error {
 	} else {
 		c.zkServer = zkServer
 	}
-	c.setExpvarOptions(builderOpts)
+	c.publishOpts(builderOpts)
 
 	return nil
 }
 
-func (c *Collector) setExpvarOptions(cOpts *CollectorOptions) {
+func (c *Collector) publishOpts(cOpts *CollectorOptions) {
 	internalFactory := c.metricsFactory.Namespace(metrics.NSOptions{Name: "internal"})
 	internalFactory.Gauge(metrics.Options{Name: collectorNumWorkers}).Update(int64(cOpts.NumWorkers))
 	internalFactory.Gauge(metrics.Options{Name: collectorQueueSize}).Update(int64(cOpts.QueueSize))

diff --git a/cmd/collector/app/collector_test.go b/cmd/collector/app/collector_test.go
@@ -63,7 +63,7 @@ func (m *mockStrategyStore) GetSamplingStrategy(_ context.Context, serviceName s
 	return &sampling.SamplingStrategyResponse{}, nil
 }
 
-func TestCollector_SetExpvarOptions(t *testing.T) {
+func TestCollector_PublishOpts(t *testing.T) {
 	// prepare
 	hc := healthcheck.New()
 	logger := zap.NewNop()

diff --git a/cmd/collector/main.go b/cmd/collector/main.go
@@ -66,7 +66,7 @@ func main() {
 			logger := svc.Logger // shortcut
 			baseFactory := svc.MetricsFactory.Namespace(metrics.NSOptions{Name: "jaeger"})
 			metricsFactory := fork.New("internal",
-				jexpvar.NewFactory(10).Namespace(metrics.NSOptions{}), // backend for internal opts
+				jexpvar.NewFactory(10), // backend for internal opts
 				baseFactory.Namespace(metrics.NSOptions{Name: "collector"}))
 
 			storageFactory.InitFromViper(v)

diff --git a/plugin/storage/factory.go b/plugin/storage/factory.go
@@ -46,7 +46,7 @@ const (
 	badgerStorageType        = "badger"
 	downsamplingRatio        = "downsampling.ratio"
 	downsamplingHashSalt     = "downsampling.hashsalt"
-	spanStorageType          = "span-storage.type"
+	spanStorageType          = "span-storage-type"
 
 	// defaultDownsamplingRatio is the default downsampling ratio.
 	defaultDownsamplingRatio = 1.0
@@ -112,7 +112,7 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger)
 			return err
 		}
 	}
-	f.setExpvarOptions()
+	f.publishOpts()
 
 	return nil
 }
@@ -253,10 +253,10 @@ func (f *Factory) Close() error {
 	return multierror.Wrap(errs)
 }
 
-func (f *Factory) setExpvarOptions() {
+func (f *Factory) publishOpts() {
 	internalFactory := f.metricsFactory.Namespace(metrics.NSOptions{Name: "internal"})
 	internalFactory.Gauge(metrics.Options{Name: downsamplingRatio}).
 		Update(int64(f.FactoryConfig.DownsamplingRatio))
-	internalFactory.Gauge(metrics.Options{Name: spanStorageType + "." + f.SpanReaderType}).
+	internalFactory.Gauge(metrics.Options{Name: spanStorageType + "-" + f.SpanReaderType}).
 		Update(1)
 }
diff --git a/plugin/storage/factory_test.go b/plugin/storage/factory_test.go
@@ -353,7 +353,7 @@ func TestParsingDownsamplingRatio(t *testing.T) {
 	assert.Equal(t, f.FactoryConfig.DownsamplingRatio, 0.5)
 }
 
-func TestSetExpvarOptions(t *testing.T) {
+func TestPublishOpts(t *testing.T) {
 	f, err := NewFactory(defaultCfg())
 	require.NoError(t, err)
 
@@ -363,14 +363,14 @@ func TestSetExpvarOptions(t *testing.T) {
 	f.metricsFactory = metricsFactory
 
 	// This method is called inside factory.Initialize method
-	f.setExpvarOptions()
+	f.publishOpts()
 
 	forkFactory.AssertGaugeMetrics(t, metricstest.ExpectedMetric{
 		Name:  "internal." + downsamplingRatio,
 		Value: int(f.DownsamplingRatio),
 	})
 	forkFactory.AssertGaugeMetrics(t, metricstest.ExpectedMetric{
-		Name:  strings.Join([]string{"internal", spanStorageType, f.SpanReaderType}, "."),
+		Name:  "internal." + spanStorageType + "-" + f.SpanReaderType,
 		Value: 1,
 	})
 }

diff --git a/plugin/storage/memory/factory.go b/plugin/storage/memory/factory.go
@@ -59,7 +59,7 @@ func (f *Factory) Initialize(metricsFactory metrics.Factory, logger *zap.Logger)
 	f.metricsFactory, f.logger = metricsFactory, logger
 	f.store = WithConfiguration(f.options.Configuration)
 	logger.Info("Memory storage initialized", zap.Any("configuration", f.store.config))
-	f.setExpvarOptions()
+	f.publishOpts()
 
 	return nil
 }
@@ -79,7 +79,7 @@ func (f *Factory) CreateDependencyReader() (dependencystore.Reader, error) {
 	return f.store, nil
 }
 
-func (f *Factory) setExpvarOptions() {
+func (f *Factory) publishOpts() {
 	internalFactory := f.metricsFactory.Namespace(metrics.NSOptions{Name: "internal"})
 	internalFactory.Gauge(metrics.Options{Name: limit}).
 		Update(int64(f.options.Configuration.MaxTraces))

diff --git a/plugin/storage/memory/factory_test.go b/plugin/storage/memory/factory_test.go
@@ -61,7 +61,7 @@ func TestInitFromOptions(t *testing.T) {
 	assert.Equal(t, o, f.options)
 }
 
-func TestSetExpvarOptions(t *testing.T) {
+func TestPublishOpts(t *testing.T) {
 	f := NewFactory()
 	v, command := config.Viperize(f.AddFlags)
 	command.ParseFlags([]string{"--memory.max-traces=100"})