From e15bc9dcd1d5e413a3fa2d7820cc59871337a1c1 Mon Sep 17 00:00:00 2001
From: David Boslee <david@goteleport.com>
Date: Wed, 6 Jul 2022 13:33:36 -0600
Subject: [PATCH] Fix proxy peering message size buckets

This changes the message size buckets from the default of .005-10 to
32-65536.
---
 lib/proxy/clientmetrics.go | 2 ++
 lib/proxy/reporter.go      | 3 +++
 lib/proxy/servermetrics.go | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/lib/proxy/clientmetrics.go b/lib/proxy/clientmetrics.go
index 8500300057cc0..5c7265b9ae2b4 100644
--- a/lib/proxy/clientmetrics.go
+++ b/lib/proxy/clientmetrics.go
@@ -100,6 +100,7 @@ func newClientMetrics() (*clientMetrics, error) {
 				Subsystem: "client",
 				Name:      "message_sent_size",
 				Help:      "Size of messages sent by the client.",
+				Buckets:   messageByteBuckets,
 			},
 			[]string{"service", "handler"},
 		),
@@ -110,6 +111,7 @@ func newClientMetrics() (*clientMetrics, error) {
 				Subsystem: "client",
 				Name:      "message_received_size",
 				Help:      "Size of messages received by the client.",
+				Buckets:   messageByteBuckets,
 			},
 			[]string{"service", "handler"},
 		),
diff --git a/lib/proxy/reporter.go b/lib/proxy/reporter.go
index 8da0d11f5e981..a6401f88ae11d 100644
--- a/lib/proxy/reporter.go
+++ b/lib/proxy/reporter.go
@@ -20,6 +20,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
+// messageByteBuckets creates buckets ranging from 32-65536 bytes.
+var messageByteBuckets = prometheus.ExponentialBuckets(32, 2, 12)
+
 type metrics interface {
 	getConnectionGauge() *prometheus.GaugeVec
 	getRPCGauge() *prometheus.GaugeVec
diff --git a/lib/proxy/servermetrics.go b/lib/proxy/servermetrics.go
index a5f0fc986a75e..f21acf9cd9210 100644
--- a/lib/proxy/servermetrics.go
+++ b/lib/proxy/servermetrics.go
@@ -80,6 +80,7 @@ func newServerMetrics() (*serverMetrics, error) {
 				Subsystem: "server",
 				Name:      "message_sent_size",
 				Help:      "Size of messages sent by the server.",
+				Buckets:   messageByteBuckets,
 			},
 			[]string{"service", "handler"},
 		),
@@ -90,6 +91,7 @@ func newServerMetrics() (*serverMetrics, error) {
 				Subsystem: "server",
 				Name:      "message_received_size",
 				Help:      "Size of messages received by the server.",
+				Buckets:   messageByteBuckets,
 			},
 			[]string{"service", "handler"},
 		),