chore: set telemetry to main (#23688)

telemetry/metrics.go

@@ -3,6 +3,7 @@ package telemetry
 import (
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"time"
@@ -23,6 +24,11 @@ func IsTelemetryEnabled() bool {
 	return globalTelemetryEnabled
 }
 
+// EnableTelemetry allows for the global telemetry enabled state to be set.
+func EnableTelemetry() {
+	globalTelemetryEnabled = true
+}
+
 // globalLabels defines the set of global labels that will be applied to all
 // metrics emitted using the telemetry package function wrappers.
 var globalLabels = []metrics.Label{}
@@ -192,7 +198,7 @@ func (m *Metrics) Gather(format string) (GatherResponse, error) {
 // If Prometheus metrics are not enabled, it returns an error.
 func (m *Metrics) gatherPrometheus() (GatherResponse, error) {
 	if !m.prometheusEnabled {
-		return GatherResponse{}, fmt.Errorf("prometheus metrics are not enabled")
+		return GatherResponse{}, errors.New("prometheus metrics are not enabled")
 	}
 
 	metricsFamilies, err := prometheus.DefaultGatherer.Gather()
@@ -218,7 +224,7 @@ func (m *Metrics) gatherPrometheus() (GatherResponse, error) {
 func (m *Metrics) gatherGeneric() (GatherResponse, error) {
 	gm, ok := m.sink.(DisplayableSink)
 	if !ok {
-		return GatherResponse{}, fmt.Errorf("non in-memory metrics sink does not support generic format")
+		return GatherResponse{}, errors.New("non in-memory metrics sink does not support generic format")
 	}
 
 	summary, err := gm.DisplayMetrics(nil, nil)

telemetry/metrics_test.go

@@ -57,7 +57,7 @@ func TestMetrics_Prom(t *testing.T) {
 
 	gr, err := m.Gather(FormatPrometheus)
 	require.NoError(t, err)
-	require.Equal(t, gr.ContentType, ContentTypeText)
+	require.Equal(t, gr.ContentType, string(ContentTypeText))
 
 	require.True(t, strings.Contains(string(gr.Metrics), "test_dummy_counter 30"))
 }

telemetry/wrapper.go

@@ -8,11 +8,9 @@ import (
 
 // Common metric key constants
 const (
-	MetricKeyBeginBlocker       = "begin_blocker"
-	MetricKeyEndBlocker         = "end_blocker"
-	MetricKeyPrepareCheckStater = "prepare_check_stater"
-	MetricKeyPrecommiter        = "precommiter"
-	MetricLabelNameModule       = "module"
+	MetricKeyBeginBlocker = "begin_blocker"
+	MetricKeyEndBlocker   = "end_blocker"
+	MetricLabelNameModule = "module"
 )
 
 // NewLabel creates a new instance of Label with name and value
@@ -90,7 +88,7 @@ func SetGaugeWithLabels(keys []string, val float32, labels []metrics.Label) {
 	metrics.SetGaugeWithLabels(keys, val, append(labels, globalLabels...))
 }
 
-// MeasureSince provides a wrapper functionality for emitting a a time measure
+// MeasureSince provides a wrapper functionality for emitting a time measure
 // metric with global labels (if any).
 func MeasureSince(start time.Time, keys ...string) {
 	if !IsTelemetryEnabled() {