Add changes

Signed-off-by: FlamingSaint <[email protected]>

pkg/prometheus/config/config.go

@@ -18,6 +18,7 @@ import (
 	"time"
 
 	"github.com/asaskevich/govalidator"
+
 	"github.com/jaegertracing/jaeger/pkg/config/tlscfg"
 )
 
@@ -39,25 +40,3 @@ func (c *Configuration) Validate() error {
 	_, err := govalidator.ValidateStruct(c)
 	return err
 }
-
-// ApplyDefaults copies settings from source unless its own value is non-zero.
-func (c *Configuration) ApplyDefaults(source *Configuration) {
-	if c.ServerURL == "" {
-		c.ServerURL = source.ServerURL
-	}
-	if c.ConnectTimeout == 0 {
-		c.ConnectTimeout = source.ConnectTimeout
-	}
-	if c.MetricNamespace == "" {
-		c.MetricNamespace = source.MetricNamespace
-	}
-	if c.LatencyUnit == "" {
-		c.LatencyUnit = source.LatencyUnit
-	}
-	if c.NormalizeCalls == false {
-		c.NormalizeCalls = source.NormalizeCalls
-	}
-	if c.NormalizeDuration == false {
-		c.NormalizeDuration = source.NormalizeDuration
-	}
-}

plugin/metrics/prometheus/factory.go

@@ -68,10 +68,6 @@ func (f *Factory) CreateMetricsReader() (metricsstore.Reader, error) {
 	return prometheusstore.NewMetricsReader(f.options.Configuration, f.logger, f.tracer)
 }
 
-func (f *Factory) configureFromOptions(o *Options) {
-	f.options = o
-}
-
 func NewFactoryWithConfig(
 	cfg config.Configuration,
 	logger *zap.Logger,
@@ -80,13 +76,10 @@ func NewFactoryWithConfig(
 		return nil, err
 	}
 
-	defaultConfig := DefaultConfig()
-	cfg.ApplyDefaults(&defaultConfig)
-
 	f := NewFactory()
-	f.configureFromOptions(&Options{
+	f.options = &Options{
 		Configuration: cfg,
-	})
+	}
 	err := f.Initialize(logger)
 	if err != nil {
 		return nil, err

plugin/metrics/prometheus/options.go

@@ -69,10 +69,8 @@ func DefaultConfig() config.Configuration {
 
 // NewOptions creates a new Options struct.
 func NewOptions() *Options {
-	defaultConfig := DefaultConfig()
-
 	return &Options{
-		Configuration: defaultConfig,
+		Configuration: DefaultConfig(),
 	}
 }