Fix test and expvar type

Signed-off-by: Daniil Rutskiy <dstdfx@gmail.com>

Author: dstdfx

cmd/collector/app/builder_flags_test.go

@@ -56,11 +56,7 @@ func TestCollectorOptionsWithFlags_CheckFullHostPort(t *testing.T) {
 
 func TestCollectorOptionsWithFlags_CheckExpvarOptions(t *testing.T) {
 	c := &CollectorOptions{}
-	v, command := config.Viperize(AddFlags)
-	command.ParseFlags([]string{
-		"--collector.num-workers=42",
-		"--collector.queue-size=24",
-	})
+	v, _ := config.Viperize(AddFlags)
 	c.InitFromViper(v)
 
 	gotNumWorkers, err := strconv.Atoi(expvar.Get("collector.num-workers").String())
@@ -69,6 +65,6 @@ func TestCollectorOptionsWithFlags_CheckExpvarOptions(t *testing.T) {
 	gotQueueSize, err := strconv.Atoi(expvar.Get("collector.queue-size").String())
 	assert.NoError(t, err)
 
-	assert.Equal(t, 42, gotNumWorkers)
-	assert.Equal(t, 24, gotQueueSize)
+	assert.Equal(t, DefaultNumWorkers, gotNumWorkers)
+	assert.Equal(t, DefaultQueueSize, gotQueueSize)
 }

plugin/storage/factory.go

@@ -255,7 +255,7 @@ func (f *Factory) Close() error {
 
 func (f *Factory) setExpvarOptions() {
 	if expvar.Get(downsamplingRatio) == nil {
-		expvar.NewInt(downsamplingRatio).Set(int64(f.FactoryConfig.DownsamplingRatio))
+		expvar.NewFloat(downsamplingRatio).Set(f.FactoryConfig.DownsamplingRatio)
 	}
 	if expvar.Get(spanStorageType) == nil {
 		expvar.NewString(spanStorageType).Set(f.SpanReaderType)

plugin/storage/factory_test.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"reflect"
+	"strconv"
 	"strings"
 	"testing"
 
@@ -362,8 +363,9 @@ func TestSetExpvarOptions(t *testing.T) {
 	l := zap.NewNop()
 	f.Initialize(m, l)
 
-	gotDownsamplingRatio := expvar.Get(downsamplingRatio)
 	gotSpanStorageType := expvar.Get(spanStorageType)
+	gotDownsamplingRatio, err := strconv.ParseFloat(expvar.Get(downsamplingRatio).String(), 64)
+	assert.NoError(t, err)
 
 	assert.Equal(t, f.DownsamplingRatio, gotDownsamplingRatio)
 	assert.Equal(t, f.SpanReaderType, gotSpanStorageType)