Resolve conflicts

Signed-off-by: FlamingSaint <[email protected]>
jaegertracing · Jul 8, 2024 · 44f2627 · 44f2627
1 parent 118c8fb
commit 44f2627
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/cmd/jaeger/internal/extension/jaegerstorage/config.go b/cmd/jaeger/internal/extension/jaegerstorage/config.go
@@ -109,9 +109,7 @@ func (cfg *MetricBackends) Unmarshal(conf *confmap.Conf) error {
 	// apply defaults
 	if conf.IsSet("prometheus") {
 		cfg.Prometheus = &prometheus.Options{
-			Primary: prometheus.NamespaceConfig{
-				Configuration: prometheus.DefaultConfig(),
-			},
+			Configuration: prometheus.DefaultConfig(),
 		}
 		// TODO: Need to implement this, Need to add prometheus as a v2 storage ??
 	}

diff --git a/plugin/metrics/prometheus/options.go b/plugin/metrics/prometheus/options.go
@@ -68,7 +68,7 @@ func DefaultConfig() config.Configuration {
 }
 
 // NewOptions creates a new Options struct.
-func NewOptions(primaryNamespace string) *Options {
+func NewOptions() *Options {
 	defaultConfig := DefaultConfig()
 
 	return &Options{