Verified Commit 36f03dfd authored by shelikhoo's avatar shelikhoo
Browse files

Record proxy type for proxy relay stats

parent 03b2b56f

broker/ipc.go

+3 −3
Original line number Diff line number Diff line
@@ -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)

broker/metrics.go

+3 −3
Original line number Diff line number Diff line
@@ -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(