Set Prometheus as the only metrics backend, removing others.

Signed-off-by: Joeyyy09 <imt_2021063@iiitm.ac.in>
jaegertracing · May 10, 2024 · 0163c62 · 0163c62
1 parent 5ddcaa9
commit 0163c62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/examples/hotrod/cmd/flags.go b/examples/hotrod/cmd/flags.go
@@ -38,11 +38,8 @@ var (
 	jaegerUI string
 )
 
-const expvarDepr = "(deprecated, will be removed after 2024-01-01 or in release v1.53.0, whichever is later) "
-
 // used by root command
 func addFlags(cmd *cobra.Command) {
-	cmd.PersistentFlags().StringVarP(&metricsBackend, "metrics", "m", "prometheus", expvarDepr+"Metrics backend (expvar|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")
@@ -60,4 +57,6 @@ func addFlags(cmd *cobra.Command) {
 	cmd.PersistentFlags().StringVarP(&jaegerUI, "jaeger-ui", "j", "http://localhost:16686", "Address of Jaeger UI to create [find trace] links")
 
 	cmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Enables debug logging")
+	// Warning about expvar deprecation
+	logger.Warn("The 'metrics' CLI flag and expvar metrics backend are deprecated and will be removed. Prometheus will be used as the default and only metrics backend.")
 }
diff --git a/examples/hotrod/cmd/root.go b/examples/hotrod/cmd/root.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/jaegertracing/jaeger/examples/hotrod/services/config"
 	"github.com/jaegertracing/jaeger/internal/jaegerclientenv2otel"
-	"github.com/jaegertracing/jaeger/internal/metrics/expvar"
 	"github.com/jaegertracing/jaeger/internal/metrics/prometheus"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 )
@@ -70,16 +69,9 @@ func onInitialize() {
 
 	jaegerclientenv2otel.MapJaegerToOtelEnvVars(logger)
 
-	switch metricsBackend {
-	case "expvar":
-		metricsFactory = expvar.NewFactory(10) // 10 buckets for histograms
-		logger.Info("*** Using expvar as metrics backend " + expvarDepr)
-	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)
-	}
+	// 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")
 	if config.MySQLGetDelay != fixDBConnDelay {
 		logger.Info("fix: overriding MySQL query delay", zap.Duration("old", config.MySQLGetDelay), zap.Duration("new", fixDBConnDelay))
 		config.MySQLGetDelay = fixDBConnDelay