Removed internal/metrics/expvar

Signed-off-by: Joeyyy09 <imt_2021063@iiitm.ac.in>

cmd/agent/main.go

@@ -31,7 +31,6 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/internal/docs"
 	"github.com/jaegertracing/jaeger/cmd/internal/flags"
 	"github.com/jaegertracing/jaeger/cmd/internal/status"
-	"github.com/jaegertracing/jaeger/internal/metrics/expvar"
 	"github.com/jaegertracing/jaeger/internal/metrics/fork"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
@@ -62,9 +61,9 @@ func main() {
 				Namespace(metrics.NSOptions{Name: "jaeger"}).
 				Namespace(metrics.NSOptions{Name: "agent"})
 			mFactory := fork.New("internal",
-				expvar.NewFactory(10), // backend for internal opts
-				baseFactory)
-			version.NewInfoMetrics(mFactory)
+				baseFactory,
+				baseFactory)  // No expvar functionality
+			version.NewInfoMetrics(mFactory) 
 
 			rOpts := new(reporter.Options).InitFromViper(v, logger)
 			grpcBuilder, err := grpc.NewConnBuilder().InitFromViper(v)

cmd/all-in-one/main.go

@@ -40,8 +40,7 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/internal/status"
 	queryApp "github.com/jaegertracing/jaeger/cmd/query/app"
 	"github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
-	"github.com/jaegertracing/jaeger/internal/metrics/expvar"
-	"github.com/jaegertracing/jaeger/internal/metrics/fork"
+	"github.com/jaegertracing/jaeger/internal/metrics/prometheus"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/jtracer"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
@@ -96,9 +95,7 @@ by default uses only in-memory database.`,
 				return err
 			}
 			logger := svc.Logger // shortcut
-			baseFactory := fork.New("internal",
-				expvar.NewFactory(10), // backend for internal opts
-				svc.MetricsFactory.Namespace(metrics.NSOptions{Name: "jaeger"}))
+			baseFactory := prometheus.New() // Use Prometheus as the default backend metric
 			version.NewInfoMetrics(baseFactory)
 			agentMetricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "agent"})
 			collectorMetricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "collector"})

cmd/collector/main.go

@@ -33,8 +33,6 @@ import (
 	cmdFlags "github.com/jaegertracing/jaeger/cmd/internal/flags"
 	"github.com/jaegertracing/jaeger/cmd/internal/printconfig"
 	"github.com/jaegertracing/jaeger/cmd/internal/status"
-	"github.com/jaegertracing/jaeger/internal/metrics/expvar"
-	"github.com/jaegertracing/jaeger/internal/metrics/fork"
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/tenancy"
@@ -73,9 +71,7 @@ func main() {
 			}
 			logger := svc.Logger // shortcut
 			baseFactory := svc.MetricsFactory.Namespace(metrics.NSOptions{Name: "jaeger"})
-			metricsFactory := fork.New("internal",
-				expvar.NewFactory(10), // backend for internal opts
-				baseFactory.Namespace(metrics.NSOptions{Name: "collector"}))
+			metricsFactory := baseFactory // No expvar functionality
 			version.NewInfoMetrics(metricsFactory)
 
 			storageFactory.InitFromViper(v, logger)

examples/hotrod/cmd/flags.go

@@ -40,6 +40,8 @@ var (
 
 // used by root command
 func addFlags(cmd *cobra.Command) {
+	cmd.PersistentFlags().StringVarP(&metricsBackend, "metrics", "m", "prometheus", "Metrics backend to use (prometheus)")
+
 	cmd.PersistentFlags().StringVarP(&otelExporter, "otel-exporter", "x", "otlp", "OpenTelemetry exporter (otlp|stdout)")
 
 	cmd.PersistentFlags().DurationVarP(&fixDBConnDelay, "fix-db-query-delay", "D", 300*time.Millisecond, "Average latency of MySQL DB query")

examples/hotrod/cmd/root.go

@@ -70,8 +70,14 @@ func onInitialize() {
 	jaegerclientenv2otel.MapJaegerToOtelEnvVars(logger)
 
 	// Only configure Prometheus as the metrics backend
-	metricsFactory = prometheus.New().Namespace(metrics.NSOptions{Name: "hotrod", Tags: nil})
-	logger.Info("Using Prometheus as the metrics backend")
+	switch metricsBackend {
+	case "prometheus":
+    	metricsFactory = prometheus.New().Namespace(metrics.NSOptions{Name: "hotrod", Tags: nil})
+    	logger.Info("Using Prometheus as metrics backend")
+	default:
+    	logger.Fatal("Unsupported metrics backend " + metricsBackend)
+	}
+
 	if config.MySQLGetDelay != fixDBConnDelay {
 		logger.Info("fix: overriding MySQL query delay", zap.Duration("old", config.MySQLGetDelay), zap.Duration("new", fixDBConnDelay))
 		config.MySQLGetDelay = fixDBConnDelay