diff --git a/metrics/doc.go b/metrics/doc.go deleted file mode 100644 index ac0a32c..0000000 --- a/metrics/doc.go +++ /dev/null @@ -1,6 +0,0 @@ -// Package metrics provides constructors for Prometheus request metrics -// registered with the default registry via promauto. -// -// All constructors are deprecated in favor of OpenTelemetry instruments -// created from [github.com/foomo/keel/telemetry.Meter]. -package metrics diff --git a/metrics/metrics.go b/metrics/metrics.go deleted file mode 100644 index 860a3e4..0000000 --- a/metrics/metrics.go +++ /dev/null @@ -1,72 +0,0 @@ -package metrics - -import ( - "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promauto" -) - -// NewRequestSizeSummaryVec registers and returns a summary vector named -// __request_size_bytes that tracks request sizes, -// partitioned by labelNames. It panics if the metric is already registered. -// -// Deprecated: Use [github.com/foomo/keel/telemetry.Meter] instead. -func NewRequestSizeSummaryVec(namespace, subsystem string, labelNames []string) *prometheus.SummaryVec { - return promauto.NewSummaryVec( - prometheus.SummaryOpts{ - Namespace: namespace, - Subsystem: subsystem, - Name: "request_size_bytes", - Help: "Tracks the size of HTTP requests.", - }, - labelNames, - ) -} - -// NewResponseSizeSummaryVec registers and returns a summary vector named -// __response_size_bytes that tracks response sizes, -// partitioned by labelNames. It panics if the metric is already registered. -// -// Deprecated: Use [github.com/foomo/keel/telemetry.Meter] instead. -func NewResponseSizeSummaryVec(namespace, subsystem string, labelNames []string) *prometheus.SummaryVec { - return promauto.NewSummaryVec( - prometheus.SummaryOpts{ - Namespace: namespace, - Subsystem: subsystem, - Name: "response_size_bytes", - Help: "Tracks the size of responses.", - }, - labelNames, - ) -} - -// NewRequestsCounterVec registers and returns a counter vector named -// __requests_total that counts requests, partitioned -// by labelNames. It panics if the metric is already registered. -// -// Deprecated: Use [github.com/foomo/keel/telemetry.Meter] instead. -func NewRequestsCounterVec(namespace, subsystem string, labelNames []string) *prometheus.CounterVec { - return promauto.NewCounterVec( - prometheus.CounterOpts{ - Namespace: namespace, - Subsystem: subsystem, - Name: "requests_total", - Help: "Tracks the number of requests.", - }, - labelNames, - ) -} - -// NewRequestDurationHistogram registers and returns a histogram named -// __request_duration_seconds with 50 exponential -// buckets starting at 0.1ms. It panics if the metric is already registered. -// -// Deprecated: Use [github.com/foomo/keel/telemetry.Meter] instead. -func NewRequestDurationHistogram(namespace, subsystem string) prometheus.Histogram { - return promauto.NewHistogram(prometheus.HistogramOpts{ - Namespace: namespace, - Subsystem: subsystem, - Name: "request_duration_seconds", - Help: "The latency of the requests.", - Buckets: prometheus.ExponentialBuckets(.0001, 2, 50), - }) -} diff --git a/metrics/metrics_http.go b/metrics/metrics_http.go deleted file mode 100644 index 1b32d03..0000000 --- a/metrics/metrics_http.go +++ /dev/null @@ -1,37 +0,0 @@ -package metrics - -import ( - "github.com/prometheus/client_golang/prometheus" -) - -// NewHTTPRequestSizeSummaryVec returns [NewRequestSizeSummaryVec] with -// subsystem "http" and labels "method" and "code". -// -// Deprecated: Use otelhttp instrumentation instead. -func NewHTTPRequestSizeSummaryVec(namespace string) *prometheus.SummaryVec { - return NewRequestSizeSummaryVec(namespace, "http", []string{"method", "code"}) -} - -// NewHTTPResponseSizeSummaryVec returns [NewResponseSizeSummaryVec] with -// subsystem "http" and labels "method" and "code". -// -// Deprecated: Use otelhttp instrumentation instead. -func NewHTTPResponseSizeSummaryVec(namespace string) *prometheus.SummaryVec { - return NewResponseSizeSummaryVec(namespace, "http", []string{"method", "code"}) -} - -// NewHTTPRequestsCounterVec returns [NewRequestsCounterVec] with -// subsystem "http" and labels "method" and "code". -// -// Deprecated: Use otelhttp instrumentation instead. -func NewHTTPRequestsCounterVec(namespace string) *prometheus.CounterVec { - return NewRequestsCounterVec(namespace, "http", []string{"method", "code"}) -} - -// NewHTTPRequestDurationHistogram returns [NewRequestDurationHistogram] -// with subsystem "http". -// -// Deprecated: Use otelhttp instrumentation instead. -func NewHTTPRequestDurationHistogram(namespace string) prometheus.Histogram { - return NewRequestDurationHistogram(namespace, "http") -} diff --git a/server.go b/server.go index e78aaca..1a54d7d 100644 --- a/server.go +++ b/server.go @@ -21,7 +21,6 @@ import ( internalotel "github.com/foomo/keel/internal/otel" "github.com/foomo/keel/log" "github.com/foomo/keel/markdown" - "github.com/foomo/keel/metrics" keelhttp "github.com/foomo/keel/net/http" "github.com/foomo/keel/service" "github.com/foomo/keel/telemetry" @@ -165,7 +164,7 @@ func NewServer(opts ...Option) *Server { interfaces.ReadmeFunc(env.Readme), interfaces.ReadmeFunc(config.Readme), inst, - interfaces.ReadmeFunc(metrics.Readme), + interfaces.ReadmeFunc(telemetry.Readme), ) // start init services diff --git a/metrics/readme.go b/telemetry/readme.go similarity index 97% rename from metrics/readme.go rename to telemetry/readme.go index e8551ce..e74c09c 100644 --- a/metrics/readme.go +++ b/telemetry/readme.go @@ -1,4 +1,4 @@ -package metrics +package telemetry import ( "github.com/foomo/keel/markdown"