Addressed comments

Signed-off-by: Alok Kumar Singh <dev.alok.singh123@gmail.com>

pkg/prometheus/config/config.go

@@ -19,11 +19,13 @@ type Configuration struct {
 	TokenFilePath            string `mapstructure:"token_file_path"`
 	TokenOverrideFromContext bool   `mapstructure:"token_override_from_context"`
 
-	MetricNamespace      string            `mapstructure:"metric_namespace"`
-	LatencyUnit          string            `mapstructure:"latency_unit"`
-	NormalizeCalls       bool              `mapstructure:"normalize_calls"`
-	NormalizeDuration    bool              `mapstructure:"normalize_duration"`
-	AdditionalParameters map[string]string `mapstructure:"additional_parameters"`
+	MetricNamespace   string `mapstructure:"metric_namespace"`
+	LatencyUnit       string `mapstructure:"latency_unit"`
+	NormalizeCalls    bool   `mapstructure:"normalize_calls"`
+	NormalizeDuration bool   `mapstructure:"normalize_duration"`
+	// ExtraQueryParams is used to provide extra query parameters to the backend which
+	// is being called for metric read/write
+	ExtraQueryParams map[string]string `mapstructure:"extra_query_parameters"`
 }
 
 func (c *Configuration) Validate() error {

plugin/metricstore/prometheus/metricstore/reader.go

@@ -64,7 +64,7 @@ type (
 
 	promClient struct {
 		api.Client
-		params map[string]string
+		extraParams map[string]string
 	}
 )
 
@@ -73,7 +73,7 @@ func (p promClient) URL(ep string, args map[string]string) *url.URL {
 	u := p.Client.URL(ep, args)
 
 	query := u.Query()
-	for k, v := range p.params {
+	for k, v := range p.extraParams {
 		query.Set(k, v)
 	}
 	u.RawQuery = query.Encode()
@@ -96,17 +96,15 @@ func createPromClient(logger *zap.Logger, cfg config.Configuration) (api.Client,
 	}
 
 	customClient := promClient{
-		Client: client,
-		params: cfg.AdditionalParameters,
+		Client:      client,
+		extraParams: cfg.ExtraQueryParams,
 	}
 
 	return customClient, nil
 }
 
 // NewMetricsReader returns a new MetricsReader.
 func NewMetricsReader(cfg config.Configuration, logger *zap.Logger, tracer trace.TracerProvider) (*MetricsReader, error) {
-	logger.Info("Creating metrics reader", zap.Any("configuration", cfg))
-
 	const operationLabel = "span_name"
 
 	promClient, err := createPromClient(logger, cfg)

plugin/metricstore/prometheus/metricstore/reader_test.go

@@ -863,16 +863,16 @@ func TestInvalidCertFile(t *testing.T) {
 	assert.Nil(t, reader)
 }
 
-func TestCreatePromClientWithAdditionalParameters(t *testing.T) {
+func TestCreatePromClientWithExtraQueryParameters(t *testing.T) {
 	expParams := map[string]string{
 		"param1": "value1",
 		"param2": "value2",
 	}
 
 	logger := zap.NewNop()
 	cfg := config.Configuration{
-		ServerURL:            "http://localhost:1234",
-		AdditionalParameters: expParams,
+		ServerURL:        "http://localhost:1234",
+		ExtraQueryParams: expParams,
 	}
 
 	customClient, err := createPromClient(logger, cfg)

plugin/metricstore/prometheus/options.go

@@ -51,11 +51,10 @@ func DefaultConfig() config.Configuration {
 		ServerURL:      defaultServerURL,
 		ConnectTimeout: defaultConnectTimeout,
 
-		MetricNamespace:      defaultMetricNamespace,
-		LatencyUnit:          defaultLatencyUnit,
-		NormalizeCalls:       defaultNormalizeCalls,
-		NormalizeDuration:    defaultNormalizeCalls,
-		AdditionalParameters: nil,
+		MetricNamespace:   defaultMetricNamespace,
+		LatencyUnit:       defaultLatencyUnit,
+		NormalizeCalls:    defaultNormalizeCalls,
+		NormalizeDuration: defaultNormalizeCalls,
 	}
 }