From 771542dde2b71e7205ddc9fb1fe464b21934f86e Mon Sep 17 00:00:00 2001 From: Alex Leong Date: Wed, 16 Jan 2019 14:13:48 -0800 Subject: [PATCH] Add support for retries (#2038) --- Gopkg.lock | 5 +- Gopkg.toml | 2 +- cli/Dockerfile-bin | 2 +- cli/cmd/root.go | 15 +- cli/cmd/routes.go | 129 +++-- cli/cmd/routes_test.go | 2 +- cli/cmd/stat.go | 6 +- controller/Dockerfile | 2 +- controller/api/proxy/profile_listener.go | 14 +- controller/api/proxy/profile_listener_test.go | 4 + controller/api/public/prometheus.go | 43 +- controller/api/public/stat_summary.go | 2 +- controller/api/public/test_helper.go | 5 +- controller/api/public/top_routes.go | 19 +- controller/api/public/top_routes_test.go | 10 +- .../gen/apis/serviceprofile/v1alpha1/types.go | 12 +- .../v1alpha1/zz_generated.deepcopy.go | 21 + controller/gen/public/public.pb.go | 468 +++++++++--------- pkg/profiles/profiles.go | 47 +- pkg/profiles/template.go | 24 + proto/public.proto | 2 + proxy-init/Dockerfile | 2 +- web/Dockerfile | 2 +- 23 files changed, 521 insertions(+), 317 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 6221fb6199892..8fa58249c8cc4 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -266,7 +266,7 @@ version = "v1.1" [[projects]] - digest = "1:269d1fe034b09288b2328b197baceb4f23873fc09bb0e81a774620cdb020bfe9" + digest = "1:4e1a388c562b46c42eaeefcf35ae8858df7aa6f2bda261ca1d36aa40d10f62e4" name = "github.com/linkerd/linkerd2-proxy-api" packages = [ "go/destination", @@ -275,8 +275,7 @@ "go/tap", ] pruneopts = "" - revision = "bb4861389d504dfea7b616df8cf6329b1c6f5e50" - version = "v0.1.4" + revision = "1ad70188f9a6d94e2865413713a50390456fa6b6" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index 282905d521f1e..f849406530879 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -10,7 +10,7 @@ required = [ [[constraint]] name = "github.com/linkerd/linkerd2-proxy-api" - version = "v0.1.4" + revision = "1ad70188f9a6d94e2865413713a50390456fa6b6" [[constraint]] name = "google.golang.org/grpc" diff --git a/cli/Dockerfile-bin b/cli/Dockerfile-bin index e522a865f3897..78e3332a964bc 100644 --- a/cli/Dockerfile-bin +++ b/cli/Dockerfile-bin @@ -1,5 +1,5 @@ ## compile binaries -FROM gcr.io/linkerd-io/go-deps:f95a60fe as golang +FROM gcr.io/linkerd-io/go-deps:18d4ad09 as golang WORKDIR /go/src/github.com/linkerd/linkerd2 COPY cli cli COPY controller/k8s controller/k8s diff --git a/cli/cmd/root.go b/cli/cmd/root.go index 6a084072aec2b..e51bbba678771 100644 --- a/cli/cmd/root.go +++ b/cli/cmd/root.go @@ -173,21 +173,19 @@ func (o *statOptionsBase) validateOutputFormat() error { func renderStats(buffer bytes.Buffer, options *statOptionsBase) string { var out string switch options.outputFormat { - case "table", "": + case "json": + out = string(buffer.Bytes()) + default: // strip left padding on the first column out = string(buffer.Bytes()[padding:]) out = strings.Replace(out, "\n"+strings.Repeat(" ", padding), "\n", -1) - case "json": - out = string(buffer.Bytes()) } return out } // getRequestRate calculates request rate from Public API BasicStats. -func getRequestRate(stats *pb.BasicStats, timeWindow string) float64 { - success := stats.SuccessCount - failure := stats.FailureCount +func getRequestRate(success, failure uint64, timeWindow string) float64 { windowLength, err := time.ParseDuration(timeWindow) if err != nil { log.Error(err.Error()) @@ -197,10 +195,7 @@ func getRequestRate(stats *pb.BasicStats, timeWindow string) float64 { } // getSuccessRate calculates success rate from Public API BasicStats. -func getSuccessRate(stats *pb.BasicStats) float64 { - success := stats.SuccessCount - failure := stats.FailureCount - +func getSuccessRate(success, failure uint64) float64 { if success+failure == 0 { return 0.0 } diff --git a/cli/cmd/routes.go b/cli/cmd/routes.go index a598a30973a6a..9c3dceb4cc3c2 100644 --- a/cli/cmd/routes.go +++ b/cli/cmd/routes.go @@ -25,6 +25,12 @@ type routesOptions struct { dstIsService bool } +type routeRowStats struct { + rowStats + actualRequestRate float64 + actualSuccessRate float64 +} + const defaultRoute = "[UNKNOWN]" func newRoutesOptions() *routesOptions { @@ -72,7 +78,7 @@ This command will only display traffic which is sent to a service that has a Ser cmd.PersistentFlags().StringVarP(&options.timeWindow, "time-window", "t", options.timeWindow, "Stat window (for example: \"10s\", \"1m\", \"10m\", \"1h\")") cmd.PersistentFlags().StringVar(&options.toResource, "to", options.toResource, "If present, shows outbound stats to the specified resource") cmd.PersistentFlags().StringVar(&options.toNamespace, "to-namespace", options.toNamespace, "Sets the namespace used to lookup the \"--to\" resource; by default the current \"--namespace\" is used") - cmd.PersistentFlags().StringVarP(&options.outputFormat, "output", "o", options.outputFormat, "Output format; currently only \"table\" (default) and \"json\" are supported") + cmd.PersistentFlags().StringVarP(&options.outputFormat, "output", "o", options.outputFormat, "Output format; currently only \"table\" (default), \"wide\", and \"json\" are supported") return cmd } @@ -99,7 +105,7 @@ func renderRouteStats(resp *pb.TopRoutesResponse, options *routesOptions) string } func writeRouteStatsToBuffer(resp *pb.TopRoutesResponse, w *tabwriter.Writer, options *routesOptions) { - table := make([]*rowStats, 0) + table := make([]*routeRowStats, 0) for _, r := range resp.GetRoutes().Rows { if r.Stats != nil { @@ -107,14 +113,18 @@ func writeRouteStatsToBuffer(resp *pb.TopRoutesResponse, w *tabwriter.Writer, op if route == "" { route = defaultRoute } - table = append(table, &rowStats{ - route: route, - dst: r.GetAuthority(), - requestRate: getRequestRate(r.Stats, r.TimeWindow), - successRate: getSuccessRate(r.Stats), - latencyP50: r.Stats.LatencyMsP50, - latencyP95: r.Stats.LatencyMsP95, - latencyP99: r.Stats.LatencyMsP99, + table = append(table, &routeRowStats{ + rowStats: rowStats{ + route: route, + dst: r.GetAuthority(), + requestRate: getRequestRate(r.Stats.GetSuccessCount(), r.Stats.GetFailureCount(), r.TimeWindow), + successRate: getSuccessRate(r.Stats.GetSuccessCount(), r.Stats.GetFailureCount()), + latencyP50: r.Stats.LatencyMsP50, + latencyP95: r.Stats.LatencyMsP95, + latencyP99: r.Stats.LatencyMsP99, + }, + actualRequestRate: getRequestRate(r.Stats.GetActualSuccessCount(), r.Stats.GetActualFailureCount(), r.TimeWindow), + actualSuccessRate: getSuccessRate(r.Stats.GetActualSuccessCount(), r.Stats.GetActualFailureCount()), }) } } @@ -124,18 +134,18 @@ func writeRouteStatsToBuffer(resp *pb.TopRoutesResponse, w *tabwriter.Writer, op }) switch options.outputFormat { - case "table", "": + case "table", "wide", "": if len(table) == 0 { fmt.Fprintln(os.Stderr, "No traffic found. Does the service have a service profile? You can create one with the `linkerd profile` command.") os.Exit(0) } printRouteTable(table, w, options) case "json": - printRouteJSON(table, w) + printRouteJSON(table, w, options) } } -func printRouteTable(stats []*rowStats, w *tabwriter.Writer, options *routesOptions) { +func printRouteTable(stats []*routeRowStats, w *tabwriter.Writer, options *routesOptions) { // template for left-aligning the route column routeTemplate := fmt.Sprintf("%%-%ds", routeWidth(stats)) @@ -147,16 +157,38 @@ func printRouteTable(stats []*rowStats, w *tabwriter.Writer, options *routesOpti headers := []string{ fmt.Sprintf(routeTemplate, "ROUTE"), authorityColumn, - "SUCCESS", - "RPS", + } + outputActual := options.toResource != "" && options.outputFormat == "wide" + if outputActual { + headers = append(headers, []string{ + "EFFECTIVE_SUCCESS", + "EFFECTIVE_RPS", + "ACTUAL_SUCCESS", + "ACTUAL_RPS", + }...) + } else { + headers = append(headers, []string{ + "SUCCESS", + "RPS", + }...) + } + + headers = append(headers, []string{ "LATENCY_P50", "LATENCY_P95", "LATENCY_P99\t", // trailing \t is required to format last column - } + }...) fmt.Fprintln(w, strings.Join(headers, "\t")) - templateString := routeTemplate + "\t%s\t%.2f%%\t%.1frps\t%dms\t%dms\t%dms\t\n" + // route, success rate, rps + templateString := routeTemplate + "\t%s\t%.2f%%\t%.1frps\t" + if outputActual { + // actual success rate, actual rps + templateString = templateString + "%.2f%%\t%.1frps\t" + } + // p50, p95, p99 + templateString = templateString + "%dms\t%dms\t%dms\t\n" for _, row := range stats { @@ -166,30 +198,44 @@ func printRouteTable(stats []*rowStats, w *tabwriter.Writer, options *routesOpti authorityValue = segments[0] } - fmt.Fprintf(w, templateString, + values := []interface{}{ row.route, authorityValue, - row.successRate*100, + row.successRate * 100, row.requestRate, + } + if outputActual { + values = append(values, []interface{}{ + row.actualSuccessRate * 100, + row.actualRequestRate, + }...) + } + values = append(values, []interface{}{ row.latencyP50, row.latencyP95, row.latencyP99, - ) + }...) + + fmt.Fprintf(w, templateString, values...) } } // Using pointers there where the value is NA and the corresponding json is null type jsonRouteStats struct { - Route string `json:"route"` - Authority string `json:"authority"` - Success *float64 `json:"success"` - Rps *float64 `json:"rps"` - LatencyMSp50 *uint64 `json:"latency_ms_p50"` - LatencyMSp95 *uint64 `json:"latency_ms_p95"` - LatencyMSp99 *uint64 `json:"latency_ms_p99"` + Route string `json:"route"` + Authority string `json:"authority"` + Success *float64 `json:"success,omitempty"` + Rps *float64 `json:"rps,omitempty"` + EffectiveSuccess *float64 `json:"effective_success,omitempty"` + EffectiveRps *float64 `json:"effective_rps,omitempty"` + ActualSuccess *float64 `json:"actual_success,omitempty"` + ActualRps *float64 `json:"actual_rps,omitempty"` + LatencyMSp50 *uint64 `json:"latency_ms_p50"` + LatencyMSp95 *uint64 `json:"latency_ms_p95"` + LatencyMSp99 *uint64 `json:"latency_ms_p99"` } -func printRouteJSON(stats []*rowStats, w *tabwriter.Writer) { +func printRouteJSON(stats []*routeRowStats, w *tabwriter.Writer, options *routesOptions) { // avoid nil initialization so that if there are not stats it gets marshalled as an empty array vs null entries := []*jsonRouteStats{} for _, row := range stats { @@ -199,8 +245,15 @@ func printRouteJSON(stats []*rowStats, w *tabwriter.Writer) { } entry.Authority = row.dst - entry.Success = &row.successRate - entry.Rps = &row.requestRate + if options.toResource != "" { + entry.EffectiveSuccess = &row.successRate + entry.EffectiveRps = &row.requestRate + entry.ActualSuccess = &row.actualSuccessRate + entry.ActualRps = &row.actualRequestRate + } else { + entry.Success = &row.successRate + entry.Rps = &row.requestRate + } entry.LatencyMSp50 = &row.latencyP50 entry.LatencyMSp95 = &row.latencyP95 entry.LatencyMSp99 = &row.latencyP99 @@ -215,6 +268,20 @@ func printRouteJSON(stats []*rowStats, w *tabwriter.Writer) { fmt.Fprintf(w, "%s\n", b) } +func (o *routesOptions) validateOutputFormat() error { + switch o.outputFormat { + case "table", "json", "": + return nil + case "wide": + if o.toResource == "" { + return errors.New("wide output is only available when --to is specified") + } + return nil + default: + return fmt.Errorf("--output currently only supports table, wide, and json") + } +} + func buildTopRoutesRequest(resource string, options *routesOptions) (*pb.TopRoutesRequest, error) { err := options.validateOutputFormat() if err != nil { @@ -277,7 +344,7 @@ func buildTopRoutesTo(toResource pb.Resource) (string, error) { } // returns the length of the longest route name -func routeWidth(stats []*rowStats) int { +func routeWidth(stats []*routeRowStats) int { maxLength := len(defaultRoute) for _, row := range stats { if len(row.route) > maxLength { diff --git a/cli/cmd/routes_test.go b/cli/cmd/routes_test.go index 5606301d0cd1e..b11daadfb26a2 100644 --- a/cli/cmd/routes_test.go +++ b/cli/cmd/routes_test.go @@ -38,7 +38,7 @@ func TestRoutes(t *testing.T) { func testRoutesCall(exp routesParamsExp, t *testing.T) { mockClient := &public.MockAPIClient{} - response := public.GenTopRoutesResponse(exp.routes, exp.counts) + response := public.GenTopRoutesResponse(exp.routes, exp.counts, exp.options.toResource != "") mockClient.TopRoutesResponseToReturn = &response diff --git a/cli/cmd/stat.go b/cli/cmd/stat.go index 6fc1bf62ba9fb..ddfa07c83f839 100644 --- a/cli/cmd/stat.go +++ b/cli/cmd/stat.go @@ -264,8 +264,8 @@ func writeStatsToBuffer(rows []*pb.StatTable_PodGroup_Row, w *tabwriter.Writer, if r.Stats != nil { statTables[resourceKey][key].rowStats = &rowStats{ - requestRate: getRequestRate(r.Stats, r.TimeWindow), - successRate: getSuccessRate(r.Stats), + requestRate: getRequestRate(r.Stats.GetSuccessCount(), r.Stats.GetFailureCount(), r.TimeWindow), + successRate: getSuccessRate(r.Stats.GetSuccessCount(), r.Stats.GetFailureCount()), tlsPercent: getPercentTLS(r.Stats), latencyP50: r.Stats.LatencyMsP50, latencyP95: r.Stats.LatencyMsP95, @@ -275,7 +275,7 @@ func writeStatsToBuffer(rows []*pb.StatTable_PodGroup_Row, w *tabwriter.Writer, } switch options.outputFormat { - case "table", "": + case "table", "wide", "": if len(statTables) == 0 { fmt.Fprintln(os.Stderr, "No traffic found.") os.Exit(0) diff --git a/controller/Dockerfile b/controller/Dockerfile index b7780a2d0e1db..4a201b37825b6 100644 --- a/controller/Dockerfile +++ b/controller/Dockerfile @@ -1,5 +1,5 @@ ## compile controller services -FROM gcr.io/linkerd-io/go-deps:f95a60fe as golang +FROM gcr.io/linkerd-io/go-deps:18d4ad09 as golang WORKDIR /go/src/github.com/linkerd/linkerd2 COPY controller/gen controller/gen COPY pkg pkg diff --git a/controller/api/proxy/profile_listener.go b/controller/api/proxy/profile_listener.go index b9da4d7a242c8..55c07d04e28e7 100644 --- a/controller/api/proxy/profile_listener.go +++ b/controller/api/proxy/profile_listener.go @@ -40,16 +40,12 @@ func (l *profileListener) Stop() { } func (l *profileListener) Update(profile *sp.ServiceProfile) { - routes := make([]*pb.Route, 0) if profile != nil { - for _, route := range profile.Spec.Routes { - pbRoute, err := profiles.ToRoute(route) - if err != nil { - log.Error(err) - return - } - routes = append(routes, pbRoute) + destinationProfile, err := profiles.ToServiceProfile(&profile.Spec) + if err != nil { + log.Error(err) + return } + l.stream.Send(destinationProfile) } - l.stream.Send(&pb.DestinationProfile{Routes: routes}) } diff --git a/controller/api/proxy/profile_listener_test.go b/controller/api/proxy/profile_listener_test.go index c6078eb2a7d6f..76fbd08b3115a 100644 --- a/controller/api/proxy/profile_listener_test.go +++ b/controller/api/proxy/profile_listener_test.go @@ -8,6 +8,7 @@ import ( pb "github.com/linkerd/linkerd2-proxy-api/go/destination" httpPb "github.com/linkerd/linkerd2-proxy-api/go/http_types" sp "github.com/linkerd/linkerd2/controller/gen/apis/serviceprofile/v1alpha1" + "github.com/linkerd/linkerd2/pkg/profiles" ) var ( @@ -173,6 +174,7 @@ var ( pbRoute1, pbRoute2, }, + RetryBudget: &profiles.DefaultRetryBudget, } multipleRequestMatches = &sp.ServiceProfile{ @@ -222,6 +224,7 @@ var ( ResponseClasses: []*pb.ResponseClass{}, }, }, + RetryBudget: &profiles.DefaultRetryBudget, } notEnoughRequestMatches = &sp.ServiceProfile{ @@ -310,6 +313,7 @@ var ( }, }, }, + RetryBudget: &profiles.DefaultRetryBudget, } oneSidedStatusRange = &sp.ServiceProfile{ diff --git a/controller/api/public/prometheus.go b/controller/api/public/prometheus.go index 6f29588203877..664d554d72b84 100644 --- a/controller/api/public/prometheus.go +++ b/controller/api/public/prometheus.go @@ -20,17 +20,16 @@ type promResult struct { } const ( - promRequests = promType("QUERY_REQUESTS") - promLatencyP50 = promType("0.5") - promLatencyP95 = promType("0.95") - promLatencyP99 = promType("0.99") + promRequests = promType("QUERY_REQUESTS") + promActualRequests = promType("QUERY_ACTUAL_REQUESTS") + promLatencyP50 = promType("0.5") + promLatencyP95 = promType("0.95") + promLatencyP99 = promType("0.99") namespaceLabel = model.LabelName("namespace") dstNamespaceLabel = model.LabelName("dst_namespace") ) -var promTypes = []promType{promRequests, promLatencyP50, promLatencyP95, promLatencyP99} - func extractSampleValue(sample *model.Sample) uint64 { value := uint64(0) if !math.IsNaN(float64(sample.Value)) { @@ -129,23 +128,27 @@ func promResourceType(resource *pb.Resource) model.LabelName { return model.LabelName(l5dLabel) } -func (s *grpcServer) getPrometheusMetrics(ctx context.Context, volumeQueryTemplate, latencyQueryTemplate, labels, timeWindow, groupBy string) ([]promResult, error) { +func (s *grpcServer) getPrometheusMetrics(ctx context.Context, requestQueryTemplates map[promType]string, latencyQueryTemplate, labels, timeWindow, groupBy string) ([]promResult, error) { resultChan := make(chan promResult) - // kick off 4 asynchronous queries: 1 request volume + 3 latency - go func() { - // success/failure counts - requestsQuery := fmt.Sprintf(volumeQueryTemplate, labels, timeWindow, groupBy) - resultVector, err := s.queryProm(ctx, requestsQuery) + // kick off asynchronous queries: request count queries + 3 latency queries + for pt, requestQueryTemplate := range requestQueryTemplates { + go func(typ promType, template string) { + // success/failure counts + requestsQuery := fmt.Sprintf(template, labels, timeWindow, groupBy) + resultVector, err := s.queryProm(ctx, requestsQuery) - resultChan <- promResult{ - prom: promRequests, - vec: resultVector, - err: err, - } - }() + resultChan <- promResult{ + prom: typ, + vec: resultVector, + err: err, + } + }(pt, requestQueryTemplate) + } + + quantiles := []promType{promLatencyP50, promLatencyP95, promLatencyP99} - for _, quantile := range []promType{promLatencyP50, promLatencyP95, promLatencyP99} { + for _, quantile := range quantiles { go func(quantile promType) { latencyQuery := fmt.Sprintf(latencyQueryTemplate, quantile, labels, timeWindow, groupBy) latencyResult, err := s.queryProm(ctx, latencyQuery) @@ -161,7 +164,7 @@ func (s *grpcServer) getPrometheusMetrics(ctx context.Context, volumeQueryTempla // process results, receive one message per prometheus query type var err error results := []promResult{} - for i := 0; i < len(promTypes); i++ { + for i := 0; i < len(quantiles)+len(requestQueryTemplates); i++ { result := <-resultChan if result.err != nil { log.Errorf("queryProm failed with: %s", result.err) diff --git a/controller/api/public/stat_summary.go b/controller/api/public/stat_summary.go index 7e3bbae508d6d..bef78b141d842 100644 --- a/controller/api/public/stat_summary.go +++ b/controller/api/public/stat_summary.go @@ -309,7 +309,7 @@ func buildRequestLabels(req *pb.StatSummaryRequest) (labels model.LabelSet, labe func (s *grpcServer) getStatMetrics(ctx context.Context, req *pb.StatSummaryRequest, timeWindow string) (map[rKey]*pb.BasicStats, error) { reqLabels, groupBy := buildRequestLabels(req) - results, err := s.getPrometheusMetrics(ctx, reqQuery, latencyQuantileQuery, reqLabels.String(), timeWindow, groupBy.String()) + results, err := s.getPrometheusMetrics(ctx, map[promType]string{promRequests: reqQuery}, latencyQuantileQuery, reqLabels.String(), timeWindow, groupBy.String()) if err != nil { return nil, err diff --git a/controller/api/public/test_helper.go b/controller/api/public/test_helper.go index 9a96259c7f029..eeee8f07f6668 100644 --- a/controller/api/public/test_helper.go +++ b/controller/api/public/test_helper.go @@ -208,7 +208,7 @@ func GenStatSummaryResponse(resName, resType string, resNs []string, counts *Pod } // GenTopRoutesResponse generates a mock Public API TopRoutesResponse object. -func GenTopRoutesResponse(routes []string, counts []uint64) pb.TopRoutesResponse { +func GenTopRoutesResponse(routes []string, counts []uint64, outbound bool) pb.TopRoutesResponse { rows := []*pb.RouteTable_Row{} for i, route := range routes { row := &pb.RouteTable_Row{ @@ -223,6 +223,9 @@ func GenTopRoutesResponse(routes []string, counts []uint64) pb.TopRoutesResponse }, TimeWindow: "1m", } + if outbound { + row.Stats.ActualSuccessCount = counts[i] + } rows = append(rows, row) } diff --git a/controller/api/public/top_routes.go b/controller/api/public/top_routes.go index 3aa68f66ec0b0..5721c42eee634 100644 --- a/controller/api/public/top_routes.go +++ b/controller/api/public/top_routes.go @@ -13,6 +13,7 @@ import ( const ( routeReqQuery = "sum(increase(route_response_total%s[%s])) by (%s, dst, classification)" + actualRouteReqQuery = "sum(increase(route_actual_response_total%s[%s])) by (%s, dst, classification)" routeLatencyQuantileQuery = "histogram_quantile(%s, sum(irate(route_response_latency_ms_bucket%s[%s])) by (le, dst, %s))" dstLabel = `dst=~"%s(:\\d+)?"` ) @@ -52,7 +53,16 @@ func (s *grpcServer) getRouteMetrics(ctx context.Context, req *pb.TopRoutesReque reqLabels := buildRouteLabels(req) groupBy := "rt_route" - results, err := s.getPrometheusMetrics(ctx, routeReqQuery, routeLatencyQuantileQuery, reqLabels, timeWindow, groupBy) + queries := map[promType]string{ + promRequests: routeReqQuery, + } + + if req.GetOutbound() != nil && req.GetNone() == nil { + // If this req has an Outbound, then query the actual request counts as well. + queries[promActualRequests] = actualRouteReqQuery + } + + results, err := s.getPrometheusMetrics(ctx, queries, routeLatencyQuantileQuery, reqLabels, timeWindow, groupBy) if err != nil { return nil, err } @@ -136,6 +146,13 @@ func processRouteMetrics(results []promResult, timeWindow string) *pb.RouteTable case "failure": routeStats[key].Stats.FailureCount += value } + case promActualRequests: + switch string(sample.Metric[model.LabelName("classification")]) { + case "success": + routeStats[key].Stats.ActualSuccessCount += value + case "failure": + routeStats[key].Stats.ActualFailureCount += value + } case promLatencyP50: routeStats[key].Stats.LatencyMsP50 = value case promLatencyP95: diff --git a/controller/api/public/top_routes_test.go b/controller/api/public/top_routes_test.go index 984419ce11da7..cb1cd0408e047 100644 --- a/controller/api/public/top_routes_test.go +++ b/controller/api/public/top_routes_test.go @@ -111,7 +111,7 @@ func TestTopRoutes(t *testing.T) { }, TimeWindow: "1m", }, - expectedResponse: GenTopRoutesResponse(routes, counts), + expectedResponse: GenTopRoutesResponse(routes, counts, false), }, } @@ -143,7 +143,7 @@ func TestTopRoutes(t *testing.T) { }, TimeWindow: "1m", }, - expectedResponse: GenTopRoutesResponse(routes, counts), + expectedResponse: GenTopRoutesResponse(routes, counts, false), }, } @@ -163,6 +163,7 @@ func TestTopRoutes(t *testing.T) { `histogram_quantile(0.95, sum(irate(route_response_latency_ms_bucket{deployment="traffic", direction="outbound", namespace="books"}[1m])) by (le, dst, rt_route))`, `histogram_quantile(0.99, sum(irate(route_response_latency_ms_bucket{deployment="traffic", direction="outbound", namespace="books"}[1m])) by (le, dst, rt_route))`, `sum(increase(route_response_total{deployment="traffic", direction="outbound", namespace="books"}[1m])) by (rt_route, dst, classification)`, + `sum(increase(route_actual_response_total{deployment="traffic", direction="outbound", namespace="books"}[1m])) by (rt_route, dst, classification)`, }, }, req: pb.TopRoutesRequest{ @@ -178,7 +179,7 @@ func TestTopRoutes(t *testing.T) { }, TimeWindow: "1m", }, - expectedResponse: GenTopRoutesResponse(routes, counts), + expectedResponse: GenTopRoutesResponse(routes, counts, true), }, } @@ -198,6 +199,7 @@ func TestTopRoutes(t *testing.T) { `histogram_quantile(0.95, sum(irate(route_response_latency_ms_bucket{deployment="traffic", direction="outbound", dst=~"books.default.svc.cluster.local(:\\d+)?", namespace="books"}[1m])) by (le, dst, rt_route))`, `histogram_quantile(0.99, sum(irate(route_response_latency_ms_bucket{deployment="traffic", direction="outbound", dst=~"books.default.svc.cluster.local(:\\d+)?", namespace="books"}[1m])) by (le, dst, rt_route))`, `sum(increase(route_response_total{deployment="traffic", direction="outbound", dst=~"books.default.svc.cluster.local(:\\d+)?", namespace="books"}[1m])) by (rt_route, dst, classification)`, + `sum(increase(route_actual_response_total{deployment="traffic", direction="outbound", dst=~"books.default.svc.cluster.local(:\\d+)?", namespace="books"}[1m])) by (rt_route, dst, classification)`, }, }, req: pb.TopRoutesRequest{ @@ -213,7 +215,7 @@ func TestTopRoutes(t *testing.T) { }, TimeWindow: "1m", }, - expectedResponse: GenTopRoutesResponse(routes, counts), + expectedResponse: GenTopRoutesResponse(routes, counts, true), }, } diff --git a/controller/gen/apis/serviceprofile/v1alpha1/types.go b/controller/gen/apis/serviceprofile/v1alpha1/types.go index 9f4d80758293a..913e12a146d0c 100644 --- a/controller/gen/apis/serviceprofile/v1alpha1/types.go +++ b/controller/gen/apis/serviceprofile/v1alpha1/types.go @@ -27,7 +27,8 @@ type ServiceProfile struct { // ServiceProfileSpec specifies a ServiceProfile resource. type ServiceProfileSpec struct { - Routes []*RouteSpec `json:"routes"` + Routes []*RouteSpec `json:"routes"` + RetryBudget *RetryBudget `json:"retryBudget"` } // RouteSpec specifies a Route resource. @@ -35,6 +36,7 @@ type RouteSpec struct { Name string `json:"name"` Condition *RequestMatch `json:"condition"` ResponseClasses []*ResponseClass `json:"responseClasses,omitempty"` + IsRetryable bool `json:"isRetryable,omitempty"` } // RequestMatch describes the conditions under which to match a Route. @@ -67,6 +69,14 @@ type Range struct { Max uint32 `json:"max,omitempty"` } +// RetryBudget describes the maximum number of retries that should be issued to +// this service. +type RetryBudget struct { + RetryRatio float32 `json:"retryRatio"` + MinRetriesPerSecond uint32 `json:"minRetriesPerSecond"` + TTL string `json:"ttl"` +} + // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ServiceProfileList is a list of ServiceProfile resources. diff --git a/controller/gen/apis/serviceprofile/v1alpha1/zz_generated.deepcopy.go b/controller/gen/apis/serviceprofile/v1alpha1/zz_generated.deepcopy.go index b2a0a6193123b..f4557a992be95 100644 --- a/controller/gen/apis/serviceprofile/v1alpha1/zz_generated.deepcopy.go +++ b/controller/gen/apis/serviceprofile/v1alpha1/zz_generated.deepcopy.go @@ -152,6 +152,22 @@ func (in *ResponseMatch) DeepCopy() *ResponseMatch { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RetryBudget) DeepCopyInto(out *RetryBudget) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RetryBudget. +func (in *RetryBudget) DeepCopy() *RetryBudget { + if in == nil { + return nil + } + out := new(RetryBudget) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RouteSpec) DeepCopyInto(out *RouteSpec) { *out = *in @@ -258,6 +274,11 @@ func (in *ServiceProfileSpec) DeepCopyInto(out *ServiceProfileSpec) { } } } + if in.RetryBudget != nil { + in, out := &in.RetryBudget, &out.RetryBudget + *out = new(RetryBudget) + **out = **in + } return } diff --git a/controller/gen/public/public.pb.go b/controller/gen/public/public.pb.go index 992fb06eb5eef..7411a41876cb0 100644 --- a/controller/gen/public/public.pb.go +++ b/controller/gen/public/public.pb.go @@ -66,7 +66,7 @@ func (x HttpMethod_Registered) String() string { return proto.EnumName(HttpMethod_Registered_name, int32(x)) } func (HttpMethod_Registered) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{10, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{10, 0} } type Scheme_Registered int32 @@ -89,7 +89,7 @@ func (x Scheme_Registered) String() string { return proto.EnumName(Scheme_Registered_name, int32(x)) } func (Scheme_Registered) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{11, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{11, 0} } type TapEvent_ProxyDirection int32 @@ -115,7 +115,7 @@ func (x TapEvent_ProxyDirection) String() string { return proto.EnumName(TapEvent_ProxyDirection_name, int32(x)) } func (TapEvent_ProxyDirection) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16, 0} } type Empty struct { @@ -128,7 +128,7 @@ func (m *Empty) Reset() { *m = Empty{} } func (m *Empty) String() string { return proto.CompactTextString(m) } func (*Empty) ProtoMessage() {} func (*Empty) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{0} } func (m *Empty) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Empty.Unmarshal(m, b) @@ -161,7 +161,7 @@ func (m *VersionInfo) Reset() { *m = VersionInfo{} } func (m *VersionInfo) String() string { return proto.CompactTextString(m) } func (*VersionInfo) ProtoMessage() {} func (*VersionInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{1} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{1} } func (m *VersionInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VersionInfo.Unmarshal(m, b) @@ -213,7 +213,7 @@ func (m *ListServicesRequest) Reset() { *m = ListServicesRequest{} } func (m *ListServicesRequest) String() string { return proto.CompactTextString(m) } func (*ListServicesRequest) ProtoMessage() {} func (*ListServicesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{2} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{2} } func (m *ListServicesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListServicesRequest.Unmarshal(m, b) @@ -251,7 +251,7 @@ func (m *ListServicesResponse) Reset() { *m = ListServicesResponse{} } func (m *ListServicesResponse) String() string { return proto.CompactTextString(m) } func (*ListServicesResponse) ProtoMessage() {} func (*ListServicesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{3} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{3} } func (m *ListServicesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListServicesResponse.Unmarshal(m, b) @@ -290,7 +290,7 @@ func (m *Service) Reset() { *m = Service{} } func (m *Service) String() string { return proto.CompactTextString(m) } func (*Service) ProtoMessage() {} func (*Service) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{4} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{4} } func (m *Service) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Service.Unmarshal(m, b) @@ -335,7 +335,7 @@ func (m *ListPodsRequest) Reset() { *m = ListPodsRequest{} } func (m *ListPodsRequest) String() string { return proto.CompactTextString(m) } func (*ListPodsRequest) ProtoMessage() {} func (*ListPodsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{5} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{5} } func (m *ListPodsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListPodsRequest.Unmarshal(m, b) @@ -373,7 +373,7 @@ func (m *ListPodsResponse) Reset() { *m = ListPodsResponse{} } func (m *ListPodsResponse) String() string { return proto.CompactTextString(m) } func (*ListPodsResponse) ProtoMessage() {} func (*ListPodsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{6} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{6} } func (m *ListPodsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ListPodsResponse.Unmarshal(m, b) @@ -428,7 +428,7 @@ func (m *Pod) Reset() { *m = Pod{} } func (m *Pod) String() string { return proto.CompactTextString(m) } func (*Pod) ProtoMessage() {} func (*Pod) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{7} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{7} } func (m *Pod) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Pod.Unmarshal(m, b) @@ -758,7 +758,7 @@ func (m *TapRequest) Reset() { *m = TapRequest{} } func (m *TapRequest) String() string { return proto.CompactTextString(m) } func (*TapRequest) ProtoMessage() {} func (*TapRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{8} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{8} } func (m *TapRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapRequest.Unmarshal(m, b) @@ -961,7 +961,7 @@ func (m *TapByResourceRequest) Reset() { *m = TapByResourceRequest{} } func (m *TapByResourceRequest) String() string { return proto.CompactTextString(m) } func (*TapByResourceRequest) ProtoMessage() {} func (*TapByResourceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{9} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{9} } func (m *TapByResourceRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapByResourceRequest.Unmarshal(m, b) @@ -1019,7 +1019,7 @@ func (m *TapByResourceRequest_Match) Reset() { *m = TapByResourceRequest func (m *TapByResourceRequest_Match) String() string { return proto.CompactTextString(m) } func (*TapByResourceRequest_Match) ProtoMessage() {} func (*TapByResourceRequest_Match) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{9, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{9, 0} } func (m *TapByResourceRequest_Match) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapByResourceRequest_Match.Unmarshal(m, b) @@ -1257,7 +1257,7 @@ func (m *TapByResourceRequest_Match_Seq) Reset() { *m = TapByResourceReq func (m *TapByResourceRequest_Match_Seq) String() string { return proto.CompactTextString(m) } func (*TapByResourceRequest_Match_Seq) ProtoMessage() {} func (*TapByResourceRequest_Match_Seq) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{9, 0, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{9, 0, 0} } func (m *TapByResourceRequest_Match_Seq) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapByResourceRequest_Match_Seq.Unmarshal(m, b) @@ -1300,7 +1300,7 @@ func (m *TapByResourceRequest_Match_Http) Reset() { *m = TapByResourceRe func (m *TapByResourceRequest_Match_Http) String() string { return proto.CompactTextString(m) } func (*TapByResourceRequest_Match_Http) ProtoMessage() {} func (*TapByResourceRequest_Match_Http) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{9, 0, 1} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{9, 0, 1} } func (m *TapByResourceRequest_Match_Http) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapByResourceRequest_Match_Http.Unmarshal(m, b) @@ -1493,7 +1493,7 @@ func (m *HttpMethod) Reset() { *m = HttpMethod{} } func (m *HttpMethod) String() string { return proto.CompactTextString(m) } func (*HttpMethod) ProtoMessage() {} func (*HttpMethod) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{10} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{10} } func (m *HttpMethod) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_HttpMethod.Unmarshal(m, b) @@ -1629,7 +1629,7 @@ func (m *Scheme) Reset() { *m = Scheme{} } func (m *Scheme) String() string { return proto.CompactTextString(m) } func (*Scheme) ProtoMessage() {} func (*Scheme) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{11} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{11} } func (m *Scheme) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Scheme.Unmarshal(m, b) @@ -1765,7 +1765,7 @@ func (m *IPAddress) Reset() { *m = IPAddress{} } func (m *IPAddress) String() string { return proto.CompactTextString(m) } func (*IPAddress) ProtoMessage() {} func (*IPAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{12} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{12} } func (m *IPAddress) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IPAddress.Unmarshal(m, b) @@ -1903,7 +1903,7 @@ func (m *IPv6) Reset() { *m = IPv6{} } func (m *IPv6) String() string { return proto.CompactTextString(m) } func (*IPv6) ProtoMessage() {} func (*IPv6) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{13} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{13} } func (m *IPv6) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IPv6.Unmarshal(m, b) @@ -1949,7 +1949,7 @@ func (m *TcpAddress) Reset() { *m = TcpAddress{} } func (m *TcpAddress) String() string { return proto.CompactTextString(m) } func (*TcpAddress) ProtoMessage() {} func (*TcpAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{14} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{14} } func (m *TcpAddress) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TcpAddress.Unmarshal(m, b) @@ -1997,7 +1997,7 @@ func (m *Eos) Reset() { *m = Eos{} } func (m *Eos) String() string { return proto.CompactTextString(m) } func (*Eos) ProtoMessage() {} func (*Eos) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{15} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{15} } func (m *Eos) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Eos.Unmarshal(m, b) @@ -2137,7 +2137,7 @@ func (m *TapEvent) Reset() { *m = TapEvent{} } func (m *TapEvent) String() string { return proto.CompactTextString(m) } func (*TapEvent) ProtoMessage() {} func (*TapEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16} } func (m *TapEvent) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapEvent.Unmarshal(m, b) @@ -2289,7 +2289,7 @@ func (m *TapEvent_EndpointMeta) Reset() { *m = TapEvent_EndpointMeta{} } func (m *TapEvent_EndpointMeta) String() string { return proto.CompactTextString(m) } func (*TapEvent_EndpointMeta) ProtoMessage() {} func (*TapEvent_EndpointMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16, 0} } func (m *TapEvent_EndpointMeta) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapEvent_EndpointMeta.Unmarshal(m, b) @@ -2327,7 +2327,7 @@ func (m *TapEvent_RouteMeta) Reset() { *m = TapEvent_RouteMeta{} } func (m *TapEvent_RouteMeta) String() string { return proto.CompactTextString(m) } func (*TapEvent_RouteMeta) ProtoMessage() {} func (*TapEvent_RouteMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16, 1} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16, 1} } func (m *TapEvent_RouteMeta) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapEvent_RouteMeta.Unmarshal(m, b) @@ -2369,7 +2369,7 @@ func (m *TapEvent_Http) Reset() { *m = TapEvent_Http{} } func (m *TapEvent_Http) String() string { return proto.CompactTextString(m) } func (*TapEvent_Http) ProtoMessage() {} func (*TapEvent_Http) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16, 2} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16, 2} } func (m *TapEvent_Http) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapEvent_Http.Unmarshal(m, b) @@ -2546,7 +2546,7 @@ func (m *TapEvent_Http_StreamId) Reset() { *m = TapEvent_Http_StreamId{} func (m *TapEvent_Http_StreamId) String() string { return proto.CompactTextString(m) } func (*TapEvent_Http_StreamId) ProtoMessage() {} func (*TapEvent_Http_StreamId) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16, 2, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16, 2, 0} } func (m *TapEvent_Http_StreamId) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapEvent_Http_StreamId.Unmarshal(m, b) @@ -2595,7 +2595,7 @@ func (m *TapEvent_Http_RequestInit) Reset() { *m = TapEvent_Http_Request func (m *TapEvent_Http_RequestInit) String() string { return proto.CompactTextString(m) } func (*TapEvent_Http_RequestInit) ProtoMessage() {} func (*TapEvent_Http_RequestInit) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16, 2, 1} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16, 2, 1} } func (m *TapEvent_Http_RequestInit) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapEvent_Http_RequestInit.Unmarshal(m, b) @@ -2663,7 +2663,7 @@ func (m *TapEvent_Http_ResponseInit) Reset() { *m = TapEvent_Http_Respon func (m *TapEvent_Http_ResponseInit) String() string { return proto.CompactTextString(m) } func (*TapEvent_Http_ResponseInit) ProtoMessage() {} func (*TapEvent_Http_ResponseInit) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16, 2, 2} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16, 2, 2} } func (m *TapEvent_Http_ResponseInit) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapEvent_Http_ResponseInit.Unmarshal(m, b) @@ -2719,7 +2719,7 @@ func (m *TapEvent_Http_ResponseEnd) Reset() { *m = TapEvent_Http_Respons func (m *TapEvent_Http_ResponseEnd) String() string { return proto.CompactTextString(m) } func (*TapEvent_Http_ResponseEnd) ProtoMessage() {} func (*TapEvent_Http_ResponseEnd) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{16, 2, 3} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{16, 2, 3} } func (m *TapEvent_Http_ResponseEnd) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TapEvent_Http_ResponseEnd.Unmarshal(m, b) @@ -2785,7 +2785,7 @@ func (m *ApiError) Reset() { *m = ApiError{} } func (m *ApiError) String() string { return proto.CompactTextString(m) } func (*ApiError) ProtoMessage() {} func (*ApiError) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{17} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{17} } func (m *ApiError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApiError.Unmarshal(m, b) @@ -2823,7 +2823,7 @@ func (m *PodErrors) Reset() { *m = PodErrors{} } func (m *PodErrors) String() string { return proto.CompactTextString(m) } func (*PodErrors) ProtoMessage() {} func (*PodErrors) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{18} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{18} } func (m *PodErrors) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PodErrors.Unmarshal(m, b) @@ -2863,7 +2863,7 @@ func (m *PodErrors_PodError) Reset() { *m = PodErrors_PodError{} } func (m *PodErrors_PodError) String() string { return proto.CompactTextString(m) } func (*PodErrors_PodError) ProtoMessage() {} func (*PodErrors_PodError) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{18, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{18, 0} } func (m *PodErrors_PodError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PodErrors_PodError.Unmarshal(m, b) @@ -2977,7 +2977,7 @@ func (m *PodErrors_PodError_ContainerError) Reset() { *m = PodErrors_Pod func (m *PodErrors_PodError_ContainerError) String() string { return proto.CompactTextString(m) } func (*PodErrors_PodError_ContainerError) ProtoMessage() {} func (*PodErrors_PodError_ContainerError) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{18, 0, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{18, 0, 0} } func (m *PodErrors_PodError_ContainerError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PodErrors_PodError_ContainerError.Unmarshal(m, b) @@ -3048,7 +3048,7 @@ func (m *Resource) Reset() { *m = Resource{} } func (m *Resource) String() string { return proto.CompactTextString(m) } func (*Resource) ProtoMessage() {} func (*Resource) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{19} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{19} } func (m *Resource) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Resource.Unmarshal(m, b) @@ -3107,7 +3107,7 @@ func (m *ResourceSelection) Reset() { *m = ResourceSelection{} } func (m *ResourceSelection) String() string { return proto.CompactTextString(m) } func (*ResourceSelection) ProtoMessage() {} func (*ResourceSelection) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{20} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{20} } func (m *ResourceSelection) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResourceSelection.Unmarshal(m, b) @@ -3153,7 +3153,7 @@ func (m *ResourceError) Reset() { *m = ResourceError{} } func (m *ResourceError) String() string { return proto.CompactTextString(m) } func (*ResourceError) ProtoMessage() {} func (*ResourceError) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{21} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{21} } func (m *ResourceError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResourceError.Unmarshal(m, b) @@ -3205,7 +3205,7 @@ func (m *StatSummaryRequest) Reset() { *m = StatSummaryRequest{} } func (m *StatSummaryRequest) String() string { return proto.CompactTextString(m) } func (*StatSummaryRequest) ProtoMessage() {} func (*StatSummaryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{22} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{22} } func (m *StatSummaryRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatSummaryRequest.Unmarshal(m, b) @@ -3403,7 +3403,7 @@ func (m *StatSummaryResponse) Reset() { *m = StatSummaryResponse{} } func (m *StatSummaryResponse) String() string { return proto.CompactTextString(m) } func (*StatSummaryResponse) ProtoMessage() {} func (*StatSummaryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{23} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{23} } func (m *StatSummaryResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatSummaryResponse.Unmarshal(m, b) @@ -3545,7 +3545,7 @@ func (m *StatSummaryResponse_Ok) Reset() { *m = StatSummaryResponse_Ok{} func (m *StatSummaryResponse_Ok) String() string { return proto.CompactTextString(m) } func (*StatSummaryResponse_Ok) ProtoMessage() {} func (*StatSummaryResponse_Ok) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{23, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{23, 0} } func (m *StatSummaryResponse_Ok) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatSummaryResponse_Ok.Unmarshal(m, b) @@ -3579,6 +3579,8 @@ type BasicStats struct { LatencyMsP95 uint64 `protobuf:"varint,4,opt,name=latency_ms_p95,json=latencyMsP95,proto3" json:"latency_ms_p95,omitempty"` LatencyMsP99 uint64 `protobuf:"varint,5,opt,name=latency_ms_p99,json=latencyMsP99,proto3" json:"latency_ms_p99,omitempty"` TlsRequestCount uint64 `protobuf:"varint,6,opt,name=tls_request_count,json=tlsRequestCount,proto3" json:"tls_request_count,omitempty"` + ActualSuccessCount uint64 `protobuf:"varint,7,opt,name=actual_success_count,json=actualSuccessCount,proto3" json:"actual_success_count,omitempty"` + ActualFailureCount uint64 `protobuf:"varint,8,opt,name=actual_failure_count,json=actualFailureCount,proto3" json:"actual_failure_count,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -3588,7 +3590,7 @@ func (m *BasicStats) Reset() { *m = BasicStats{} } func (m *BasicStats) String() string { return proto.CompactTextString(m) } func (*BasicStats) ProtoMessage() {} func (*BasicStats) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{24} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{24} } func (m *BasicStats) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BasicStats.Unmarshal(m, b) @@ -3650,6 +3652,20 @@ func (m *BasicStats) GetTlsRequestCount() uint64 { return 0 } +func (m *BasicStats) GetActualSuccessCount() uint64 { + if m != nil { + return m.ActualSuccessCount + } + return 0 +} + +func (m *BasicStats) GetActualFailureCount() uint64 { + if m != nil { + return m.ActualFailureCount + } + return 0 +} + type StatTable struct { // Types that are valid to be assigned to Table: // *StatTable_PodGroup_ @@ -3663,7 +3679,7 @@ func (m *StatTable) Reset() { *m = StatTable{} } func (m *StatTable) String() string { return proto.CompactTextString(m) } func (*StatTable) ProtoMessage() {} func (*StatTable) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{25} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{25} } func (m *StatTable) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatTable.Unmarshal(m, b) @@ -3773,7 +3789,7 @@ func (m *StatTable_PodGroup) Reset() { *m = StatTable_PodGroup{} } func (m *StatTable_PodGroup) String() string { return proto.CompactTextString(m) } func (*StatTable_PodGroup) ProtoMessage() {} func (*StatTable_PodGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{25, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{25, 0} } func (m *StatTable_PodGroup) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatTable_PodGroup.Unmarshal(m, b) @@ -3821,7 +3837,7 @@ func (m *StatTable_PodGroup_Row) Reset() { *m = StatTable_PodGroup_Row{} func (m *StatTable_PodGroup_Row) String() string { return proto.CompactTextString(m) } func (*StatTable_PodGroup_Row) ProtoMessage() {} func (*StatTable_PodGroup_Row) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{25, 0, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{25, 0, 0} } func (m *StatTable_PodGroup_Row) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StatTable_PodGroup_Row.Unmarshal(m, b) @@ -3907,7 +3923,7 @@ func (m *TopRoutesRequest) Reset() { *m = TopRoutesRequest{} } func (m *TopRoutesRequest) String() string { return proto.CompactTextString(m) } func (*TopRoutesRequest) ProtoMessage() {} func (*TopRoutesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{26} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{26} } func (m *TopRoutesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TopRoutesRequest.Unmarshal(m, b) @@ -4094,7 +4110,7 @@ func (m *TopRoutesResponse) Reset() { *m = TopRoutesResponse{} } func (m *TopRoutesResponse) String() string { return proto.CompactTextString(m) } func (*TopRoutesResponse) ProtoMessage() {} func (*TopRoutesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{27} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{27} } func (m *TopRoutesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TopRoutesResponse.Unmarshal(m, b) @@ -4236,7 +4252,7 @@ func (m *RouteTable) Reset() { *m = RouteTable{} } func (m *RouteTable) String() string { return proto.CompactTextString(m) } func (*RouteTable) ProtoMessage() {} func (*RouteTable) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{28} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{28} } func (m *RouteTable) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RouteTable.Unmarshal(m, b) @@ -4277,7 +4293,7 @@ func (m *RouteTable_Row) Reset() { *m = RouteTable_Row{} } func (m *RouteTable_Row) String() string { return proto.CompactTextString(m) } func (*RouteTable_Row) ProtoMessage() {} func (*RouteTable_Row) Descriptor() ([]byte, []int) { - return fileDescriptor_public_4e6616d7807e6f92, []int{28, 0} + return fileDescriptor_public_3344f8c8d1a07d0f, []int{28, 0} } func (m *RouteTable_Row) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RouteTable_Row.Unmarshal(m, b) @@ -4742,181 +4758,183 @@ var _Api_serviceDesc = grpc.ServiceDesc{ Metadata: "public.proto", } -func init() { proto.RegisterFile("public.proto", fileDescriptor_public_4e6616d7807e6f92) } - -var fileDescriptor_public_4e6616d7807e6f92 = []byte{ - // 2760 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x19, 0x4d, 0x73, 0x1b, 0x49, - 0x55, 0x1f, 0xa3, 0xaf, 0x27, 0xd9, 0x56, 0x3a, 0xd9, 0xa0, 0x9d, 0x5d, 0xb2, 0xce, 0x38, 0x9b, - 0x75, 0x65, 0x41, 0xf6, 0x3a, 0x9b, 0xec, 0x66, 0xb3, 0x7c, 0x58, 0xb6, 0x88, 0x0c, 0x8e, 0xad, - 0x6d, 0x29, 0x6c, 0x55, 0x6a, 0x29, 0xd5, 0x58, 0xd3, 0xb6, 0x07, 0x8f, 0xa6, 0x27, 0x33, 0xad, - 0x64, 0x75, 0xe6, 0xc2, 0x05, 0xb8, 0xc0, 0x99, 0x33, 0xdc, 0xb8, 0xc0, 0x7f, 0xe0, 0x40, 0xc1, - 0x81, 0xe2, 0x06, 0x37, 0xae, 0x5c, 0x38, 0x53, 0x54, 0x7f, 0x8d, 0x46, 0x96, 0x64, 0xcb, 0x81, - 0xc3, 0x9e, 0xd4, 0xef, 0xf5, 0x7b, 0x6f, 0x5e, 0xbf, 0xcf, 0x7e, 0x2d, 0xa8, 0x04, 0xc3, 0x23, - 0xcf, 0xed, 0xd7, 0x83, 0x90, 0x32, 0x8a, 0x56, 0x3c, 0xd7, 0x3f, 0x23, 0xa1, 0xb3, 0x55, 0x97, - 0x68, 0xf3, 0xd6, 0x09, 0xa5, 0x27, 0x1e, 0xd9, 0x10, 0xdb, 0x47, 0xc3, 0xe3, 0x0d, 0x67, 0x18, - 0xda, 0xcc, 0xa5, 0xbe, 0x64, 0x30, 0x6b, 0x7d, 0x3a, 0x18, 0x50, 0x7f, 0xe3, 0x94, 0xd8, 0x1e, - 0x3b, 0xed, 0x9f, 0x92, 0xfe, 0x99, 0xdc, 0xb1, 0x0a, 0x90, 0x6b, 0x0e, 0x02, 0x36, 0xb2, 0x5e, - 0x40, 0xf9, 0x87, 0x24, 0x8c, 0x5c, 0xea, 0xef, 0xf9, 0xc7, 0x14, 0xbd, 0x0d, 0xa5, 0x13, 0xaa, - 0x10, 0xb5, 0xf4, 0x6a, 0x7a, 0xbd, 0x84, 0xc7, 0x08, 0xbe, 0x7b, 0x34, 0x74, 0x3d, 0x67, 0xd7, - 0x66, 0xa4, 0x96, 0x91, 0xbb, 0x31, 0x02, 0xdd, 0x85, 0xe5, 0x90, 0x78, 0xc4, 0x8e, 0x88, 0x16, - 0x90, 0x15, 0x24, 0xe7, 0xb0, 0xd6, 0x7d, 0xb8, 0xbe, 0xef, 0x46, 0xac, 0x43, 0xc2, 0x97, 0x6e, - 0x9f, 0x44, 0x98, 0xbc, 0x18, 0x92, 0x88, 0x71, 0xe1, 0xbe, 0x3d, 0x20, 0x51, 0x60, 0xf7, 0x89, - 0xfe, 0x74, 0x8c, 0xb0, 0xf6, 0xe1, 0xc6, 0x24, 0x53, 0x14, 0x50, 0x3f, 0x22, 0xe8, 0x43, 0x28, - 0x46, 0x0a, 0x57, 0x4b, 0xaf, 0x66, 0xd7, 0xcb, 0x5b, 0xb5, 0xfa, 0x39, 0x33, 0xd5, 0x15, 0x13, - 0x8e, 0x29, 0xad, 0xc7, 0x50, 0x50, 0x48, 0x84, 0xc0, 0xe0, 0x5f, 0x51, 0x5f, 0x14, 0xeb, 0x49, - 0x55, 0x32, 0xe7, 0x55, 0xd9, 0x80, 0x15, 0xae, 0x4a, 0x9b, 0x3a, 0x0b, 0xea, 0xfe, 0x29, 0x54, - 0xc7, 0x0c, 0x4a, 0xef, 0x75, 0x30, 0x02, 0xea, 0x68, 0x9d, 0x6f, 0x4c, 0xe9, 0xdc, 0xa6, 0x0e, - 0x16, 0x14, 0xd6, 0x9f, 0x0d, 0xc8, 0xb6, 0xa9, 0x33, 0x53, 0xd1, 0x1b, 0x90, 0x0b, 0xa8, 0xb3, - 0xd7, 0x56, 0x4a, 0x4a, 0x00, 0xad, 0x02, 0x38, 0x24, 0xf0, 0xe8, 0x68, 0x40, 0x7c, 0x26, 0x9d, - 0xd0, 0x4a, 0xe1, 0x04, 0x0e, 0xdd, 0x86, 0x72, 0x48, 0x02, 0xcf, 0xed, 0xdb, 0xbd, 0x88, 0xb0, - 0x1a, 0x68, 0x12, 0x85, 0xec, 0x10, 0x86, 0x3e, 0x82, 0x9b, 0x0a, 0xe2, 0x01, 0xd5, 0xeb, 0x53, - 0x9f, 0x85, 0xd4, 0xf3, 0x48, 0x58, 0x2b, 0x2b, 0xea, 0x37, 0x12, 0xfb, 0x3b, 0xf1, 0x36, 0x5a, - 0x83, 0x4a, 0xc4, 0x6c, 0x46, 0x8e, 0x87, 0x9e, 0x10, 0x5e, 0x51, 0xe4, 0x65, 0x8d, 0xe5, 0xd2, - 0xdf, 0x01, 0x70, 0x6c, 0x32, 0xa0, 0xbe, 0x20, 0x59, 0x52, 0x24, 0x25, 0x89, 0xe3, 0x04, 0x08, - 0xb2, 0x3f, 0xa6, 0x47, 0xb5, 0x65, 0xb5, 0xc3, 0x01, 0x74, 0x13, 0xf2, 0x5c, 0xc6, 0x30, 0xaa, - 0x19, 0xe2, 0xb8, 0x0a, 0xe2, 0x56, 0xb0, 0x1d, 0x87, 0x38, 0xb5, 0xdc, 0x6a, 0x7a, 0xbd, 0x88, - 0x25, 0x80, 0x76, 0x60, 0x25, 0x72, 0xfd, 0x3e, 0xd9, 0xb7, 0x23, 0x86, 0x49, 0x40, 0x43, 0x56, - 0xcb, 0xaf, 0xa6, 0xd7, 0xcb, 0x5b, 0x6f, 0xd6, 0x65, 0xda, 0xd4, 0x75, 0xda, 0xd4, 0x77, 0x55, - 0xda, 0xe0, 0xf3, 0x1c, 0x68, 0x13, 0xae, 0x8f, 0x4f, 0x7e, 0x10, 0xbb, 0xb8, 0x20, 0xbe, 0x3f, - 0x6b, 0x0b, 0x59, 0x50, 0x51, 0xe8, 0xb6, 0x67, 0xfb, 0xa4, 0x56, 0x14, 0x3a, 0x4d, 0xe0, 0xd0, - 0x07, 0x90, 0x1f, 0x06, 0xcc, 0x1d, 0x90, 0x5a, 0xe9, 0x32, 0x8d, 0x14, 0x21, 0xba, 0x05, 0x10, - 0x84, 0xf4, 0xcb, 0x11, 0x26, 0xb6, 0x33, 0xaa, 0xad, 0x08, 0xa1, 0x09, 0x0c, 0xff, 0xac, 0x80, - 0x74, 0xea, 0x55, 0x85, 0x86, 0x13, 0xb8, 0x46, 0x01, 0x72, 0xf4, 0x95, 0x4f, 0x42, 0xeb, 0xb7, - 0x19, 0x80, 0xae, 0x1d, 0xe8, 0xe8, 0x45, 0x90, 0x0d, 0xa8, 0x23, 0x03, 0x8b, 0xdb, 0x3a, 0xa0, - 0xce, 0xb9, 0x18, 0xca, 0xcc, 0x88, 0xa1, 0x9b, 0x90, 0x1f, 0xd8, 0x5f, 0xe2, 0x20, 0x12, 0x11, - 0x96, 0xc1, 0x0a, 0xe2, 0x78, 0x46, 0xdb, 0xdc, 0xdc, 0xdc, 0x4b, 0x4b, 0x58, 0x41, 0x3c, 0x7e, - 0x19, 0xdd, 0x6b, 0x0b, 0x27, 0x95, 0xb0, 0x58, 0x23, 0x13, 0x8a, 0xc7, 0x21, 0x1d, 0xb4, 0xb5, - 0x73, 0x96, 0x70, 0x0c, 0x73, 0x39, 0x7c, 0xbd, 0xd7, 0x56, 0xd6, 0x56, 0x90, 0x88, 0x82, 0xfe, - 0x29, 0x19, 0x48, 0xd3, 0xf2, 0x28, 0x10, 0x90, 0xd0, 0x87, 0xb0, 0x53, 0xea, 0x08, 0xa3, 0x96, - 0xb0, 0x82, 0x78, 0x6e, 0xda, 0x43, 0x76, 0x4a, 0x43, 0x97, 0x8d, 0x64, 0xa4, 0xe3, 0x31, 0x82, - 0x6b, 0x15, 0xd8, 0xec, 0x54, 0x06, 0x35, 0x16, 0xeb, 0x4f, 0x32, 0xb5, 0x74, 0xa3, 0x08, 0x79, - 0x66, 0x87, 0x27, 0x84, 0x59, 0xff, 0xcc, 0xc1, 0x8d, 0xae, 0x1d, 0x34, 0x46, 0x98, 0x44, 0x74, - 0x18, 0xf6, 0x89, 0x36, 0xdb, 0x27, 0x9a, 0x44, 0x58, 0xae, 0xbc, 0x65, 0x4d, 0x25, 0xb1, 0xe6, - 0xe8, 0x10, 0x8f, 0xf4, 0xa5, 0x3b, 0x25, 0x07, 0xda, 0x86, 0xdc, 0xc0, 0x66, 0xfd, 0x53, 0x61, - 0xd9, 0xf2, 0xd6, 0xfb, 0x53, 0xac, 0xb3, 0xbe, 0x58, 0x7f, 0xca, 0x59, 0xb0, 0xe4, 0x9c, 0x67, - 0x7f, 0xf3, 0xf7, 0x06, 0xe4, 0x04, 0x21, 0xda, 0x81, 0xac, 0xed, 0x79, 0x4a, 0xbb, 0x8d, 0x2b, - 0x7c, 0xa2, 0xde, 0x21, 0x2f, 0x78, 0x20, 0xd8, 0x9e, 0x27, 0x84, 0xf8, 0x23, 0xa5, 0xe7, 0x6b, - 0x09, 0xf1, 0x47, 0xe8, 0x3b, 0x90, 0xf5, 0xa9, 0x2c, 0x45, 0x57, 0x3b, 0x2c, 0x17, 0xe0, 0x53, - 0x86, 0x5a, 0x50, 0x71, 0x48, 0xc4, 0x5c, 0x5f, 0x64, 0x85, 0x2c, 0x00, 0x0b, 0x59, 0xbc, 0x95, - 0xc2, 0x13, 0x9c, 0xe8, 0x7b, 0x60, 0x9c, 0x32, 0x16, 0x88, 0x30, 0x2c, 0x6f, 0x6d, 0x5e, 0xe5, - 0x40, 0x2d, 0xc6, 0x82, 0x56, 0x0a, 0x0b, 0x7e, 0x73, 0x1f, 0xb2, 0x1d, 0xf2, 0x02, 0x35, 0xa1, - 0x20, 0xdc, 0x11, 0xb7, 0x9f, 0x2b, 0xb9, 0x52, 0xf3, 0x9a, 0x23, 0x30, 0xb8, 0x74, 0x54, 0x8b, - 0x83, 0x5b, 0x67, 0xa3, 0x0e, 0xef, 0x5a, 0x1c, 0xde, 0x3a, 0x19, 0x75, 0x80, 0xdf, 0x4a, 0x06, - 0xb8, 0xae, 0xf6, 0x89, 0x10, 0xbf, 0xa1, 0x42, 0xdc, 0x50, 0x5b, 0x02, 0xe2, 0xc5, 0x40, 0x7c, - 0x3c, 0x5e, 0x58, 0xff, 0x4e, 0x03, 0x70, 0x25, 0x9e, 0x4a, 0xb1, 0x2d, 0x80, 0x90, 0x9c, 0xb8, - 0x11, 0x23, 0x21, 0x91, 0xc5, 0x61, 0x79, 0xeb, 0xee, 0xd4, 0xe1, 0xc6, 0x0c, 0x75, 0x1c, 0x53, - 0xcb, 0x56, 0xa2, 0x21, 0x74, 0x07, 0x2a, 0x43, 0x3f, 0x21, 0x4b, 0x1f, 0x60, 0x02, 0x6b, 0xf9, - 0x00, 0x63, 0x09, 0xa8, 0x00, 0xd9, 0x27, 0xcd, 0x6e, 0x35, 0x85, 0x8a, 0x60, 0xb4, 0x0f, 0x3b, - 0xdd, 0x6a, 0x9a, 0xa3, 0xda, 0xcf, 0xba, 0xd5, 0x0c, 0x02, 0xc8, 0xef, 0x36, 0xf7, 0x9b, 0xdd, - 0x66, 0x35, 0x8b, 0x4a, 0x90, 0x6b, 0x6f, 0x77, 0x77, 0x5a, 0x55, 0x03, 0x95, 0xa1, 0x70, 0xd8, - 0xee, 0xee, 0x1d, 0x1e, 0x74, 0xaa, 0x39, 0x0e, 0xec, 0x1c, 0x1e, 0x1c, 0x34, 0x77, 0xba, 0xd5, - 0x3c, 0x97, 0xd1, 0x6a, 0x6e, 0xef, 0x56, 0x0b, 0x9c, 0xbc, 0x8b, 0xb7, 0x77, 0x9a, 0xd5, 0x62, - 0x23, 0x0f, 0x06, 0x1b, 0x05, 0xc4, 0xfa, 0x75, 0x1a, 0xf2, 0x1d, 0x69, 0xe3, 0xdd, 0x19, 0x47, - 0x9e, 0x8e, 0x31, 0x49, 0xfc, 0xbf, 0x1e, 0xf7, 0xf6, 0xc4, 0x71, 0xb9, 0x86, 0xdd, 0x6e, 0xbb, - 0x9a, 0xe2, 0x1a, 0xf2, 0x55, 0xa7, 0x9a, 0x8e, 0x35, 0xec, 0x42, 0x69, 0xaf, 0xbd, 0xed, 0x38, - 0x21, 0x89, 0x78, 0xb3, 0x33, 0xdc, 0xe0, 0xe5, 0x87, 0x42, 0xbb, 0x02, 0xf7, 0x26, 0x87, 0xd0, - 0xfb, 0x02, 0xfb, 0x50, 0xa5, 0xe9, 0x1b, 0x53, 0x3a, 0xef, 0xb5, 0x5f, 0x3e, 0x54, 0xc4, 0x0f, - 0x1b, 0x06, 0x64, 0xdc, 0xc0, 0xda, 0x04, 0x83, 0x63, 0x79, 0xf7, 0x3c, 0x76, 0xc3, 0x48, 0x56, - 0xb1, 0x3c, 0x96, 0x00, 0xaf, 0x8b, 0x9e, 0x1d, 0xc9, 0xca, 0x9f, 0xc7, 0x62, 0x6d, 0xed, 0x03, - 0x74, 0xfb, 0x81, 0x56, 0xe4, 0x1e, 0x97, 0xa2, 0x8a, 0x8b, 0x39, 0xe3, 0x83, 0x8a, 0x0e, 0x67, - 0xdc, 0x40, 0x54, 0x59, 0x5e, 0xe3, 0x33, 0xa2, 0xc6, 0x8b, 0xb5, 0xe5, 0x40, 0xb6, 0x49, 0xb9, - 0x98, 0xea, 0x49, 0x18, 0xf4, 0x7b, 0xb2, 0x97, 0xf7, 0xfa, 0xd4, 0x91, 0xb1, 0xbf, 0xd4, 0x4a, - 0xe1, 0x65, 0xbe, 0xd3, 0x11, 0x1b, 0x3b, 0xd4, 0x21, 0x9c, 0x36, 0x24, 0x11, 0x61, 0x3d, 0x12, - 0x86, 0x34, 0x94, 0xb4, 0x19, 0x4d, 0x2b, 0x76, 0x9a, 0x7c, 0x83, 0xd3, 0x36, 0x72, 0x90, 0x25, - 0xbe, 0x63, 0xfd, 0x75, 0x19, 0x8a, 0x5d, 0x3b, 0x68, 0xbe, 0xe4, 0x2d, 0xeb, 0x3e, 0xe4, 0x65, - 0x16, 0x2a, 0xb5, 0xdf, 0x9a, 0xce, 0xd5, 0xf8, 0x7c, 0x58, 0x91, 0xa2, 0x27, 0x50, 0x96, 0xab, - 0xde, 0x80, 0x30, 0x5b, 0xd5, 0x8d, 0xbb, 0xb3, 0xb2, 0x5c, 0x7c, 0xa4, 0xde, 0xf4, 0x9d, 0x80, - 0xba, 0x3e, 0x7b, 0x4a, 0x98, 0x8d, 0x41, 0xb2, 0xf2, 0x35, 0xfa, 0x16, 0x94, 0x13, 0x95, 0x48, - 0xb9, 0xea, 0x42, 0x15, 0x92, 0xf4, 0xe8, 0x33, 0xa8, 0x26, 0x40, 0xa9, 0x8c, 0x71, 0x25, 0x65, - 0x56, 0x12, 0xfc, 0x42, 0xa3, 0x06, 0x40, 0x48, 0x87, 0x4c, 0x9d, 0xac, 0x20, 0x84, 0xad, 0xcd, - 0x17, 0x86, 0x39, 0xad, 0x90, 0x54, 0x0a, 0xf5, 0x12, 0x7d, 0x06, 0x2b, 0xe2, 0x92, 0xd1, 0x73, - 0xdc, 0x50, 0x96, 0x5c, 0xd1, 0xc9, 0x97, 0xb7, 0xd6, 0xe7, 0x0b, 0x6a, 0x73, 0x86, 0x5d, 0x4d, - 0x8f, 0x97, 0x83, 0x09, 0x18, 0x7d, 0xa8, 0x4a, 0xb4, 0x6c, 0x17, 0xb7, 0xe6, 0xcb, 0x99, 0x28, - 0xc8, 0xbf, 0x4a, 0x43, 0x25, 0x79, 0x5c, 0xf4, 0x7d, 0xc8, 0x7b, 0xf6, 0x11, 0xf1, 0x74, 0x65, - 0xde, 0x5a, 0xcc, 0x4c, 0xf5, 0x7d, 0xc1, 0xd4, 0xf4, 0x59, 0x38, 0xc2, 0x4a, 0x82, 0xf9, 0x08, - 0xca, 0x09, 0x34, 0xaa, 0x42, 0xf6, 0x8c, 0x8c, 0xd4, 0x55, 0x9c, 0x2f, 0x79, 0x16, 0xbd, 0xb4, - 0xbd, 0xa1, 0x1e, 0x17, 0x24, 0xf0, 0x49, 0xe6, 0xe3, 0xb4, 0xf9, 0x8b, 0x34, 0x94, 0x62, 0xcb, - 0xa1, 0x27, 0xe7, 0x94, 0xda, 0x58, 0xc0, 0xdc, 0xff, 0x6f, 0x8d, 0xfe, 0x53, 0x50, 0xdd, 0xe6, - 0x10, 0x2a, 0xa1, 0xec, 0x47, 0x3d, 0xd7, 0x77, 0xf5, 0x3d, 0xe6, 0xde, 0xc5, 0x06, 0xaf, 0xab, - 0x16, 0xb6, 0xe7, 0xbb, 0x8c, 0x5f, 0xeb, 0xc3, 0x31, 0x88, 0x30, 0x2c, 0x85, 0x6a, 0xc2, 0x91, - 0x12, 0x2f, 0xb8, 0xde, 0x4c, 0x48, 0x94, 0x3c, 0x4a, 0x64, 0x25, 0x4c, 0xc0, 0x52, 0x49, 0x25, - 0x93, 0xf8, 0x8e, 0x8a, 0x8a, 0x7b, 0x0b, 0x8a, 0x6c, 0xfa, 0x8e, 0x54, 0x32, 0x06, 0xcd, 0x87, - 0x50, 0xec, 0xb0, 0x90, 0xd8, 0x83, 0x3d, 0x31, 0x54, 0x1d, 0xd9, 0x91, 0xaa, 0x38, 0x58, 0xac, - 0xe5, 0x98, 0xc1, 0xf7, 0x85, 0xf6, 0x06, 0x56, 0x90, 0xf9, 0xf7, 0x34, 0x94, 0x13, 0x67, 0x47, - 0x1f, 0x41, 0xc6, 0x75, 0x94, 0xcd, 0xde, 0xbb, 0x44, 0x1d, 0xfd, 0x41, 0x9c, 0x71, 0x1d, 0x5e, - 0x86, 0x12, 0xad, 0x7c, 0x56, 0x0d, 0x18, 0x77, 0xd5, 0xb8, 0xcb, 0x6f, 0xc4, 0x37, 0x03, 0x69, - 0x80, 0xaf, 0xcd, 0xe9, 0x4b, 0xf1, 0x85, 0x61, 0xe2, 0xde, 0x6b, 0xcc, 0xbb, 0xf7, 0xe6, 0xc6, - 0xf7, 0x5e, 0xf3, 0x77, 0x69, 0xa8, 0x24, 0x5d, 0xf1, 0xfa, 0x27, 0x7c, 0x02, 0x48, 0x4c, 0x52, - 0xbd, 0x89, 0xf0, 0xca, 0x5c, 0x36, 0xec, 0x54, 0x05, 0x53, 0xd2, 0xc6, 0xef, 0x40, 0x99, 0x27, - 0xb7, 0xea, 0x0e, 0xe2, 0xe8, 0x4b, 0x18, 0x38, 0x4a, 0xb6, 0x05, 0xf3, 0x37, 0x19, 0xee, 0x94, - 0xd8, 0xb9, 0x5f, 0x01, 0x95, 0xf7, 0xe0, 0xba, 0x16, 0x94, 0xcc, 0x84, 0xec, 0x65, 0x92, 0xae, - 0x29, 0x49, 0x09, 0xfb, 0xbf, 0x0b, 0xcb, 0xb1, 0x90, 0xa3, 0x11, 0x23, 0xf2, 0xde, 0x6b, 0xe0, - 0x38, 0xc9, 0x1a, 0x1c, 0x89, 0xee, 0x42, 0x96, 0xd0, 0x48, 0x75, 0xa6, 0xe9, 0xa7, 0x84, 0x26, - 0x8d, 0x30, 0x27, 0xe0, 0x37, 0x3d, 0xc2, 0x4f, 0x6f, 0x7d, 0x0c, 0xcb, 0x93, 0x25, 0x98, 0x5f, - 0x97, 0x9e, 0x1d, 0xfc, 0xe0, 0xe0, 0xf0, 0xf3, 0x83, 0x6a, 0x8a, 0x03, 0x7b, 0x07, 0x8d, 0xc3, - 0x67, 0x07, 0xbb, 0xd5, 0x34, 0xaa, 0x40, 0xf1, 0xf0, 0x59, 0x57, 0x42, 0x99, 0xb1, 0x88, 0x55, - 0x28, 0x6e, 0x07, 0xae, 0x68, 0xb7, 0xbc, 0xd2, 0x88, 0x86, 0xac, 0xaa, 0x8f, 0x04, 0xf8, 0x90, - 0x59, 0x6a, 0x53, 0x47, 0x90, 0x44, 0xe8, 0x31, 0xe4, 0x05, 0x5a, 0xd7, 0xbd, 0xb5, 0x59, 0x2f, - 0x1e, 0x92, 0x36, 0x5e, 0x61, 0xc5, 0x62, 0xfe, 0x23, 0x0d, 0x45, 0x8d, 0x44, 0x18, 0x4a, 0x7c, - 0x98, 0xb6, 0x5d, 0x9f, 0x84, 0xca, 0xd1, 0x5b, 0x0b, 0x08, 0xab, 0xef, 0x68, 0x26, 0x01, 0xf2, - 0x2b, 0x72, 0x2c, 0xc6, 0x7c, 0x09, 0xcb, 0x93, 0xdb, 0xa8, 0x06, 0x85, 0x01, 0x89, 0x22, 0xfb, - 0x44, 0x3f, 0xb8, 0x68, 0x90, 0xe7, 0xd5, 0xf8, 0xfb, 0xea, 0x71, 0x28, 0x46, 0x70, 0x5b, 0xb8, - 0x03, 0xce, 0x25, 0xdf, 0xbe, 0x24, 0xc0, 0x4b, 0x4a, 0x48, 0xec, 0x88, 0xfa, 0xfa, 0xe5, 0x42, - 0x42, 0xc2, 0x9c, 0xc2, 0x58, 0x6d, 0x28, 0xea, 0x09, 0xe1, 0xe2, 0xc7, 0x24, 0x31, 0x46, 0x8f, - 0x02, 0x5d, 0xd5, 0xc5, 0x3a, 0x7e, 0x1a, 0xca, 0x8e, 0x9f, 0x86, 0xac, 0x17, 0x70, 0x6d, 0x6a, - 0x18, 0x42, 0x0f, 0xa0, 0x18, 0x92, 0x89, 0x2b, 0xd0, 0x9b, 0x73, 0x47, 0x28, 0x1c, 0x93, 0xf2, - 0x38, 0x14, 0x5d, 0xa7, 0x17, 0x09, 0x49, 0x54, 0x9f, 0x7b, 0x49, 0x60, 0x3b, 0x0a, 0x69, 0x7d, - 0x01, 0x4b, 0x9a, 0x59, 0x1a, 0xf1, 0x35, 0x3f, 0x17, 0xc7, 0x53, 0x26, 0x19, 0x4f, 0x7f, 0xca, - 0x00, 0xe2, 0x49, 0xdf, 0x19, 0x0e, 0x06, 0x76, 0x38, 0xd2, 0x53, 0xf8, 0xb7, 0xa1, 0x18, 0x6b, - 0xb5, 0xf8, 0x1c, 0x1e, 0xf3, 0xf0, 0x0a, 0xc3, 0xdc, 0x01, 0xe9, 0xbd, 0x72, 0x7d, 0x87, 0xbe, - 0x52, 0x9f, 0x04, 0x8e, 0xfa, 0x5c, 0x60, 0xd0, 0x37, 0xc0, 0xf0, 0xa9, 0xaf, 0xcb, 0xee, 0xcd, - 0xe9, 0xf4, 0x1a, 0x04, 0x6c, 0xc4, 0x6f, 0x21, 0x9c, 0x0a, 0x7d, 0x0a, 0x65, 0x46, 0x7b, 0xf1, - 0xa9, 0x8d, 0x4b, 0x4e, 0xcd, 0x47, 0x07, 0x46, 0x63, 0xd7, 0x7f, 0x17, 0x96, 0x8e, 0x43, 0x3a, - 0x18, 0xf3, 0xe7, 0x2e, 0xe7, 0xaf, 0x70, 0x8e, 0x58, 0xc2, 0xd7, 0x01, 0xa2, 0x33, 0x57, 0x16, - 0xcc, 0x48, 0xdc, 0xc4, 0x8a, 0xb8, 0xc4, 0x31, 0xdc, 0x74, 0x51, 0x03, 0xa0, 0x48, 0x87, 0xec, - 0x88, 0x0e, 0x7d, 0xc7, 0xfa, 0x5b, 0x1a, 0xae, 0x4f, 0x18, 0x54, 0x3d, 0x4d, 0x3e, 0x82, 0x0c, - 0x3d, 0x9b, 0x5b, 0x42, 0x67, 0x70, 0xd4, 0x0f, 0xcf, 0x5a, 0x29, 0x9c, 0xa1, 0x67, 0xe8, 0x61, - 0xd2, 0x73, 0xb3, 0xae, 0x6e, 0x13, 0xf1, 0xd1, 0x4a, 0x29, 0xdf, 0x9a, 0xdb, 0x90, 0x39, 0x3c, - 0x43, 0x8f, 0x41, 0xbc, 0x11, 0xf6, 0x98, 0x7d, 0xe4, 0xc5, 0xf3, 0xb4, 0x39, 0x53, 0x83, 0x2e, - 0x27, 0xc1, 0x10, 0xe9, 0xa5, 0x38, 0x99, 0xae, 0x8a, 0x62, 0x92, 0x6d, 0xd8, 0x91, 0x2b, 0x66, - 0x87, 0x08, 0xad, 0xc1, 0x52, 0x34, 0xec, 0xf7, 0x49, 0xc4, 0xc7, 0x8b, 0xa1, 0x2f, 0xef, 0x39, - 0x06, 0xae, 0x28, 0xe4, 0x0e, 0xc7, 0x71, 0xa2, 0x63, 0xdb, 0xf5, 0x86, 0x21, 0x51, 0x44, 0xb2, - 0xf9, 0x57, 0x14, 0x52, 0x12, 0xdd, 0xe1, 0x89, 0xc0, 0x88, 0xdf, 0x1f, 0xf5, 0x06, 0x51, 0x2f, - 0x78, 0xb0, 0x29, 0xa2, 0xc2, 0xc0, 0x15, 0x85, 0x7d, 0x1a, 0xb5, 0x1f, 0x6c, 0x9e, 0xa7, 0x7a, - 0xf4, 0x40, 0x95, 0xed, 0x04, 0xd5, 0xa3, 0x07, 0x53, 0x54, 0x8f, 0x84, 0xb3, 0x27, 0xa9, 0x1e, - 0xa1, 0x7b, 0x70, 0x8d, 0x79, 0x51, 0xdc, 0x94, 0xa4, 0x6a, 0x79, 0x41, 0xb8, 0xc2, 0x3c, 0xfd, - 0x00, 0x2d, 0xb4, 0xb3, 0xfe, 0x65, 0x40, 0x29, 0x36, 0x0e, 0x6a, 0x40, 0x29, 0xa0, 0x4e, 0xef, - 0x24, 0xa4, 0x43, 0x3d, 0xa6, 0xad, 0xcd, 0xb7, 0x25, 0xaf, 0x93, 0x4f, 0x38, 0x69, 0x2b, 0x85, - 0x8b, 0x81, 0x5a, 0x9b, 0xbf, 0x34, 0x44, 0xe1, 0x15, 0x00, 0x7a, 0x0c, 0x46, 0x48, 0x5f, 0x69, - 0xbf, 0xbc, 0xb7, 0x80, 0xac, 0x3a, 0xa6, 0xaf, 0xb0, 0x60, 0x32, 0xff, 0x98, 0x85, 0x2c, 0xa6, - 0xaf, 0x5e, 0xb7, 0x24, 0x5c, 0x9a, 0xa5, 0xeb, 0x50, 0x1d, 0x90, 0xe8, 0x94, 0x38, 0x3d, 0x7e, - 0x68, 0x69, 0x26, 0xe9, 0x9b, 0x65, 0x89, 0x6f, 0x53, 0x47, 0xfa, 0xf0, 0x1e, 0x5c, 0x0b, 0x87, - 0xbe, 0xef, 0xfa, 0x27, 0x09, 0x52, 0xe9, 0xa0, 0x15, 0xb5, 0x11, 0xd3, 0xae, 0x43, 0x95, 0xfb, - 0x7f, 0x42, 0xaa, 0x34, 0xfe, 0xb2, 0xc4, 0xc7, 0x94, 0x1f, 0x40, 0x4e, 0xa6, 0x5c, 0x6e, 0xce, - 0x95, 0x6e, 0x1c, 0x8f, 0x58, 0x52, 0xa2, 0x2f, 0x60, 0x49, 0xf6, 0xb7, 0xde, 0xd1, 0x88, 0xcb, - 0xaf, 0x15, 0x84, 0x61, 0x3f, 0x5e, 0xd0, 0xb0, 0x75, 0xd9, 0xe0, 0x1a, 0x23, 0xde, 0xe1, 0xc4, - 0x68, 0x50, 0x26, 0x63, 0x8c, 0xf9, 0x1c, 0xaa, 0xe7, 0x09, 0x66, 0x0c, 0x09, 0x9b, 0xc9, 0x21, - 0x61, 0x56, 0xb2, 0xc5, 0x8d, 0x34, 0x31, 0x40, 0xf0, 0xb6, 0x25, 0x72, 0xd4, 0xfa, 0x49, 0x06, - 0xaa, 0x5d, 0x1a, 0x88, 0x49, 0x25, 0xfa, 0x8a, 0x56, 0xe4, 0x35, 0xa8, 0x30, 0xda, 0x1b, 0x5f, - 0x85, 0x73, 0xfa, 0xff, 0x08, 0x46, 0xb7, 0xe3, 0xeb, 0xf0, 0x06, 0xe4, 0x39, 0x91, 0xe7, 0xa9, - 0xff, 0x08, 0xe6, 0x0b, 0xcd, 0x31, 0xba, 0xed, 0x79, 0x13, 0x85, 0xf4, 0xe7, 0x69, 0xb8, 0x96, - 0xb0, 0x82, 0x2a, 0xa3, 0x0f, 0x20, 0x2f, 0xa6, 0xe4, 0x68, 0xee, 0x63, 0x83, 0x60, 0x10, 0x8e, - 0x6d, 0xa5, 0xb0, 0x22, 0x7e, 0xdd, 0x12, 0x3a, 0x51, 0xff, 0xfe, 0x92, 0x06, 0x18, 0x0b, 0x47, - 0xf7, 0x27, 0x12, 0xf7, 0x9d, 0x0b, 0xf4, 0x48, 0x24, 0xec, 0xcf, 0xd2, 0x32, 0x61, 0x6f, 0x40, - 0x4e, 0x68, 0xa6, 0x2f, 0x77, 0x02, 0xb8, 0xdc, 0x47, 0x13, 0xd3, 0x47, 0xfe, 0xfc, 0xf4, 0x71, - 0xf5, 0x6c, 0xd9, 0xfa, 0x43, 0x0e, 0xb2, 0xdb, 0x81, 0x8b, 0x9e, 0x43, 0x39, 0xd1, 0x82, 0xd0, - 0xda, 0xc5, 0x0d, 0x4a, 0x44, 0xa4, 0x79, 0x67, 0x91, 0x2e, 0x66, 0xa5, 0x50, 0x17, 0x4a, 0xb1, - 0x1f, 0xd1, 0xed, 0xe9, 0xe9, 0xe1, 0x5c, 0xa4, 0x9b, 0xd6, 0x45, 0x24, 0xb1, 0xd4, 0xcf, 0xa0, - 0xa8, 0xff, 0xfe, 0x43, 0xab, 0x53, 0x1c, 0xe7, 0xfe, 0x4a, 0x34, 0x6f, 0x5f, 0x40, 0x11, 0x8b, - 0xfc, 0x11, 0x54, 0x92, 0xff, 0x86, 0xa2, 0x3b, 0x33, 0x99, 0xce, 0xfd, 0xc3, 0x6a, 0xbe, 0x7b, - 0x09, 0x55, 0x2c, 0x7e, 0x17, 0xb2, 0x5d, 0x3b, 0x40, 0x6f, 0xcd, 0x9a, 0x9f, 0xb4, 0xb0, 0x37, - 0xe7, 0x0e, 0x57, 0x56, 0xf6, 0xa7, 0x99, 0xf4, 0x66, 0x1a, 0x3d, 0x83, 0xa5, 0x89, 0xa7, 0x6f, - 0xf4, 0xee, 0x42, 0x4f, 0xe3, 0x17, 0x49, 0x4e, 0x6d, 0xa6, 0xd1, 0x36, 0x14, 0xf4, 0xff, 0xd1, - 0x73, 0xb2, 0xd4, 0x7c, 0x7b, 0x0a, 0x9f, 0xf8, 0x8f, 0xdb, 0x4a, 0x21, 0x0f, 0x4a, 0x1d, 0xe2, - 0x1d, 0xef, 0x9c, 0x92, 0xfe, 0x19, 0xfa, 0xe6, 0x98, 0x58, 0xfe, 0x5d, 0x5e, 0x4f, 0xfe, 0x5d, - 0x1e, 0xd3, 0x69, 0xed, 0xea, 0x8b, 0x92, 0x6b, 0x6b, 0x36, 0xee, 0x3f, 0xff, 0xe0, 0xc4, 0x65, - 0xa7, 0xc3, 0x23, 0xce, 0xb0, 0xa1, 0xb8, 0xf5, 0xef, 0xd6, 0xc6, 0xf8, 0x4f, 0xc4, 0x8d, 0x13, - 0xe2, 0x6f, 0x48, 0x85, 0x8f, 0xf2, 0x62, 0x40, 0xbc, 0xff, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xbd, 0x6b, 0x26, 0x27, 0x02, 0x20, 0x00, 0x00, +func init() { proto.RegisterFile("public.proto", fileDescriptor_public_3344f8c8d1a07d0f) } + +var fileDescriptor_public_3344f8c8d1a07d0f = []byte{ + // 2794 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0xcd, 0x77, 0x23, 0x47, + 0x11, 0xd7, 0xc7, 0xe8, 0xab, 0x24, 0xdb, 0xda, 0x5e, 0x67, 0x51, 0x26, 0x61, 0xe3, 0x1d, 0x6f, + 0x36, 0x7e, 0x1b, 0x90, 0x1d, 0x6f, 0x76, 0x93, 0xcd, 0x86, 0x0f, 0xcb, 0x56, 0xd6, 0x06, 0xaf, + 0xad, 0xb4, 0xb4, 0xe4, 0xbd, 0xbc, 0xf0, 0xf4, 0xc6, 0x9a, 0xb6, 0x3d, 0x78, 0x34, 0x3d, 0x3b, + 0xd3, 0xda, 0x8d, 0xce, 0x5c, 0xb8, 0x00, 0x17, 0x38, 0x73, 0x86, 0x1b, 0x17, 0xf8, 0x1f, 0x38, + 0xf0, 0xe0, 0xc0, 0x83, 0x13, 0xdc, 0xb8, 0x72, 0xe1, 0xcc, 0xe3, 0xf5, 0xd7, 0x68, 0xc6, 0x92, + 0x6c, 0xef, 0xc2, 0x21, 0x27, 0x75, 0x55, 0xff, 0xaa, 0xa6, 0xba, 0xba, 0xba, 0xaa, 0xab, 0x05, + 0xb5, 0x60, 0x74, 0xe4, 0xb9, 0x83, 0x66, 0x10, 0x52, 0x46, 0xd1, 0x92, 0xe7, 0xfa, 0x67, 0x24, + 0x74, 0x36, 0x9b, 0x92, 0x6d, 0xde, 0x3c, 0xa1, 0xf4, 0xc4, 0x23, 0xeb, 0x62, 0xfa, 0x68, 0x74, + 0xbc, 0xee, 0x8c, 0x42, 0x9b, 0xb9, 0xd4, 0x97, 0x02, 0x66, 0x63, 0x40, 0x87, 0x43, 0xea, 0xaf, + 0x9f, 0x12, 0xdb, 0x63, 0xa7, 0x83, 0x53, 0x32, 0x38, 0x93, 0x33, 0x56, 0x09, 0x0a, 0xed, 0x61, + 0xc0, 0xc6, 0xd6, 0x33, 0xa8, 0xfe, 0x80, 0x84, 0x91, 0x4b, 0xfd, 0x3d, 0xff, 0x98, 0xa2, 0x37, + 0xa1, 0x72, 0x42, 0x15, 0xa3, 0x91, 0x5d, 0xc9, 0xae, 0x55, 0xf0, 0x84, 0xc1, 0x67, 0x8f, 0x46, + 0xae, 0xe7, 0xec, 0xd8, 0x8c, 0x34, 0x72, 0x72, 0x36, 0x66, 0xa0, 0x3b, 0xb0, 0x18, 0x12, 0x8f, + 0xd8, 0x11, 0xd1, 0x0a, 0xf2, 0x02, 0x72, 0x8e, 0x6b, 0xdd, 0x83, 0xeb, 0xfb, 0x6e, 0xc4, 0xba, + 0x24, 0x7c, 0xee, 0x0e, 0x48, 0x84, 0xc9, 0xb3, 0x11, 0x89, 0x18, 0x57, 0xee, 0xdb, 0x43, 0x12, + 0x05, 0xf6, 0x80, 0xe8, 0x4f, 0xc7, 0x0c, 0x6b, 0x1f, 0x96, 0xd3, 0x42, 0x51, 0x40, 0xfd, 0x88, + 0xa0, 0xf7, 0xa1, 0x1c, 0x29, 0x5e, 0x23, 0xbb, 0x92, 0x5f, 0xab, 0x6e, 0x36, 0x9a, 0xe7, 0xdc, + 0xd4, 0x54, 0x42, 0x38, 0x46, 0x5a, 0x8f, 0xa0, 0xa4, 0x98, 0x08, 0x81, 0xc1, 0xbf, 0xa2, 0xbe, + 0x28, 0xc6, 0x69, 0x53, 0x72, 0xe7, 0x4d, 0x59, 0x87, 0x25, 0x6e, 0x4a, 0x87, 0x3a, 0x57, 0xb4, + 0xfd, 0x63, 0xa8, 0x4f, 0x04, 0x94, 0xdd, 0x6b, 0x60, 0x04, 0xd4, 0xd1, 0x36, 0x2f, 0x4f, 0xd9, + 0xdc, 0xa1, 0x0e, 0x16, 0x08, 0xeb, 0x4f, 0x06, 0xe4, 0x3b, 0xd4, 0x99, 0x69, 0xe8, 0x32, 0x14, + 0x02, 0xea, 0xec, 0x75, 0x94, 0x91, 0x92, 0x40, 0x2b, 0x00, 0x0e, 0x09, 0x3c, 0x3a, 0x1e, 0x12, + 0x9f, 0xc9, 0x4d, 0xd8, 0xcd, 0xe0, 0x04, 0x0f, 0xdd, 0x82, 0x6a, 0x48, 0x02, 0xcf, 0x1d, 0xd8, + 0xfd, 0x88, 0xb0, 0x06, 0x68, 0x88, 0x62, 0x76, 0x09, 0x43, 0x1f, 0xc0, 0x0d, 0x45, 0xf1, 0x80, + 0xea, 0x0f, 0xa8, 0xcf, 0x42, 0xea, 0x79, 0x24, 0x6c, 0x54, 0x15, 0xfa, 0xb5, 0xc4, 0xfc, 0x76, + 0x3c, 0x8d, 0x56, 0xa1, 0x16, 0x31, 0x9b, 0x91, 0xe3, 0x91, 0x27, 0x94, 0xd7, 0x14, 0xbc, 0xaa, + 0xb9, 0x5c, 0xfb, 0x5b, 0x00, 0x8e, 0x4d, 0x86, 0xd4, 0x17, 0x90, 0x05, 0x05, 0xa9, 0x48, 0x1e, + 0x07, 0x20, 0xc8, 0xff, 0x88, 0x1e, 0x35, 0x16, 0xd5, 0x0c, 0x27, 0xd0, 0x0d, 0x28, 0x72, 0x1d, + 0xa3, 0xa8, 0x61, 0x88, 0xe5, 0x2a, 0x8a, 0x7b, 0xc1, 0x76, 0x1c, 0xe2, 0x34, 0x0a, 0x2b, 0xd9, + 0xb5, 0x32, 0x96, 0x04, 0xda, 0x86, 0xa5, 0xc8, 0xf5, 0x07, 0x64, 0xdf, 0x8e, 0x18, 0x26, 0x01, + 0x0d, 0x59, 0xa3, 0xb8, 0x92, 0x5d, 0xab, 0x6e, 0xbe, 0xde, 0x94, 0xc7, 0xa6, 0xa9, 0x8f, 0x4d, + 0x73, 0x47, 0x1d, 0x1b, 0x7c, 0x5e, 0x02, 0x6d, 0xc0, 0xf5, 0xc9, 0xca, 0x0f, 0xe2, 0x2d, 0x2e, + 0x89, 0xef, 0xcf, 0x9a, 0x42, 0x16, 0xd4, 0x14, 0xbb, 0xe3, 0xd9, 0x3e, 0x69, 0x94, 0x85, 0x4d, + 0x29, 0x1e, 0x7a, 0x0f, 0x8a, 0xa3, 0x80, 0xb9, 0x43, 0xd2, 0xa8, 0x5c, 0x66, 0x91, 0x02, 0xa2, + 0x9b, 0x00, 0x41, 0x48, 0xbf, 0x1c, 0x63, 0x62, 0x3b, 0xe3, 0xc6, 0x92, 0x50, 0x9a, 0xe0, 0xf0, + 0xcf, 0x0a, 0x4a, 0x1f, 0xbd, 0xba, 0xb0, 0x30, 0xc5, 0x6b, 0x95, 0xa0, 0x40, 0x5f, 0xf8, 0x24, + 0xb4, 0x7e, 0x93, 0x03, 0xe8, 0xd9, 0x81, 0x8e, 0x5e, 0x04, 0xf9, 0x80, 0x3a, 0x32, 0xb0, 0xb8, + 0xaf, 0x03, 0xea, 0x9c, 0x8b, 0xa1, 0xdc, 0x8c, 0x18, 0xba, 0x01, 0xc5, 0xa1, 0xfd, 0x25, 0x0e, + 0x22, 0x11, 0x61, 0x39, 0xac, 0x28, 0xce, 0x67, 0xb4, 0xc3, 0xdd, 0xcd, 0x77, 0x69, 0x01, 0x2b, + 0x8a, 0xc7, 0x2f, 0xa3, 0x7b, 0x1d, 0xb1, 0x49, 0x15, 0x2c, 0xc6, 0xc8, 0x84, 0xf2, 0x71, 0x48, + 0x87, 0x1d, 0xbd, 0x39, 0x0b, 0x38, 0xa6, 0xb9, 0x1e, 0x3e, 0xde, 0xeb, 0x28, 0x6f, 0x2b, 0x4a, + 0x44, 0xc1, 0xe0, 0x94, 0x0c, 0xa5, 0x6b, 0x79, 0x14, 0x08, 0x4a, 0xd8, 0x43, 0xd8, 0x29, 0x75, + 0x84, 0x53, 0x2b, 0x58, 0x51, 0xfc, 0x6c, 0xda, 0x23, 0x76, 0x4a, 0x43, 0x97, 0x8d, 0x65, 0xa4, + 0xe3, 0x09, 0x83, 0x5b, 0x15, 0xd8, 0xec, 0x54, 0x06, 0x35, 0x16, 0xe3, 0x8f, 0x72, 0x8d, 0x6c, + 0xab, 0x0c, 0x45, 0x66, 0x87, 0x27, 0x84, 0x59, 0xff, 0x2c, 0xc0, 0x72, 0xcf, 0x0e, 0x5a, 0x63, + 0x4c, 0x22, 0x3a, 0x0a, 0x07, 0x44, 0xbb, 0xed, 0x23, 0x0d, 0x11, 0x9e, 0xab, 0x6e, 0x5a, 0x53, + 0x87, 0x58, 0x4b, 0x74, 0x89, 0x47, 0x06, 0x72, 0x3b, 0xa5, 0x04, 0xda, 0x82, 0xc2, 0xd0, 0x66, + 0x83, 0x53, 0xe1, 0xd9, 0xea, 0xe6, 0xbb, 0x53, 0xa2, 0xb3, 0xbe, 0xd8, 0x7c, 0xc2, 0x45, 0xb0, + 0x94, 0x9c, 0xe7, 0x7f, 0xf3, 0x77, 0x06, 0x14, 0x04, 0x10, 0x6d, 0x43, 0xde, 0xf6, 0x3c, 0x65, + 0xdd, 0xfa, 0x4b, 0x7c, 0xa2, 0xd9, 0x25, 0xcf, 0x78, 0x20, 0xd8, 0x9e, 0x27, 0x94, 0xf8, 0x63, + 0x65, 0xe7, 0x2b, 0x29, 0xf1, 0xc7, 0xe8, 0x3b, 0x90, 0xf7, 0xa9, 0x4c, 0x45, 0x2f, 0xb7, 0x58, + 0xae, 0xc0, 0xa7, 0x0c, 0xed, 0x42, 0xcd, 0x21, 0x11, 0x73, 0x7d, 0x71, 0x2a, 0x64, 0x02, 0xb8, + 0x92, 0xc7, 0x77, 0x33, 0x38, 0x25, 0x89, 0x3e, 0x01, 0xe3, 0x94, 0xb1, 0x40, 0x84, 0x61, 0x75, + 0x73, 0xe3, 0x65, 0x16, 0xb4, 0xcb, 0x58, 0xb0, 0x9b, 0xc1, 0x42, 0xde, 0xdc, 0x87, 0x7c, 0x97, + 0x3c, 0x43, 0x6d, 0x28, 0x89, 0xed, 0x88, 0xcb, 0xcf, 0x4b, 0x6d, 0xa5, 0x96, 0x35, 0xc7, 0x60, + 0x70, 0xed, 0xa8, 0x11, 0x07, 0xb7, 0x3e, 0x8d, 0x3a, 0xbc, 0x1b, 0x71, 0x78, 0xeb, 0xc3, 0xa8, + 0x03, 0xfc, 0x66, 0x32, 0xc0, 0x75, 0xb6, 0x4f, 0x84, 0xf8, 0xb2, 0x0a, 0x71, 0x43, 0x4d, 0x09, + 0x8a, 0x27, 0x03, 0xf1, 0xf1, 0x78, 0x60, 0xfd, 0x3b, 0x0b, 0xc0, 0x8d, 0x78, 0x22, 0xd5, 0xee, + 0x02, 0x84, 0xe4, 0xc4, 0x8d, 0x18, 0x09, 0x89, 0x4c, 0x0e, 0x8b, 0x9b, 0x77, 0xa6, 0x16, 0x37, + 0x11, 0x68, 0xe2, 0x18, 0x2d, 0x4b, 0x89, 0xa6, 0xd0, 0x6d, 0xa8, 0x8d, 0xfc, 0x84, 0x2e, 0xbd, + 0x80, 0x14, 0xd7, 0xf2, 0x01, 0x26, 0x1a, 0x50, 0x09, 0xf2, 0x8f, 0xdb, 0xbd, 0x7a, 0x06, 0x95, + 0xc1, 0xe8, 0x1c, 0x76, 0x7b, 0xf5, 0x2c, 0x67, 0x75, 0x9e, 0xf6, 0xea, 0x39, 0x04, 0x50, 0xdc, + 0x69, 0xef, 0xb7, 0x7b, 0xed, 0x7a, 0x1e, 0x55, 0xa0, 0xd0, 0xd9, 0xea, 0x6d, 0xef, 0xd6, 0x0d, + 0x54, 0x85, 0xd2, 0x61, 0xa7, 0xb7, 0x77, 0x78, 0xd0, 0xad, 0x17, 0x38, 0xb1, 0x7d, 0x78, 0x70, + 0xd0, 0xde, 0xee, 0xd5, 0x8b, 0x5c, 0xc7, 0x6e, 0x7b, 0x6b, 0xa7, 0x5e, 0xe2, 0xf0, 0x1e, 0xde, + 0xda, 0x6e, 0xd7, 0xcb, 0xad, 0x22, 0x18, 0x6c, 0x1c, 0x10, 0xeb, 0x57, 0x59, 0x28, 0x76, 0xa5, + 0x8f, 0x77, 0x66, 0x2c, 0x79, 0x3a, 0xc6, 0x24, 0xf8, 0x7f, 0x5d, 0xee, 0xad, 0xd4, 0x72, 0xb9, + 0x85, 0xbd, 0x5e, 0xa7, 0x9e, 0xe1, 0x16, 0xf2, 0x51, 0xb7, 0x9e, 0x8d, 0x2d, 0xec, 0x41, 0x65, + 0xaf, 0xb3, 0xe5, 0x38, 0x21, 0x89, 0x78, 0xb1, 0x33, 0xdc, 0xe0, 0xf9, 0xfb, 0xc2, 0xba, 0x12, + 0xdf, 0x4d, 0x4e, 0xa1, 0x77, 0x05, 0xf7, 0x81, 0x3a, 0xa6, 0xaf, 0x4d, 0xd9, 0xbc, 0xd7, 0x79, + 0xfe, 0x40, 0x81, 0x1f, 0xb4, 0x0c, 0xc8, 0xb9, 0x81, 0xb5, 0x01, 0x06, 0xe7, 0xf2, 0xea, 0x79, + 0xec, 0x86, 0x91, 0xcc, 0x62, 0x45, 0x2c, 0x09, 0x9e, 0x17, 0x3d, 0x3b, 0x92, 0x99, 0xbf, 0x88, + 0xc5, 0xd8, 0xda, 0x07, 0xe8, 0x0d, 0x02, 0x6d, 0xc8, 0x5d, 0xae, 0x45, 0x25, 0x17, 0x73, 0xc6, + 0x07, 0x15, 0x0e, 0xe7, 0xdc, 0x40, 0x64, 0x59, 0x9e, 0xe3, 0x73, 0x22, 0xc7, 0x8b, 0xb1, 0xe5, + 0x40, 0xbe, 0x4d, 0xb9, 0x9a, 0xfa, 0x49, 0x18, 0x0c, 0xfa, 0xb2, 0x96, 0xf7, 0x07, 0xd4, 0x91, + 0xb1, 0xbf, 0xb0, 0x9b, 0xc1, 0x8b, 0x7c, 0xa6, 0x2b, 0x26, 0xb6, 0xa9, 0x43, 0x38, 0x36, 0x24, + 0x11, 0x61, 0x7d, 0x12, 0x86, 0x34, 0x94, 0xd8, 0x9c, 0xc6, 0x8a, 0x99, 0x36, 0x9f, 0xe0, 0xd8, + 0x56, 0x01, 0xf2, 0xc4, 0x77, 0xac, 0xbf, 0x2c, 0x42, 0xb9, 0x67, 0x07, 0xed, 0xe7, 0xbc, 0x64, + 0xdd, 0x83, 0xa2, 0x3c, 0x85, 0xca, 0xec, 0x37, 0xa6, 0xcf, 0x6a, 0xbc, 0x3e, 0xac, 0xa0, 0xe8, + 0x31, 0x54, 0xe5, 0xa8, 0x3f, 0x24, 0xcc, 0x56, 0x79, 0xe3, 0xce, 0xac, 0x53, 0x2e, 0x3e, 0xd2, + 0x6c, 0xfb, 0x4e, 0x40, 0x5d, 0x9f, 0x3d, 0x21, 0xcc, 0xc6, 0x20, 0x45, 0xf9, 0x18, 0x7d, 0x0b, + 0xaa, 0x89, 0x4c, 0xa4, 0xb6, 0xea, 0x42, 0x13, 0x92, 0x78, 0xf4, 0x29, 0xd4, 0x13, 0xa4, 0x34, + 0xc6, 0x78, 0x29, 0x63, 0x96, 0x12, 0xf2, 0xc2, 0xa2, 0x16, 0x40, 0x48, 0x47, 0x4c, 0xad, 0xac, + 0x24, 0x94, 0xad, 0xce, 0x57, 0x86, 0x39, 0x56, 0x68, 0xaa, 0x84, 0x7a, 0x88, 0x3e, 0x85, 0x25, + 0x71, 0xc9, 0xe8, 0x3b, 0x6e, 0x28, 0x53, 0xae, 0xa8, 0xe4, 0x8b, 0x9b, 0x6b, 0xf3, 0x15, 0x75, + 0xb8, 0xc0, 0x8e, 0xc6, 0xe3, 0xc5, 0x20, 0x45, 0xa3, 0xf7, 0x55, 0x8a, 0x96, 0xe5, 0xe2, 0xe6, + 0x7c, 0x3d, 0xa9, 0x84, 0xfc, 0xcb, 0x2c, 0xd4, 0x92, 0xcb, 0x45, 0xdf, 0x83, 0xa2, 0x67, 0x1f, + 0x11, 0x4f, 0x67, 0xe6, 0xcd, 0xab, 0xb9, 0xa9, 0xb9, 0x2f, 0x84, 0xda, 0x3e, 0x0b, 0xc7, 0x58, + 0x69, 0x30, 0x1f, 0x42, 0x35, 0xc1, 0x46, 0x75, 0xc8, 0x9f, 0x91, 0xb1, 0xba, 0x8a, 0xf3, 0x21, + 0x3f, 0x45, 0xcf, 0x6d, 0x6f, 0xa4, 0xdb, 0x05, 0x49, 0x7c, 0x94, 0xfb, 0x30, 0x6b, 0xfe, 0x3c, + 0x0b, 0x95, 0xd8, 0x73, 0xe8, 0xf1, 0x39, 0xa3, 0xd6, 0xaf, 0xe0, 0xee, 0xff, 0xb7, 0x45, 0xff, + 0x29, 0xa9, 0x6a, 0x73, 0x08, 0xb5, 0x50, 0xd6, 0xa3, 0xbe, 0xeb, 0xbb, 0xfa, 0x1e, 0x73, 0xf7, + 0x62, 0x87, 0x37, 0x55, 0x09, 0xdb, 0xf3, 0x5d, 0xc6, 0xaf, 0xf5, 0xe1, 0x84, 0x44, 0x18, 0x16, + 0x42, 0xd5, 0xe1, 0x48, 0x8d, 0x17, 0x5c, 0x6f, 0x52, 0x1a, 0xa5, 0x8c, 0x52, 0x59, 0x0b, 0x13, + 0xb4, 0x34, 0x52, 0xe9, 0x24, 0xbe, 0xa3, 0xa2, 0xe2, 0xee, 0x15, 0x55, 0xb6, 0x7d, 0x47, 0x1a, + 0x19, 0x93, 0xe6, 0x03, 0x28, 0x77, 0x59, 0x48, 0xec, 0xe1, 0x9e, 0x68, 0xaa, 0x8e, 0xec, 0x48, + 0x65, 0x1c, 0x2c, 0xc6, 0xb2, 0xcd, 0xe0, 0xf3, 0xc2, 0x7a, 0x03, 0x2b, 0xca, 0xfc, 0x7b, 0x16, + 0xaa, 0x89, 0xb5, 0xa3, 0x0f, 0x20, 0xe7, 0x3a, 0xca, 0x67, 0xef, 0x5c, 0x62, 0x8e, 0xfe, 0x20, + 0xce, 0xb9, 0x0e, 0x4f, 0x43, 0x89, 0x52, 0x3e, 0x2b, 0x07, 0x4c, 0xaa, 0x6a, 0x5c, 0xe5, 0xd7, + 0xe3, 0x9b, 0x81, 0x74, 0xc0, 0xd7, 0xe6, 0xd4, 0xa5, 0xf8, 0xc2, 0x90, 0xba, 0xf7, 0x1a, 0xf3, + 0xee, 0xbd, 0x85, 0xc9, 0xbd, 0xd7, 0xfc, 0x6d, 0x16, 0x6a, 0xc9, 0xad, 0x78, 0xf5, 0x15, 0x3e, + 0x06, 0x24, 0x3a, 0xa9, 0x7e, 0x2a, 0xbc, 0x72, 0x97, 0x35, 0x3b, 0x75, 0x21, 0x94, 0xf4, 0xf1, + 0x5b, 0x50, 0xe5, 0x87, 0x5b, 0x55, 0x07, 0xb1, 0xf4, 0x05, 0x0c, 0x9c, 0x25, 0xcb, 0x82, 0xf9, + 0xeb, 0x1c, 0xdf, 0x94, 0x78, 0x73, 0xbf, 0x02, 0x26, 0xef, 0xc1, 0x75, 0xad, 0x28, 0x79, 0x12, + 0xf2, 0x97, 0x69, 0xba, 0xa6, 0x34, 0x25, 0xfc, 0xff, 0x36, 0x2c, 0xc6, 0x4a, 0x8e, 0xc6, 0x8c, + 0xc8, 0x7b, 0xaf, 0x81, 0xe3, 0x43, 0xd6, 0xe2, 0x4c, 0x74, 0x07, 0xf2, 0x84, 0x46, 0xaa, 0x32, + 0x4d, 0x3f, 0x25, 0xb4, 0x69, 0x84, 0x39, 0x80, 0xdf, 0xf4, 0x08, 0x5f, 0xbd, 0xf5, 0x21, 0x2c, + 0xa6, 0x53, 0x30, 0xbf, 0x2e, 0x3d, 0x3d, 0xf8, 0xfe, 0xc1, 0xe1, 0x67, 0x07, 0xf5, 0x0c, 0x27, + 0xf6, 0x0e, 0x5a, 0x87, 0x4f, 0x0f, 0x76, 0xea, 0x59, 0x54, 0x83, 0xf2, 0xe1, 0xd3, 0x9e, 0xa4, + 0x72, 0x13, 0x15, 0x2b, 0x50, 0xde, 0x0a, 0x5c, 0x51, 0x6e, 0x79, 0xa6, 0x11, 0x05, 0x59, 0x65, + 0x1f, 0x49, 0xf0, 0x26, 0xb3, 0xd2, 0xa1, 0x8e, 0x80, 0x44, 0xe8, 0x11, 0x14, 0x05, 0x5b, 0xe7, + 0xbd, 0xd5, 0x59, 0x2f, 0x1e, 0x12, 0x1b, 0x8f, 0xb0, 0x12, 0x31, 0xff, 0x91, 0x85, 0xb2, 0x66, + 0x22, 0x0c, 0x15, 0xde, 0x4c, 0xdb, 0xae, 0x4f, 0x42, 0xb5, 0xd1, 0x9b, 0x57, 0x50, 0xd6, 0xdc, + 0xd6, 0x42, 0x82, 0xe4, 0x57, 0xe4, 0x58, 0x8d, 0xf9, 0x1c, 0x16, 0xd3, 0xd3, 0xa8, 0x01, 0xa5, + 0x21, 0x89, 0x22, 0xfb, 0x44, 0x3f, 0xb8, 0x68, 0x92, 0x9f, 0xab, 0xc9, 0xf7, 0xd5, 0xe3, 0x50, + 0xcc, 0xe0, 0xbe, 0x70, 0x87, 0x5c, 0x4a, 0xbe, 0x7d, 0x49, 0x82, 0xa7, 0x94, 0x90, 0xd8, 0x11, + 0xf5, 0xf5, 0xcb, 0x85, 0xa4, 0x84, 0x3b, 0x85, 0xb3, 0x3a, 0x50, 0xd6, 0x1d, 0xc2, 0xc5, 0x8f, + 0x49, 0xa2, 0x8d, 0x1e, 0x07, 0x3a, 0xab, 0x8b, 0x71, 0xfc, 0x34, 0x94, 0x9f, 0x3c, 0x0d, 0x59, + 0xcf, 0xe0, 0xda, 0x54, 0x33, 0x84, 0xee, 0x43, 0x39, 0x24, 0xa9, 0x2b, 0xd0, 0xeb, 0x73, 0x5b, + 0x28, 0x1c, 0x43, 0x79, 0x1c, 0x8a, 0xaa, 0xd3, 0x8f, 0x84, 0x26, 0xaa, 0xd7, 0xbd, 0x20, 0xb8, + 0x5d, 0xc5, 0xb4, 0xbe, 0x80, 0x05, 0x2d, 0x2c, 0x9d, 0xf8, 0x8a, 0x9f, 0x8b, 0xe3, 0x29, 0x97, + 0x8c, 0xa7, 0x3f, 0xe6, 0x00, 0xf1, 0x43, 0xdf, 0x1d, 0x0d, 0x87, 0x76, 0x38, 0xd6, 0x5d, 0xf8, + 0xb7, 0xa1, 0x1c, 0x5b, 0x75, 0xf5, 0x3e, 0x3c, 0x96, 0xe1, 0x19, 0x86, 0xb9, 0x43, 0xd2, 0x7f, + 0xe1, 0xfa, 0x0e, 0x7d, 0xa1, 0x3e, 0x09, 0x9c, 0xf5, 0x99, 0xe0, 0xa0, 0x6f, 0x80, 0xe1, 0x53, + 0x5f, 0xa7, 0xdd, 0x1b, 0xd3, 0xc7, 0x6b, 0x18, 0xb0, 0x31, 0xbf, 0x85, 0x70, 0x14, 0xfa, 0x18, + 0xaa, 0x8c, 0xf6, 0xe3, 0x55, 0x1b, 0x97, 0xac, 0x9a, 0xb7, 0x0e, 0x8c, 0xc6, 0x5b, 0xff, 0x5d, + 0x58, 0x38, 0x0e, 0xe9, 0x70, 0x22, 0x5f, 0xb8, 0x5c, 0xbe, 0xc6, 0x25, 0x62, 0x0d, 0x5f, 0x07, + 0x88, 0xce, 0x5c, 0x99, 0x30, 0x23, 0x71, 0x13, 0x2b, 0xe3, 0x0a, 0xe7, 0x70, 0xd7, 0x45, 0x2d, + 0x80, 0x32, 0x1d, 0xb1, 0x23, 0x3a, 0xf2, 0x1d, 0xeb, 0xaf, 0x59, 0xb8, 0x9e, 0x72, 0xa8, 0x7a, + 0x9a, 0x7c, 0x08, 0x39, 0x7a, 0x36, 0x37, 0x85, 0xce, 0x90, 0x68, 0x1e, 0x9e, 0xed, 0x66, 0x70, + 0x8e, 0x9e, 0xa1, 0x07, 0xc9, 0x9d, 0x9b, 0x75, 0x75, 0x4b, 0xc5, 0xc7, 0x6e, 0x46, 0xed, 0xad, + 0xb9, 0x05, 0xb9, 0xc3, 0x33, 0xf4, 0x08, 0xc4, 0x1b, 0x61, 0x9f, 0xd9, 0x47, 0x5e, 0xdc, 0x4f, + 0x9b, 0x33, 0x2d, 0xe8, 0x71, 0x08, 0x86, 0x48, 0x0f, 0xc5, 0xca, 0x74, 0x56, 0xb4, 0xfe, 0x96, + 0x03, 0x68, 0xd9, 0x91, 0x2b, 0x7a, 0x87, 0x08, 0xad, 0xc2, 0x42, 0x34, 0x1a, 0x0c, 0x48, 0xc4, + 0xdb, 0x8b, 0x91, 0x2f, 0xef, 0x39, 0x06, 0xae, 0x29, 0xe6, 0x36, 0xe7, 0x71, 0xd0, 0xb1, 0xed, + 0x7a, 0xa3, 0x90, 0x28, 0x90, 0x2c, 0xfe, 0x35, 0xc5, 0x94, 0xa0, 0xdb, 0xfc, 0x20, 0x30, 0xe2, + 0x0f, 0xc6, 0xfd, 0x61, 0xd4, 0x0f, 0xee, 0x6f, 0x88, 0xa8, 0x30, 0x70, 0x4d, 0x71, 0x9f, 0x44, + 0x9d, 0xfb, 0x1b, 0xe7, 0x51, 0x0f, 0xef, 0xab, 0xb4, 0x9d, 0x40, 0x3d, 0xbc, 0x3f, 0x85, 0x7a, + 0x28, 0x36, 0x3b, 0x8d, 0x7a, 0x88, 0xee, 0xc2, 0x35, 0xe6, 0x45, 0x71, 0x51, 0x92, 0xa6, 0x15, + 0x05, 0x70, 0x89, 0x79, 0xfa, 0x01, 0x5a, 0x5a, 0xb7, 0x01, 0xcb, 0xf6, 0x80, 0x8d, 0x6c, 0xaf, + 0x9f, 0x5e, 0x6e, 0x49, 0xc0, 0x91, 0x9c, 0xeb, 0x26, 0x17, 0x3d, 0x91, 0x48, 0xaf, 0xbd, 0x9c, + 0x94, 0xf8, 0x24, 0xe1, 0x01, 0xeb, 0x5f, 0x06, 0x54, 0xe2, 0x0d, 0x40, 0x2d, 0xa8, 0x04, 0xd4, + 0xe9, 0x9f, 0x84, 0x74, 0xa4, 0x5b, 0xc1, 0xd5, 0xf9, 0xfb, 0xc5, 0x73, 0xf1, 0x63, 0x0e, 0xdd, + 0xcd, 0xe0, 0x72, 0xa0, 0xc6, 0xe6, 0x2f, 0x0c, 0x91, 0xdc, 0x05, 0x81, 0x1e, 0x81, 0x11, 0xd2, + 0x17, 0x7a, 0xef, 0xdf, 0xb9, 0x82, 0xae, 0x26, 0xa6, 0x2f, 0xb0, 0x10, 0x32, 0xff, 0x90, 0x87, + 0x3c, 0xa6, 0x2f, 0x5e, 0x35, 0xed, 0x5c, 0x9a, 0x09, 0xd6, 0xa0, 0x3e, 0x24, 0xd1, 0x29, 0x71, + 0xfa, 0x7c, 0xd1, 0xd2, 0x53, 0x72, 0xff, 0x17, 0x25, 0xbf, 0x43, 0x1d, 0xe9, 0xd7, 0xbb, 0x70, + 0x2d, 0x1c, 0xf9, 0xbe, 0xeb, 0x9f, 0x24, 0xa0, 0x32, 0x08, 0x96, 0xd4, 0x44, 0x8c, 0x5d, 0x83, + 0x3a, 0x77, 0x7e, 0x4a, 0xab, 0xdc, 0xe0, 0x45, 0xc9, 0x8f, 0x91, 0xef, 0x41, 0x41, 0x1e, 0xeb, + 0xc2, 0x9c, 0x6b, 0xe3, 0x24, 0xe6, 0xb1, 0x44, 0xa2, 0x2f, 0x60, 0x41, 0xd6, 0xd0, 0xfe, 0xd1, + 0x98, 0xeb, 0x6f, 0x94, 0x84, 0x63, 0x3f, 0xbc, 0xa2, 0x63, 0x9b, 0xb2, 0x88, 0xb6, 0xc6, 0xbc, + 0x8a, 0x8a, 0xf6, 0xa3, 0x4a, 0x26, 0x1c, 0xf3, 0x73, 0xa8, 0x9f, 0x07, 0xcc, 0x68, 0x44, 0x36, + 0x92, 0x8d, 0xc8, 0xac, 0x03, 0x1d, 0x17, 0xeb, 0x44, 0x93, 0xc2, 0x4b, 0xa3, 0xc8, 0x03, 0xd6, + 0x8f, 0x73, 0x50, 0xef, 0xd1, 0x40, 0x74, 0x43, 0xd1, 0x57, 0x34, 0xeb, 0xaf, 0x42, 0x8d, 0xd1, + 0xfe, 0xe4, 0xba, 0x5d, 0xd0, 0xff, 0x79, 0x30, 0xba, 0x15, 0x5f, 0xb9, 0xd7, 0xa1, 0xc8, 0x41, + 0x9e, 0xa7, 0xfe, 0x87, 0x98, 0xaf, 0xb4, 0xc0, 0xe8, 0x96, 0xe7, 0xa5, 0x92, 0xf5, 0xcf, 0xb2, + 0x70, 0x2d, 0xe1, 0x05, 0x95, 0xaa, 0xef, 0x43, 0x51, 0x74, 0xe2, 0xd1, 0xdc, 0x07, 0x0d, 0x21, + 0x20, 0x36, 0x76, 0x37, 0x83, 0x15, 0xf8, 0x55, 0xd3, 0x74, 0x2a, 0xc7, 0xfe, 0x39, 0x0b, 0x30, + 0x51, 0x8e, 0xee, 0xa5, 0x0e, 0xee, 0x5b, 0x17, 0xd8, 0x91, 0x38, 0xb0, 0x3f, 0xcd, 0xca, 0x03, + 0xbb, 0x0c, 0x05, 0x61, 0x99, 0xbe, 0x40, 0x0a, 0xe2, 0xf2, 0x3d, 0x4a, 0x75, 0x38, 0xc5, 0xf3, + 0x1d, 0xce, 0xcb, 0x9f, 0x96, 0xcd, 0xdf, 0x17, 0x20, 0xbf, 0x15, 0xb8, 0xe8, 0x73, 0xa8, 0x26, + 0xca, 0x1c, 0x5a, 0xbd, 0xb8, 0x08, 0x8a, 0x88, 0x34, 0x6f, 0x5f, 0xa5, 0x52, 0x5a, 0x19, 0xd4, + 0x83, 0x4a, 0xbc, 0x8f, 0xe8, 0xd6, 0x74, 0x87, 0x72, 0x2e, 0xd2, 0x4d, 0xeb, 0x22, 0x48, 0xac, + 0xf5, 0x53, 0x28, 0xeb, 0xbf, 0x18, 0xd1, 0xca, 0x94, 0xc4, 0xb9, 0xbf, 0x2b, 0xcd, 0x5b, 0x17, + 0x20, 0x62, 0x95, 0x3f, 0x84, 0x5a, 0xf2, 0x1f, 0x57, 0x74, 0x7b, 0xa6, 0xd0, 0xb9, 0x7f, 0x71, + 0xcd, 0xb7, 0x2f, 0x41, 0xc5, 0xea, 0x77, 0x20, 0xdf, 0xb3, 0x03, 0xf4, 0xc6, 0xac, 0x1e, 0x4d, + 0x2b, 0x7b, 0x7d, 0x6e, 0x03, 0x67, 0xe5, 0x7f, 0x92, 0xcb, 0x6e, 0x64, 0xd1, 0x53, 0x58, 0x48, + 0x3d, 0xaf, 0xa3, 0xb7, 0xaf, 0xf4, 0xfc, 0x7e, 0x91, 0xe6, 0xcc, 0x46, 0x16, 0x6d, 0x41, 0x49, + 0xff, 0xe7, 0x3d, 0xe7, 0x94, 0x9a, 0x6f, 0x4e, 0xf1, 0x13, 0xff, 0xa3, 0x5b, 0x19, 0xe4, 0x41, + 0xa5, 0x4b, 0xbc, 0xe3, 0xed, 0x53, 0x32, 0x38, 0x43, 0xdf, 0x9c, 0x80, 0xe5, 0x5f, 0xf2, 0xcd, + 0xe4, 0x5f, 0xf2, 0x31, 0x4e, 0x5b, 0xd7, 0xbc, 0x2a, 0x5c, 0x7b, 0xb3, 0x75, 0xef, 0xf3, 0xf7, + 0x4e, 0x5c, 0x76, 0x3a, 0x3a, 0xe2, 0x02, 0xeb, 0x4a, 0x5a, 0xff, 0x6e, 0xae, 0x4f, 0xfe, 0xa8, + 0x5c, 0x3f, 0x21, 0xfe, 0xba, 0x34, 0xf8, 0xa8, 0x28, 0x9a, 0xd0, 0x7b, 0xff, 0x0d, 0x00, 0x00, + 0xff, 0xff, 0xa3, 0xca, 0xde, 0xf5, 0x66, 0x20, 0x00, 0x00, } diff --git a/pkg/profiles/profiles.go b/pkg/profiles/profiles.go index 33188e680c063..7ddc6e3ff7ad5 100644 --- a/pkg/profiles/profiles.go +++ b/pkg/profiles/profiles.go @@ -5,7 +5,9 @@ import ( "errors" "io" "text/template" + "time" + "github.com/golang/protobuf/ptypes/duration" pb "github.com/linkerd/linkerd2-proxy-api/go/destination" sp "github.com/linkerd/linkerd2/controller/gen/apis/serviceprofile/v1alpha1" "github.com/linkerd/linkerd2/pkg/util" @@ -18,6 +20,45 @@ type profileTemplateConfig struct { ClusterZone string } +// DefaultRetryBudget is used for routes which do not specify one. +var DefaultRetryBudget = pb.RetryBudget{ + MinRetriesPerSecond: 10, + RetryRatio: 0.2, + Ttl: &duration.Duration{ + Seconds: 10, + }, +} + +// ToServiceProfile returns a Proxy API DestinationProfile, given a +// ServiceProfile. +func ToServiceProfile(profile *sp.ServiceProfileSpec) (*pb.DestinationProfile, error) { + routes := make([]*pb.Route, 0) + for _, route := range profile.Routes { + pbRoute, err := ToRoute(route) + if err != nil { + return nil, err + } + routes = append(routes, pbRoute) + } + budget := DefaultRetryBudget + if profile.RetryBudget != nil { + budget.MinRetriesPerSecond = profile.RetryBudget.MinRetriesPerSecond + budget.RetryRatio = profile.RetryBudget.RetryRatio + ttl, err := time.ParseDuration(profile.RetryBudget.TTL) + if err != nil { + return nil, err + } + budget.Ttl = &duration.Duration{ + Seconds: int64(ttl / time.Second), + Nanos: int32(ttl % time.Second), + } + } + return &pb.DestinationProfile{ + Routes: routes, + RetryBudget: &budget, + }, nil +} + // ToRoute returns a Proxy API Route, given a ServiceProfile Route. func ToRoute(route *sp.RouteSpec) (*pb.Route, error) { cond, err := ToRequestMatch(route.Condition) @@ -32,11 +73,13 @@ func ToRoute(route *sp.RouteSpec) (*pb.Route, error) { } rcs = append(rcs, pbRc) } - return &pb.Route{ + ret := pb.Route{ Condition: cond, ResponseClasses: rcs, MetricsLabels: map[string]string{"route": route.Name}, - }, nil + IsRetryable: route.IsRetryable, + } + return &ret, nil } // ToResponseClass returns a Proxy API ResponseClass, given a ServiceProfile diff --git a/pkg/profiles/template.go b/pkg/profiles/template.go index bb9c2cd9cc9f6..cfcba2237281d 100644 --- a/pkg/profiles/template.go +++ b/pkg/profiles/template.go @@ -39,6 +39,11 @@ spec: # method: DELETE # - pathRegex: /info.txt + # A route may be marked as retryable. This indicates that requests to this + # route are always safe to retry and will cause the proxy to retry failed + # requests on this route whenever possible. + # isRetryable: true + # A route may optionally define a list of response classes which describe # how responses from this route will be classified. responseClasses: @@ -67,4 +72,23 @@ spec: # The response class defines whether responses should be counted as # successes or failures. isFailure: true + + # A service profile can also define a retry budget. This specifies the + # maximum total number of retries that should be sent to this service as a + # ratio of the original request volume. + # retryBudget: + # The retryRatio is the maximum ratio of retries requests to original + # requests. A retryRatio of 0.2 means that retries may add at most an + # additional 20% to the request load. + # retryRatio: 0.2 + + # This is an allowance of retries per second in addition to those allowed + # by the retryRatio. This allows retries to be performed, when the request + # rate is very low. + # minRetriesPerSecond: 10 + + # This duration indicates for how long requests should be considered for the + # purposes of calculating the retryRatio. A higher value considers a larger + # window and therefore allows burstier retries. + # ttl: 10s ` diff --git a/proto/public.proto b/proto/public.proto index 7fdc8e226c584..a9a7e13c8450b 100644 --- a/proto/public.proto +++ b/proto/public.proto @@ -333,6 +333,8 @@ message BasicStats { uint64 latency_ms_p95 = 4; uint64 latency_ms_p99 = 5; uint64 tls_request_count = 6; + uint64 actual_success_count = 7; + uint64 actual_failure_count = 8; } message StatTable { diff --git a/proxy-init/Dockerfile b/proxy-init/Dockerfile index 587b6d368732e..bb8b6d4921447 100644 --- a/proxy-init/Dockerfile +++ b/proxy-init/Dockerfile @@ -1,5 +1,5 @@ ## compile proxy-init utility -FROM gcr.io/linkerd-io/go-deps:f95a60fe as golang +FROM gcr.io/linkerd-io/go-deps:18d4ad09 as golang WORKDIR /go/src/github.com/linkerd/linkerd2 COPY ./proxy-init ./proxy-init RUN CGO_ENABLED=0 GOOS=linux go install -v ./proxy-init/ diff --git a/web/Dockerfile b/web/Dockerfile index caf1d9da4a8e6..9a3b502d9283d 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -26,7 +26,7 @@ COPY web/app . RUN $ROOT/bin/web build ## compile go server -FROM gcr.io/linkerd-io/go-deps:f95a60fe as golang +FROM gcr.io/linkerd-io/go-deps:18d4ad09 as golang WORKDIR /go/src/github.com/linkerd/linkerd2 RUN mkdir -p web COPY web/main.go web