Remove Prometheus stat reporter from queue-proxy

cmd/queue/main.go

@@ -140,14 +140,6 @@ func main() {
  // Report stats on Go memory usage every 30 seconds.
  metrics.MemStatsOrDie(ctx)
 
- // Setup reporters and processes to handle stat reporting.
- promStatReporter, err := queue.NewPrometheusStatsReporter(
- env.ServingNamespace, env.ServingConfiguration, env.ServingRevision,
- env.ServingPod, reportingPeriod)
- if err != nil {
- logger.Fatalw("Failed to create stats reporter", zap.Error(err))
- }
-
  protoStatReporter := queue.NewProtobufStatsReporter(env.ServingPod, reportingPeriod)
 
  reportTicker := time.NewTicker(reportingPeriod)
@@ -157,7 +149,6 @@ func main() {
  go func() {
  for now := range reportTicker.C {
  stat := stats.Report(now)
- promStatReporter.Report(stat)
  protoStatReporter.Report(stat)
  }
  }()
@@ -181,7 +172,7 @@ func main() {
  mainServer, drain := buildServer(ctx, env, probe, stats, logger, concurrencyendpoint, false)
  httpServers := map[string]*http.Server{
  "main": mainServer,
- "metrics": buildMetricsServer(promStatReporter, protoStatReporter),
+ "metrics": buildMetricsServer(protoStatReporter),
  "admin": buildAdminServer(logger, drain),
  }
  if env.EnableProfiling {
@@ -418,9 +409,9 @@ func buildAdminServer(logger *zap.SugaredLogger, drain func()) *http.Server {
  }
 }
 
-func buildMetricsServer(promStatReporter *queue.PrometheusStatsReporter, protobufStatReporter *queue.ProtobufStatsReporter) *http.Server {
+func buildMetricsServer(protobufStatReporter *queue.ProtobufStatsReporter) *http.Server {
  metricsMux := http.NewServeMux()
- metricsMux.Handle("/metrics", queue.NewStatsHandler(promStatReporter, protobufStatReporter))
+ metricsMux.Handle("/metrics", queue.NewStatsHandler(protobufStatReporter))
  return &http.Server{
  Addr: ":" + strconv.Itoa(networking.AutoscalingQueueMetricsPort),
  Handler: metricsMux,

go.mod

@@ -14,8 +14,6 @@ require (
  github.com/gorilla/websocket v1.4.2
  github.com/hashicorp/golang-lru v0.5.4
  github.com/kelseyhightower/envconfig v1.4.0
- github.com/prometheus/client_golang v1.11.1
- github.com/prometheus/client_model v0.2.0
  github.com/tsenart/vegeta/v12 v12.8.4
  go.opencensus.io v0.23.0
  go.uber.org/atomic v1.9.0
@@ -121,6 +119,8 @@ require (
  github.com/opencontainers/image-spec v1.0.3-0.20220114050600-8b9d41f48198 // indirect
  github.com/openzipkin/zipkin-go v0.3.0 // indirect
  github.com/pkg/errors v0.9.1 // indirect
+ github.com/prometheus/client_golang v1.11.1 // indirect
+ github.com/prometheus/client_model v0.2.0 // indirect
  github.com/prometheus/common v0.32.1 // indirect
  github.com/prometheus/procfs v0.7.3 // indirect
  github.com/prometheus/statsd_exporter v0.21.0 // indirect

pkg/queue/concurrency_state_test.go

@@ -352,13 +352,6 @@ func BenchmarkConcurrencyStateProxyHandler(b *testing.B) {
  baseHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
  stats := netstats.NewRequestStats(time.Now())
 
- promStatReporter, err := NewPrometheusStatsReporter(
- "ns", "testksvc", "testksvc",
- "pod", reportingPeriod)
- if err != nil {
- b.Fatal("Failed to create stats reporter:", err)
- }
-
  req := httptest.NewRequest(http.MethodPost, "http:https://example.com", nil)
  req.Header.Set(netheader.OriginalHostKey, wantHost)
 
@@ -387,11 +380,6 @@ func BenchmarkConcurrencyStateProxyHandler(b *testing.B) {
  for _, tc := range tests {
  reportTicker := time.NewTicker(tc.reportPeriod)
 
- go func() {
- for now := range reportTicker.C {
- promStatReporter.Report(stats.Report(now))
- }
- }()
  pause := func(*zap.SugaredLogger) {}
  resume := func(*zap.SugaredLogger) {}
 

pkg/queue/handler_test.go

@@ -34,8 +34,7 @@ import (
 )
 
 const (
- wantHost = "a-better-host.com"
- reportingPeriod = time.Second
+ wantHost = "a-better-host.com"
 )
 
 func TestHandlerBreakerQueueFull(t *testing.T) {
@@ -235,13 +234,6 @@ func BenchmarkProxyHandler(b *testing.B) {
  baseHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})
  stats := netstats.NewRequestStats(time.Now())
 
- promStatReporter, err := NewPrometheusStatsReporter(
- "ns", "testksvc", "testksvc",
- "pod", reportingPeriod)
- if err != nil {
- b.Fatal("Failed to create stats reporter:", err)
- }
-
  req := httptest.NewRequest(http.MethodPost, "http:https://example.com", nil)
  req.Header.Set(netheader.OriginalHostKey, wantHost)
 
@@ -270,12 +262,6 @@ func BenchmarkProxyHandler(b *testing.B) {
  for _, tc := range tests {
  reportTicker := time.NewTicker(tc.reportPeriod)
 
- go func() {
- for now := range reportTicker.C {
- promStatReporter.Report(stats.Report(now))
- }
- }()
-
  h := ProxyHandler(tc.breaker, stats, true /*tracingEnabled*/, baseHandler)
  b.Run("sequential-"+tc.label, func(b *testing.B) {
  resp := httptest.NewRecorder()