RPC request handler

Author: alpinskiy

cmd/statshouse-api/statshouse-api.go

@@ -22,13 +22,11 @@ import (
 
 	"github.com/cloudflare/tableflip"
 	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
 	"github.com/spf13/pflag"
 
 	"github.com/vkcom/statshouse-go"
 	"github.com/vkcom/statshouse/internal/api"
 	"github.com/vkcom/statshouse/internal/data_model/gen2/tlmetadata"
-	"github.com/vkcom/statshouse/internal/data_model/gen2/tlstatshouseApi"
 	"github.com/vkcom/statshouse/internal/format"
 	"github.com/vkcom/statshouse/internal/pcache"
 	"github.com/vkcom/statshouse/internal/util"
@@ -358,9 +356,9 @@ func run(argv args, cfg *api.Config, vkuthPublicKeys map[string][]byte) error {
 	}
 	defer func() { _ = f.Close() }()
 
-	m := api.Router{Handler: f, Router: mux.NewRouter()}
+	m := api.NewHTTPRouter(f)
 	a := m.PathPrefix(api.RoutePrefix).Subrouter()
-	a.Path("/"+api.EndpointLegacyRedirect).Methods("GET", "HEAD", "POST").HandlerFunc(api.HandleLegacyRedirect)
+	a.Router.Path("/"+api.EndpointLegacyRedirect).Methods("GET", "HEAD", "POST").HandlerFunc(f.HandleLegacyRedirect)
 	a.Path("/" + api.EndpointMetricList).Methods("GET").HandlerFunc(api.HandleGetMetricsList)
 	a.Path("/" + api.EndpointMetricTagValues).Methods("GET").HandlerFunc(api.HandleGetMetricTagValues)
 	a.Path("/" + api.EndpointMetric).Methods("GET").HandlerFunc(api.HandleGetMetric)
@@ -466,13 +464,7 @@ func run(argv args, cfg *api.Config, vkuthPublicKeys map[string][]byte) error {
 		c.Value(format.BuiltinMetricNameHeartbeatVersion, heartbeatTags, uptime)
 	}))
 
-	hr := api.NewRpcHandler(f, brs, jwtHelper, argv.HandlerOptions)
-	handlerRPC := &tlstatshouseApi.Handler{
-		GetChunk:         hr.GetChunk,
-		RawGetQuery:      hr.RawGetQuery,
-		ReleaseChunks:    hr.ReleaseChunks,
-		RawGetQueryPoint: hr.RawGetQueryPoint,
-	}
+	handlerRPC := api.NewRPCRouter(f, brs)
 	var hijackListener *rpc.HijackListener
 	metrics := util.NewRPCServerMetrics("statshouse_api")
 	srv := rpc.NewServer(

internal/api/access.go

@@ -17,19 +17,18 @@ import (
 )
 
 type accessInfo struct {
-	user                 string
-	service              bool
-	insecureMode         bool // full access to everything; can not be obtained from bits
-	protectedPrefixes    []string
-	bitAdmin             bool
-	bitDeveloper         bool
-	bitViewDefault       bool
-	bitEditDefault       bool
-	bitViewPrefix        map[string]bool
-	bitEditPrefix        map[string]bool
-	bitViewMetric        map[string]bool
-	bitEditMetric        map[string]bool
-	skipBadgesValidation bool
+	user              string
+	service           bool
+	insecureMode      bool // full access to everything; can not be obtained from bits
+	protectedPrefixes []string
+	bitAdmin          bool
+	bitDeveloper      bool
+	bitViewDefault    bool
+	bitEditDefault    bool
+	bitViewPrefix     map[string]bool
+	bitEditPrefix     map[string]bool
+	bitViewMetric     map[string]bool
+	bitEditMetric     map[string]bool
 }
 
 func parseAccessToken(jwtHelper *vkuth.JWTHelper,
@@ -122,9 +121,6 @@ func (ai *accessInfo) protectedMetric(name string) bool {
 }
 
 func (ai *accessInfo) CanViewMetricName(name string) bool {
-	if name == format.BuiltinMetricNameBadges && ai.skipBadgesValidation {
-		return true
-	}
 	if ai.insecureMode {
 		return true
 	}

internal/api/context.go

@@ -16,6 +16,7 @@ import (
 
 	"github.com/vkcom/statshouse-go"
 	"github.com/vkcom/statshouse/internal/format"
+	"github.com/vkcom/statshouse/internal/util"
 	"github.com/vkcom/statshouse/internal/vkgo/rpc"
 	"github.com/vkcom/statshouse/internal/vkgo/srvfunc"
 )
@@ -63,16 +64,6 @@ type endpointStat struct {
 	timings   ServerTimingHeader
 }
 
-func newEndpointStatRPC(endpoint, method string) *endpointStat {
-	return &endpointStat{
-		timestamp:  time.Now(),
-		endpoint:   endpoint,
-		protocol:   format.TagValueIDRPC,
-		method:     method,
-		dataFormat: "TL",
-	}
-}
-
 func (es *endpointStat) reportServiceTime(code int, err error) {
 	if len(es.metric) != 0 {
 		statshouse.Count(
@@ -124,6 +115,18 @@ func (es *endpointStat) report(code int, metric string) {
 	statshouse.Value(metric, t, v)
 }
 
+func (es *endpointStat) reportQueryKind(isFast, isLight, isHardware bool) {
+	es.laneMutex.Lock()
+	defer es.laneMutex.Unlock()
+	if len(es.lane) == 0 {
+		es.lane = strconv.Itoa(util.QueryKind(isFast, isLight, isHardware))
+	}
+}
+
+func (es *endpointStat) reportTiming(name string, dur time.Duration) {
+	es.timings.Report(name, dur)
+}
+
 func getStatTokenName(user string) string {
 	if strings.Contains(user, "@") {
 		return userTokenName