From 865d2eeb3fe2c8b470fd1fc102fab542495acd83 Mon Sep 17 00:00:00 2001
From: FlamingSaint <raghuramkannan400@gmail.com>
Date: Tue, 9 Jul 2024 09:19:31 +0530
Subject: [PATCH] Add changes

Signed-off-by: FlamingSaint <raghuramkannan400@gmail.com>
---
 pkg/prometheus/config/config.go      | 23 +----------------------
 plugin/metrics/prometheus/factory.go | 11 ++---------
 plugin/metrics/prometheus/options.go |  4 +---
 3 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/pkg/prometheus/config/config.go b/pkg/prometheus/config/config.go
index 27233a9d3b7..8995a545151 100644
--- a/pkg/prometheus/config/config.go
+++ b/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
-	}
-}
diff --git a/plugin/metrics/prometheus/factory.go b/plugin/metrics/prometheus/factory.go
index 9ac42a90d86..3ac09b963b9 100644
--- a/plugin/metrics/prometheus/factory.go
+++ b/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
diff --git a/plugin/metrics/prometheus/options.go b/plugin/metrics/prometheus/options.go
index 0e3d03bda03..2b4bd221a94 100644
--- a/plugin/metrics/prometheus/options.go
+++ b/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(),
 	}
 }