diff options
| author | Shelikhoo <xiaokangwang@outlook.com> | 2022-09-23 12:44:02 +0100 |
|---|---|---|
| committer | Shelikhoo <xiaokangwang@outlook.com> | 2022-09-23 13:08:13 +0100 |
| commit | 36f03dfd4483922b3e7400dedc71df9cf2f30b6b (patch) | |
| tree | 548e9abdee3787e336564b4d4f7608cc5da0faeb | |
| parent | 03b2b56f879879bb379cff8d7352ace1102d8811 (diff) | |
| download | snowflake-2.3.1.tar.gz snowflake-2.3.1.zip | |
Record proxy type for proxy relay statsv2.3.1
| -rw-r--r-- | broker/ipc.go | 6 | ||||
| -rw-r--r-- | broker/metrics.go | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/broker/ipc.go b/broker/ipc.go index 6b8971f..14db4d8 100644 --- a/broker/ipc.go +++ b/broker/ipc.go @@ -75,19 +75,19 @@ func (i *IPC) ProxyPolls(arg messages.Arg, response *[]byte) error { if !relayPatternSupported { i.ctx.metrics.lock.Lock() i.ctx.metrics.proxyPollWithoutRelayURLExtension++ - i.ctx.metrics.promMetrics.ProxyPollWithoutRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType}).Inc() + i.ctx.metrics.promMetrics.ProxyPollWithoutRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType, "type": proxyType}).Inc() i.ctx.metrics.lock.Unlock() } else { i.ctx.metrics.lock.Lock() i.ctx.metrics.proxyPollWithRelayURLExtension++ - i.ctx.metrics.promMetrics.ProxyPollWithRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType}).Inc() + i.ctx.metrics.promMetrics.ProxyPollWithRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType, "type": proxyType}).Inc() i.ctx.metrics.lock.Unlock() } if !i.ctx.CheckProxyRelayPattern(relayPattern, !relayPatternSupported) { i.ctx.metrics.lock.Lock() i.ctx.metrics.proxyPollRejectedWithRelayURLExtension++ - i.ctx.metrics.promMetrics.ProxyPollRejectedForRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType}).Inc() + i.ctx.metrics.promMetrics.ProxyPollRejectedForRelayURLExtensionTotal.With(prometheus.Labels{"nat": natType, "type": proxyType}).Inc() i.ctx.metrics.lock.Unlock() log.Printf("bad request: rejected relay pattern from proxy = %v", messages.ErrBadRequest) diff --git a/broker/metrics.go b/broker/metrics.go index cd1ca37..77b7675 100644 --- a/broker/metrics.go +++ b/broker/metrics.go @@ -286,7 +286,7 @@ func initPrometheus() *PromMetrics { Name: "rounded_proxy_poll_with_relay_url_extension_total", Help: "The number of snowflake proxy polls with Relay URL Extension, rounded up to a multiple of 8", }, - []string{"nat"}, + []string{"nat", "type"}, ) promMetrics.ProxyPollWithoutRelayURLExtensionTotal = NewRoundedCounterVec( @@ -295,7 +295,7 @@ func initPrometheus() *PromMetrics { Name: "rounded_proxy_poll_without_relay_url_extension_total", Help: "The number of snowflake proxy polls without Relay URL Extension, rounded up to a multiple of 8", }, - []string{"nat"}, + []string{"nat", "type"}, ) promMetrics.ProxyPollRejectedForRelayURLExtensionTotal = NewRoundedCounterVec( @@ -304,7 +304,7 @@ func initPrometheus() *PromMetrics { Name: "rounded_proxy_poll_rejected_relay_url_extension_total", Help: "The number of snowflake proxy polls rejected by Relay URL Extension, rounded up to a multiple of 8", }, - []string{"nat"}, + []string{"nat", "type"}, ) promMetrics.ClientPollTotal = NewRoundedCounterVec( |